History

add a default param function for EncodeDecoderAPI test

Sijia Chen committed 11 years ago

Commit 489d1211 parent 8bef6bc1 file · +48 −36Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 1 file). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+48−36
@@ -90,7 +90,6 @@ class EncodeDecodeTestBase : public ::testing::TestWithParam<EncodeDecodeFilePar · 89 unmodified lines
9090 }
9191
9292 virtual void prepareParam (int iLayers, int iSlices, int width, int height, float framerate, SEncParamExt* pParam) {
93− memset (pParam, 0, sizeof (SEncParamExt));
9493 pParam->iUsageType = CAMERA_VIDEO_REAL_TIME;
9594 pParam->iPicWidth = width;
9695 pParam->iPicHeight = height;
@@ -180,7 +179,14 @@ class EncodeDecodeTestAPI : public EncodeDecodeTestBase { · 83 unmodified lines
180179 EncodeDecodeTestBase::TearDown();
181180 }
182181
183− void prepareParam (int iLayers, int iSlices, int width, int height, float framerate, SEncParamExt* pParam) {
182+ void prepareParam0 (int iLayers, int iSlices, int width, int height, float framerate, SEncParamExt* pParam) {
183+ memset (pParam, 0, sizeof (SEncParamExt));
184+ EncodeDecodeTestBase::prepareParam (iLayers, iSlices, width, height, framerate, pParam);
185+ }
186+
187+ void prepareParamDefault (int iLayers, int iSlices, int width, int height, float framerate, SEncParamExt* pParam) {
188+ memset (pParam, 0, sizeof (SEncParamExt));
189+ encoder_->GetDefaultParams (pParam);
184190 EncodeDecodeTestBase::prepareParam (iLayers, iSlices, width, height, framerate, pParam);
185191 }
186192
@@ -509,7 +515,7 @@ static const EncodeDecodeFileParamBase kFileParamArray[] = { · 322 unmodified lines
509515
510516 TEST_P (EncodeDecodeTestAPI, DecoderVclNal) {
511517 EncodeDecodeFileParamBase p = GetParam();
512− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
518+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
513519 encoder_->Uninitialize();
514520 int rv = encoder_->InitializeExt (&param_);
515521 ASSERT_TRUE (rv == cmResultSuccess);
@@ -545,7 +551,7 @@ TEST_P (EncodeDecodeTestAPI, DecoderVclNal) { · 29 unmodified lines
545551
546552 TEST_P (EncodeDecodeTestAPI, GetOptionFramenum) {
547553 EncodeDecodeFileParamBase p = GetParam();
548− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
554+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
549555 encoder_->Uninitialize();
550556 int rv = encoder_->InitializeExt (&param_);
551557 ASSERT_TRUE (rv == cmResultSuccess);
@@ -582,7 +588,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionFramenum) { · 30 unmodified lines
582588
583589 TEST_P (EncodeDecodeTestAPI, GetOptionIDR) {
584590 EncodeDecodeFileParamBase p = GetParam();
585− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
591+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
586592 encoder_->Uninitialize();
587593 int rv = encoder_->InitializeExt (&param_);
588594 ASSERT_TRUE (rv == cmResultSuccess);
@@ -824,7 +830,7 @@ int SimulateNALLoss (const unsigned char* pSrc, int& iSrcLen, std::vector<SLost · 235 unmodified lines
824830
825831 TEST_P (EncodeDecodeTestAPI, GetOptionLTR_ALLIDR) {
826832 EncodeDecodeFileParamBase p = GetParam();
827− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
833+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
828834 encoder_->Uninitialize();
829835 int rv = encoder_->InitializeExt (&param_);
830836 ASSERT_TRUE (rv == cmResultSuccess);
@@ -857,7 +863,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionLTR_ALLLTR) { · 26 unmodified lines
857863 SLTRMarkingFeedback m_LTR_Marking_Feedback;
858864 SLTRRecoverRequest m_LTR_Recover_Request;
859865 EncodeDecodeFileParamBase p = GetParam();
860− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
866+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
861867 encoder_->Uninitialize();
862868 int rv = encoder_->InitializeExt (&param_);
863869 ASSERT_TRUE (rv == cmResultSuccess);
@@ -916,7 +922,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionLTR_Engine) { · 52 unmodified lines
916922 SLTRRecoverRequest m_LTR_Recover_Request;
917923 m_LTR_Recover_Request.uiIDRPicId = 0;
918924 EncodeDecodeFileParamBase p = GetParam();
919− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
925+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
920926 encoder_->Uninitialize();
921927 int rv = encoder_->InitializeExt (&param_);
922928 ASSERT_TRUE (rv == cmResultSuccess);
@@ -966,7 +972,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_DISABLE) { · 43 unmodified lines
966972 SLTRRecoverRequest m_LTR_Recover_Request;
967973 m_LTR_Recover_Request.uiIDRPicId = 0;
968974 EncodeDecodeFileParamBase p = GetParam();
969− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
975+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
970976 param_.bEnableLongTermReference = true;
971977 param_.iLTRRefNum = 1;
972978 encoder_->Uninitialize();
@@ -1033,7 +1039,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_SLICE_COPY) { · 60 unmodified lines
10331039 SLTRRecoverRequest m_LTR_Recover_Request;
10341040 m_LTR_Recover_Request.uiIDRPicId = 0;
10351041 EncodeDecodeFileParamBase p = GetParam();
1036− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1042+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
10371043 encoder_->Uninitialize();
10381044 int rv = encoder_->InitializeExt (&param_);
10391045 ASSERT_TRUE (rv == cmResultSuccess);
@@ -1084,7 +1090,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECFlag_ERROR_CON_SLICE_COPY) { · 44 unmodified lines
10841090
10851091 TEST_P (EncodeDecodeTestAPI, InOutTimeStamp) {
10861092 EncodeDecodeFileParamBase p = GetParam();
1087− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1093+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
10881094 encoder_->Uninitialize();
10891095 int rv = encoder_->InitializeExt (&param_);
10901096 ASSERT_TRUE (rv == cmResultSuccess);
@@ -1134,7 +1140,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_AVC_NOPREFIX) { · 43 unmodified lines
11341140 SLTRRecoverRequest m_LTR_Recover_Request;
11351141 m_LTR_Recover_Request.uiIDRPicId = 0;
11361142 EncodeDecodeFileParamBase p = GetParam();
1137− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1143+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
11381144 param_.bPrefixNalAddingCtrl = false;
11391145 param_.iTemporalLayerNum = (rand() % 4) + 1;
11401146 encoder_->Uninitialize();
@@ -1203,7 +1209,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_AVC_WITH_PREFIX_NOLOSS) { · 62 unmodified lines
12031209 SLTRRecoverRequest m_LTR_Recover_Request;
12041210 m_LTR_Recover_Request.uiIDRPicId = 0;
12051211 EncodeDecodeFileParamBase p = GetParam();
1206− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1212+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
12071213 param_.bPrefixNalAddingCtrl = true;
12081214 param_.iTemporalLayerNum = (rand() % 4) + 1;
12091215 param_.iSpatialLayerNum = 1;
@@ -1258,7 +1264,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionTid_SVC_L1_NOLOSS) { · 48 unmodified lines
12581264 SLTRRecoverRequest m_LTR_Recover_Request;
12591265 m_LTR_Recover_Request.uiIDRPicId = 0;
12601266 EncodeDecodeFileParamBase p = GetParam();
1261− prepareParam (2, p.slicenum, p.width, p.height, p.frameRate, &param_);
1267+ prepareParamDefault (2, p.slicenum, p.width, p.height, p.frameRate, &param_);
12621268 param_.iTemporalLayerNum = (rand() % 4) + 1;
12631269 param_.iSpatialLayerNum = 2;
12641270 encoder_->Uninitialize();
@@ -1314,7 +1320,7 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace) { · 49 unmodified lines
13141320 SLTRRecoverRequest m_LTR_Recover_Request;
13151321 m_LTR_Recover_Request.uiIDRPicId = 0;
13161322 EncodeDecodeFileParamBase p = GetParam();
1317− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1323+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
13181324 param_.iSpatialLayerNum = 1;
13191325
13201326 int rv = encoder_->InitializeExt (&param_);
@@ -1378,7 +1384,7 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace_NULL) { · 57 unmodified lines
13781384 SLTRRecoverRequest m_LTR_Recover_Request;
13791385 m_LTR_Recover_Request.uiIDRPicId = 0;
13801386 EncodeDecodeFileParamBase p = GetParam();
1381− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1387+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
13821388 param_.iSpatialLayerNum = 1;
13831389 int rv = encoder_->InitializeExt (&param_);
13841390 ASSERT_TRUE (rv == cmResultSuccess);
@@ -1441,7 +1447,7 @@ TEST_P (EncodeDecodeTestAPI, SetOptionECIDC_GeneralSliceChange) { · 56 unmodified lines
14411447 uint32_t uiEcIdc;
14421448 uint32_t uiGet;
14431449 EncodeDecodeFileParamBase p = GetParam();
1444− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1450+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
14451451 param_.iSpatialLayerNum = 1;
14461452 encoder_->Uninitialize();
14471453 int rv = encoder_->InitializeExt (&param_);
@@ -1521,7 +1527,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificFrameChange) { · 73 unmodified lines
15211527 uint32_t uiEcIdc;
15221528 uint32_t uiGet;
15231529 EncodeDecodeFileParamBase p = kFileParamArray[0];
1524− prepareParam (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
1530+ prepareParamDefault (1, p.slicenum, p.width, p.height, p.frameRate, &param_);
15251531 param_.iSpatialLayerNum = 1;
15261532 encoder_->Uninitialize();
15271533 int rv = encoder_->InitializeExt (&param_);
@@ -1660,7 +1666,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRLoss) { · 132 unmodified lines
16601666 uint32_t uiEcIdc = 2; //default set as SLICE_COPY
16611667 uint32_t uiGet;
16621668 EncodeDecodeFileParamBase p = kFileParamArray[0];
1663− prepareParam (1, 2, p.width, p.height, p.frameRate, &param_);
1669+ prepareParamDefault (1, 2, p.width, p.height, p.frameRate, &param_);
16641670 param_.iSpatialLayerNum = 1;
16651671 encoder_->Uninitialize();
16661672 int rv = encoder_->InitializeExt (&param_);
@@ -1793,7 +1799,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRNoLoss) { · 126 unmodified lines
17931799 uint32_t uiEcIdc;
17941800 uint32_t uiGet;
17951801 EncodeDecodeFileParamBase p = kFileParamArray[0];
1796− prepareParam (1, 2, p.width, p.height, p.frameRate, &param_);
1802+ prepareParamDefault (1, 2, p.width, p.height, p.frameRate, &param_);
17971803 param_.iSpatialLayerNum = 1;
17981804 encoder_->Uninitialize();
17991805 int rv = encoder_->InitializeExt (&param_);
@@ -1962,7 +1968,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_I) { · 162 unmodified lines
19621968 EncodeDecodeFileParamBase p = kSVCSwitch[0];
19631969 p.width = p.width << 2;
19641970 p.height = p.height << 2;
1965− prepareParam (4, p.slicenum, p.width, p.height, p.frameRate, &param_);
1971+ prepareParamDefault (4, p.slicenum, p.width, p.height, p.frameRate, &param_);
19661972 param_.iTemporalLayerNum = (rand() % 4) + 1;
19671973 param_.iSpatialLayerNum = 4;
19681974 encoder_->Uninitialize();
@@ -2027,7 +2033,7 @@ TEST_F (EncodeDecodeTestAPI, Engine_SVC_Switch_P) { · 58 unmodified lines
20272033 int iLastDid = 0;
20282034 p.width = p.width << 2;
20292035 p.height = p.height << 2;
2030− prepareParam (4, p.slicenum, p.width, p.height, p.frameRate, &param_);
2036+ prepareParamDefault (4, p.slicenum, p.width, p.height, p.frameRate, &param_);
20312037 param_.iTemporalLayerNum = (rand() % 4) + 1;
20322038 param_.iSpatialLayerNum = 4;
20332039 encoder_->Uninitialize();
@@ -2113,7 +2119,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionEncParamExt) { · 79 unmodified lines
21132119 int iEncFrameNum = WelsClip3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);
21142120 int iSliceNum = 1;
21152121 encoder_->GetDefaultParams (&param_);
2116− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &param_);
2122+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &param_);
21172123
21182124 int rv = encoder_->InitializeExt (&param_);
21192125 ASSERT_TRUE (rv == cmResultSuccess);
@@ -2177,6 +2183,7 @@ class DecodeCrashTestAPI : public EncodeDecodeTestBase { · 57 unmodified lines
21772183 }
21782184
21792185 void prepareParam (int iLayerNum, int iSliceNum, int width, int height, float framerate, SEncParamExt* pParam) {
2186+ memset (pParam, 0, sizeof (SEncParamExt));
21802187 EncodeDecodeTestBase::prepareParam (iLayerNum, iSliceNum, width, height, framerate, pParam);
21812188 }
21822189
@@ -2431,6 +2438,11 @@ class DecodeParseAPI : public EncodeDecodeTestBase { · 248 unmodified lines
24312438 ASSERT_TRUE (rv == cmResultSuccess || rv == cmUnkonwReason);
24322439 }
24332440
2441+ void prepareParam (int iLayerNum, int iSliceNum, int width, int height, float framerate, SEncParamExt* pParam) {
2442+ memset (pParam, 0, sizeof (SEncParamExt));
2443+ EncodeDecodeTestBase::prepareParam (iLayerNum, iSliceNum, width, height, framerate, pParam);
2444+ }
2445+
24342446 protected:
24352447 SParserBsInfo BsInfo_;
24362448 FILE* fYuv_;
@@ -2588,21 +2600,21 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 151 unmodified lines
25882600 SEncParamExt sParam2;
25892601 SEncParamExt sParam3;
25902602 encoder_->GetDefaultParams (&sParam1);
2591− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2603+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
25922604 sParam1.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
25932605 //prepare param2
25942606 memcpy (&sParam2, &sParam1, sizeof (SEncParamExt));
25952607 while (GET_MB_WIDTH (sParam2.iPicWidth) == GET_MB_WIDTH (sParam1.iPicWidth)) {
25962608 sParam2.iPicWidth = GetRandWidth();
25972609 }
2598− prepareParam (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
2610+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
25992611 sParam2.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
26002612 //prepare param3
26012613 memcpy (&sParam3, &sParam1, sizeof (SEncParamExt));
26022614 while (GET_MB_WIDTH (sParam3.iPicHeight) == GET_MB_WIDTH (sParam1.iPicHeight)) {
26032615 sParam3.iPicHeight = GetRandHeight();
26042616 }
2605− prepareParam (iSpatialLayerNum, iSliceNum, sParam3.iPicWidth, sParam3.iPicHeight, fFrameRate, &sParam3);
2617+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam3.iPicWidth, sParam3.iPicHeight, fFrameRate, &sParam3);
26062618 sParam3.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
26072619
26082620 //prepare output if needed
@@ -2699,12 +2711,12 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 90 unmodified lines
26992711 SEncParamExt sParam1;
27002712 SEncParamExt sParam2;
27012713 encoder_->GetDefaultParams (&sParam1);
2702− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2714+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
27032715 sParam1.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
27042716 sParam1.iTemporalLayerNum = 1;
27052717 //prepare param2
27062718 memcpy (&sParam2, &sParam1, sizeof (SEncParamExt));
2707− prepareParam (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
2719+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
27082720 sParam2.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
27092721 sParam2.iTemporalLayerNum = 3;
27102722
@@ -2754,7 +2766,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 43 unmodified lines
27542766 SEncParamExt sParam1;
27552767 SEncParamExt sParam2;
27562768 encoder_->GetDefaultParams (&sParam1);
2757− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2769+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
27582770 sParam1.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
27592771
27602772 //prepare output if needed
@@ -2780,7 +2792,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 19 unmodified lines
27802792 vWidthTableIt = std::find (vWidthTable.begin(), vWidthTable.end(), GET_MB_WIDTH (sParam2.iPicWidth));
27812793 } while (vWidthTableIt != vWidthTable.end());
27822794 vWidthTable.push_back (GET_MB_WIDTH (sParam2.iPicWidth));
2783− prepareParam (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
2795+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
27842796 sParam2.eSpsPpsIdStrategy = SPS_LISTING_AND_PPS_INCREASING;
27852797
27862798 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
@@ -2821,7 +2833,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING1) { · 34 unmodified lines
28212833 // prepare params
28222834 SEncParamExt sParam1;
28232835 encoder_->GetDefaultParams (&sParam1);
2824− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2836+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
28252837 sParam1.eSpsPpsIdStrategy = SPS_PPS_LISTING;
28262838
28272839 //prepare output if needed
@@ -2886,14 +2898,14 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING2) { · 58 unmodified lines
28862898 SEncParamExt sParam1;
28872899 SEncParamExt sParam2;
28882900 encoder_->GetDefaultParams (&sParam1);
2889− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2901+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
28902902 sParam1.eSpsPpsIdStrategy = SPS_PPS_LISTING;
28912903 //prepare param2
28922904 memcpy (&sParam2, &sParam1, sizeof (SEncParamExt));
28932905 while (GET_MB_WIDTH (sParam2.iPicWidth) == GET_MB_WIDTH (sParam1.iPicWidth)) {
28942906 sParam2.iPicWidth = GetRandWidth();
28952907 }
2896− prepareParam (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
2908+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
28972909 sParam2.eSpsPpsIdStrategy = SPS_PPS_LISTING;
28982910
28992911 //prepare output if needed
@@ -2945,14 +2957,14 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 45 unmodified lines
29452957 SEncParamExt sParam2;
29462958 SEncParamExt sParam3;
29472959 encoder_->GetDefaultParams (&sParam1);
2948− prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
2960+ prepareParamDefault (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate, &sParam1);
29492961 sParam1.eSpsPpsIdStrategy = SPS_PPS_LISTING;
29502962 //prepare param2
29512963 memcpy (&sParam2, &sParam1, sizeof (SEncParamExt));
29522964 while (GET_MB_WIDTH (sParam2.iPicWidth) == GET_MB_WIDTH (sParam1.iPicWidth)) {
29532965 sParam2.iPicWidth = GetRandWidth();
29542966 }
2955− prepareParam (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
2967+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam2.iPicWidth, sParam2.iPicHeight, fFrameRate, &sParam2);
29562968 sParam2.eSpsPpsIdStrategy = SPS_PPS_LISTING;
29572969 //prepare param3
29582970 memcpy (&sParam3, &sParam1, sizeof (SEncParamExt));
@@ -2960,7 +2972,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 1 unmodified line
29602972 GET_MB_WIDTH (sParam3.iPicWidth) == GET_MB_WIDTH (sParam2.iPicWidth)) {
29612973 sParam3.iPicWidth = GetRandWidth();
29622974 }
2963− prepareParam (iSpatialLayerNum, iSliceNum, sParam3.iPicWidth, sParam3.iPicHeight, fFrameRate, &sParam3);
2975+ prepareParamDefault (iSpatialLayerNum, iSliceNum, sParam3.iPicWidth, sParam3.iPicHeight, fFrameRate, &sParam3);
29642976 sParam3.eSpsPpsIdStrategy = SPS_PPS_LISTING;
29652977
29662978 //prepare output if needed

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t