Showing the changes to test/api/encoder_test.cpp (1 of 26 files). Show all
Unified · Split
| @@ -56,7 +56,7 @@ void EncFileParamToParamExt (EncodeFileParam* pEncFileParam, SEncParamExt* pEnxP · 55 unmodified lines | ||
| 56 | 56 | pEnxParamExt->iEntropyCodingModeFlag = pEncFileParam->bCabac ? 1 : 0; |
| 57 | 57 | |
| 58 | 58 | for (int i = 0; i < pEnxParamExt->iSpatialLayerNum; i++) { |
| 59 | − pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = pEncFileParam->eSliceMode; | |
| 59 | + pEnxParamExt->sSpatialLayers[i].sSliceArgument.uiSliceMode = pEncFileParam->eSliceMode; | |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | } |
| @@ -115,7 +115,7 @@ static const EncodeFileParam kFileParamArray[] = { · 52 unmodified lines | ||
| 115 | 115 | }, |
| 116 | 116 | { |
| 117 | 117 | "res/CiscoVT2people_320x192_12fps.yuv", |
| 118 | − "21dbfaaf4f09af735298434c1f97cf95a464165b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row | |
| 118 | + "21dbfaaf4f09af735298434c1f97cf95a464165b", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_RASTER_SLICE, false, 1, false, false, false // One slice per MB row | |
| 119 | 119 | }, |
| 120 | 120 | { |
| 121 | 121 | "res/CiscoVT2people_320x192_12fps.yuv", |
| @@ -127,7 +127,7 @@ static const EncodeFileParam kFileParamArray[] = { · 5 unmodified lines | ||
| 127 | 127 | }, |
| 128 | 128 | { |
| 129 | 129 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 130 | − "a747529a097f581b66f779860c2c491d8cac32fe", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 130 | + "a747529a097f581b66f779860c2c491d8cac32fe", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 131 | 131 | }, |
| 132 | 132 | { |
| 133 | 133 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| @@ -148,12 +148,12 @@ static const EncodeFileParam kFileParamArray[] = { · 14 unmodified lines | ||
| 148 | 148 | }, |
| 149 | 149 | { |
| 150 | 150 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 151 | − "aa0aaca96475c65d66e90e513618fa814b098dff", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false | |
| 151 | + "aa0aaca96475c65d66e90e513618fa814b098dff", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false | |
| 152 | 152 | }, |
| 153 | 153 | //for different strategy |
| 154 | 154 | { |
| 155 | 155 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 156 | − "5622722316eed2482bf78520eda7e448312e340e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, true, true, false | |
| 156 | + "5622722316eed2482bf78520eda7e448312e340e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false | |
| 157 | 157 | }, |
| 158 | 158 | { |
| 159 | 159 | "res/CiscoVT2people_320x192_12fps.yuv", |
| @@ -161,7 +161,7 @@ static const EncodeFileParam kFileParamArray[] = { · 1 unmodified line | ||
| 161 | 161 | }, |
| 162 | 162 | { |
| 163 | 163 | "res/Cisco_Absolute_Power_1280x720_30fps.yuv", |
| 164 | − "6c13d959d981d412343664b4830dd4042bc4ddf9", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true | |
| 164 | + "6c13d959d981d412343664b4830dd4042bc4ddf9", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true | |
| 165 | 165 | }, |
| 166 | 166 | }; |
| 167 | 167 | |