History

fix low memory crash issue

huili2 committed 9 years ago

Commit d1c0a931 parent 48c2fe116 files · +401 −386Browse files

Showing the changes to test/api/encode_options_test.cpp (1 of 16 files). Show all

Unified · Split

test/api/encode_options_test.cpp+82−73
@@ -10,13 +10,16 @@ · 9 unmodified lines
1010 #include "encode_decode_api_test.h"
1111 using namespace WelsCommon;
1212
13−void EncodeDecodeTestAPIBase::InitialEncDec (int iWidth, int iHeight) {
13+bool EncodeDecodeTestAPIBase::InitialEncDec (int iWidth, int iHeight) {
1414 // for encoder
1515 // I420: 1(Y) + 1/4(U) + 1/4(V)
1616 int frameSize = iWidth * iHeight * 3 / 2;
1717
1818 buf_.SetLength (frameSize);
19− ASSERT_TRUE (buf_.Length() == (size_t)frameSize);
19+ if (buf_.Length() != (size_t)frameSize) {
20+ printf ("buf_.Length() failed! frameSize = %d\n", frameSize);
21+ return false;
22+ }
2023
2124 memset (&EncPic, 0, sizeof (SSourcePicture));
2225 EncPic.iPicWidth = iWidth;
@@ -33,7 +36,9 @@ void EncodeDecodeTestAPIBase::InitialEncDec (int iWidth, int iHeight) { · 10 unmodified lines
3336
3437 //set a fixed random value
3538 iRandValue = rand() % 256;
39+ return true;
3640 }
41+
3742 void EncodeDecodeTestAPIBase::RandomParamExtCombination() {
3843
3944 param_.iPicWidth = WelsClip3 ((((rand() % MAX_WIDTH) >> 1) + 1) << 1, 2, MAX_WIDTH);
@@ -321,7 +326,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionEncParamExt) { · 281 unmodified lines
321326 // so need to enhance the validation check for any random value of each variable in ParamExt
322327
323328 if (cmResultSuccess == iResult) {
324− InitialEncDec (param_.iPicWidth, param_.iPicHeight);
329+ ASSERT_TRUE (InitialEncDec (param_.iPicWidth, param_.iPicHeight));
325330 EncodeOneFrame (0);
326331 encToDecData (info, len);
327332 pData[0] = pData[1] = pData[2] = 0;
@@ -366,7 +371,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionEncParamBase) { · 38 unmodified lines
366371 iResult = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, &param_);
367372
368373 if (cmResultSuccess == iResult) {
369− InitialEncDec (param_.iPicWidth, param_.iPicHeight);
374+ ASSERT_TRUE (InitialEncDec (param_.iPicWidth, param_.iPicHeight));
370375 EncodeOneFrame (0);
371376 encToDecData (info, len);
372377 pData[0] = pData[1] = pData[2] = 0;
@@ -439,34 +444,34 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_INCREASING_ID) { · 66 unmodified lines
439444 int rv = encoder_->InitializeExt (&sParam1);
440445 ASSERT_TRUE (rv == cmResultSuccess) << "InitializeExt: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
441446 sParam1.iPicHeight;
442− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
447+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
443448
444449 // new IDR
445450 rv = encoder_->ForceIntraFrame (true);
446451 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
447− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
452+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
448453
449454 // step#2: pParam2
450455 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
451456 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption: rv = " << rv << " at " << sParam2.iPicWidth << "x" <<
452457 sParam2.iPicHeight;
453− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
458+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
454459
455460 // new IDR
456461 rv = encoder_->ForceIntraFrame (true);
457462 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
458− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
463+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
459464
460465 // step#3: back to pParam1
461466 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
462467 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
463468 sParam1.iPicHeight;
464− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
469+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
465470
466471 // step#4: back to pParam2
467472 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
468473 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv << sParam2.iPicWidth << sParam2.iPicHeight;
469− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
474+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
470475
471476 #ifdef DEBUG_FILE_SAVE_INCREASING_ID
472477 fclose (fEnc);
@@ -487,15 +492,15 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_INCREASING_ID) { · 14 unmodified lines
487492 fEnc = fopen ("enc_INCREASING_ID2.264", "wb");
488493 #endif
489494 iEncFrameNum = 0;
490− EncDecOneFrame (sParam3.iPicWidth, sParam3.iPicHeight, iEncFrameNum++, fEnc);
495+ ASSERT_TRUE (EncDecOneFrame (sParam3.iPicWidth, sParam3.iPicHeight, iEncFrameNum++, fEnc));
491496
492497 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
493498 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
494− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
499+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
495500
496501 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
497502 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
498− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
503+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
499504
500505 #ifdef DEBUG_FILE_SAVE_INCREASING_ID
501506 fclose (fEnc);
@@ -547,36 +552,37 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 45 unmodified lines
547552 //int TraceLevel = WELS_LOG_INFO;
548553 //encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &TraceLevel);
549554 int rv = encoder_->InitializeExt (&sParam1);
555+ printf ("Start EncDecOneFrame()\n");
550556 ASSERT_TRUE (rv == cmResultSuccess) << "InitializeExt: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
551557 sParam1.iPicHeight;
552− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
558+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
553559
554560 // new IDR
555561 rv = encoder_->ForceIntraFrame (true);
556562 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
557− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
563+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
558564
559565 // step#2: pParam2
560566 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
561567 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption: rv = " << rv << " at " << sParam2.iPicWidth << "x" <<
562568 sParam2.iPicHeight;
563− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
569+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
564570
565571 // new IDR
566572 rv = encoder_->ForceIntraFrame (true);
567573 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
568− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
574+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
569575
570576 // step#3: back to pParam1
571577 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
572578 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
573579 sParam1.iPicHeight;
574− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
580+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
575581
576582 // step#4: back to pParam2
577583 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
578584 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv << sParam2.iPicWidth << sParam2.iPicHeight;
579− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
585+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
580586
581587 #ifdef DEBUG_FILE_SAVE2
582588 fclose (fEnc);
@@ -597,15 +603,15 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 14 unmodified lines
597603 fEnc = fopen ("enc_SPS_LISTING_AND_PPS_INCREASING11.264", "wb");
598604 #endif
599605 iEncFrameNum = 0;
600− EncDecOneFrame (sParam3.iPicWidth, sParam3.iPicHeight, iEncFrameNum++, fEnc);
606+ ASSERT_TRUE (EncDecOneFrame (sParam3.iPicWidth, sParam3.iPicHeight, iEncFrameNum++, fEnc));
601607
602608 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
603609 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
604− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
610+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
605611
606612 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
607613 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
608− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
614+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
609615
610616 #ifdef DEBUG_FILE_SAVE2
611617 fclose (fEnc);
@@ -657,12 +663,12 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 45 unmodified lines
657663 // step#3: set back to pParam1, with a smaller num_ref, it still uses the previous SPS
658664 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
659665 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam1: rv = " << rv;
660− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
666+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
661667
662668 // new IDR, PPS increases
663669 rv = encoder_->ForceIntraFrame (true);
664670 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
665− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
671+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
666672
667673 rv = encoder_->Uninitialize();
668674 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
@@ -719,7 +725,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_LISTING_AND_PPS_INCREASING · 50 unmodified lines
719725 sParam2.iPicWidth;
720726 } // end of setting loop
721727
722− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
728+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
723729
724730 #ifdef DEBUG_FILE_SAVE2
725731 fclose (fEnc);
@@ -765,13 +771,13 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING1) { · 39 unmodified lines
765771 int rv = encoder_->InitializeExt (&sParam1);
766772 ASSERT_TRUE (rv == cmResultSuccess) << "InitializeExt: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
767773 sParam1.iPicHeight;
768− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
769− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
774+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
775+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
770776
771777 // new IDR
772778 rv = encoder_->ForceIntraFrame (true);
773779 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
774− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
780+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
775781
776782 rv = encoder_->Uninitialize();
777783 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
@@ -841,18 +847,18 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING2) { · 63 unmodified lines
841847 // step#2: pParam2
842848 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
843849 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
844− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
850+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
845851
846852 // step#3: back to pParam1, SHOULD NOT encounter ERROR
847853 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam1);
848854 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption: rv = " << rv << " at " << sParam1.iPicWidth << "x" <<
849855 sParam1.iPicHeight;
850− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
856+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
851857
852858 // new IDR
853859 rv = encoder_->ForceIntraFrame (true);
854860 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
855− EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc);
861+ ASSERT_TRUE (EncDecOneFrame (sParam1.iPicWidth, sParam1.iPicHeight, iEncFrameNum++, fEnc));
856862
857863 rv = encoder_->Uninitialize();
858864 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
@@ -906,7 +912,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 47 unmodified lines
906912 sParam1.iPicHeight;
907913 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam2);
908914 ASSERT_TRUE (rv == cmResultSuccess) << "SetOption Failed sParam2: rv = " << rv;
909− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
915+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
910916
911917 // step#2: set strategy for success
912918 int32_t iNewStra = SPS_PPS_LISTING;
@@ -921,7 +927,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 8 unmodified lines
921927 rv = encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iNewStra);
922928 ASSERT_TRUE (rv != cmResultSuccess);
923929
924− EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc);
930+ ASSERT_TRUE (EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc));
925931
926932 // step#4: pParam3, SHOULD encounter ERROR
927933 rv = encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam3);
@@ -966,12 +972,12 @@ TEST_F (EncodeDecodeTestAPI, SimulcastSVC) { · 38 unmodified lines
966972 int iIdx = 0;
967973 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
968974 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
969− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
975+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
970976 aLen[iIdx] = 0;
971977
972978 long rv = WelsCreateDecoder (&decoder[iIdx]);
973979 ASSERT_EQ (0, rv);
974− EXPECT_TRUE (decoder[iIdx] != NULL);
980+ ASSERT_TRUE (decoder[iIdx] != NULL);
975981
976982 SDecodingParam decParam;
977983 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -988,7 +994,7 @@ TEST_F (EncodeDecodeTestAPI, SimulcastSVC) { · 10 unmodified lines
988994 int iLayerLen = 0;
989995 unsigned char* pData[3] = { NULL };
990996
991− InitialEncDec (param_.iPicWidth, param_.iPicHeight);
997+ ASSERT_TRUE (InitialEncDec (param_.iPicWidth, param_.iPicHeight));
992998 EncodeOneFrame (0);
993999
9941000 iLayerLen = 0;
@@ -1083,12 +1089,12 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC) { · 88 unmodified lines
10831089 //create decoder
10841090 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
10851091 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1086− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1092+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
10871093 aLen[iIdx] = 0;
10881094
10891095 long rv = WelsCreateDecoder (&decoder[iIdx]);
10901096 ASSERT_EQ (0, rv);
1091− EXPECT_TRUE (decoder[iIdx] != NULL);
1097+ ASSERT_TRUE (decoder[iIdx] != NULL);
10921098
10931099 SDecodingParam decParam;
10941100 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1106,7 +1112,7 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC) { · 11 unmodified lines
11061112 int iLayerLen = 0;
11071113 unsigned char* pData[3] = { NULL };
11081114
1109− InitialEncDec (param_.iPicWidth, param_.iPicHeight);
1115+ ASSERT_TRUE (InitialEncDec (param_.iPicWidth, param_.iPicHeight));
11101116 EncodeOneFrame (0);
11111117
11121118 // init
@@ -1197,11 +1203,11 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC_SPS_PPS_LISTING) { · 84 unmodified lines
11971203 //create decoder
11981204 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
11991205 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1200− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1206+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
12011207
12021208 long rv = WelsCreateDecoder (&decoder[iIdx]);
12031209 ASSERT_EQ (0, rv);
1204− EXPECT_TRUE (decoder[iIdx] != NULL);
1210+ ASSERT_TRUE (decoder[iIdx] != NULL);
12051211
12061212 SDecodingParam decParam;
12071213 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1213,8 +1219,8 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVC_SPS_PPS_LISTING) { · 5 unmodified lines
12131219 ASSERT_EQ (0, rv);
12141220 }
12151221
1216− TestOneSimulcastAVC (&sParam1, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0);
1217− TestOneSimulcastAVC (&sParam2, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0);
1222+ ASSERT_TRUE (TestOneSimulcastAVC (&sParam1, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0));
1223+ ASSERT_TRUE (TestOneSimulcastAVC (&sParam2, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0));
12181224
12191225 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
12201226 free (pBsBuf[iIdx]);
@@ -1367,8 +1373,7 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 146 unmodified lines
13671373 encoder_->Uninitialize();
13681374 int rv = encoder_->InitializeExt (&param_);
13691375 ASSERT_TRUE (rv == cmResultSuccess);
1370− InitialEncDec (p.iWidth, p.iHeight);
1371−
1376+ ASSERT_TRUE (InitialEncDec (p.iWidth, p.iHeight));
13721377
13731378 int32_t iSpsPpsIdAddition = 1;
13741379 encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition);
@@ -1456,12 +1461,12 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVCDiffFps) { · 81 unmodified lines
14561461 //create decoder
14571462 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
14581463 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1459− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1464+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
14601465 aLen[iIdx] = 0;
14611466
14621467 long rv = WelsCreateDecoder (&decoder[iIdx]);
14631468 ASSERT_EQ (0, rv);
1464− EXPECT_TRUE (decoder[iIdx] != NULL);
1469+ ASSERT_TRUE (decoder[iIdx] != NULL);
14651470
14661471 SDecodingParam decParam;
14671472 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1494,7 +1499,7 @@ TEST_F (EncodeDecodeTestAPI, SimulcastAVCDiffFps) { · 26 unmodified lines
14941499 int iLayerLen = 0;
14951500 unsigned char* pData[3] = { NULL };
14961501
1497− InitialEncDec (param_.iPicWidth, param_.iPicHeight);
1502+ ASSERT_TRUE (InitialEncDec (param_.iPicWidth, param_.iPicHeight));
14981503 EncodeOneFrame (0);
14991504
15001505 if (iInsertIdr == iFrame) {
@@ -1597,11 +1602,11 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayer) { · 96 unmodified lines
15971602 //create decoder
15981603 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
15991604 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1600− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1605+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
16011606
16021607 long rv = WelsCreateDecoder (&decoder[iIdx]);
16031608 ASSERT_EQ (0, rv);
1604− EXPECT_TRUE (decoder[iIdx] != NULL);
1609+ ASSERT_TRUE (decoder[iIdx] != NULL);
16051610
16061611 SDecodingParam decParam;
16071612 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1613,10 +1618,13 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayer) { · 5 unmodified lines
16131618 ASSERT_EQ (0, rv);
16141619 }
16151620
1616− TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0);
1621+ ASSERT_TRUE (TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0));
16171622
16181623 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
1619− free (pBsBuf[iIdx]);
1624+ if (pBsBuf[iIdx]) {
1625+ free (pBsBuf[iIdx]);
1626+ pBsBuf[iIdx] = NULL;
1627+ }
16201628
16211629 if (decoder[iIdx] != NULL) {
16221630 decoder[iIdx]->Uninitialize();
@@ -1665,11 +1673,11 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayerMixed) { · 42 unmodified lines
16651673 //create decoder
16661674 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
16671675 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1668− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1676+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
16691677
16701678 long rv = WelsCreateDecoder (&decoder[iIdx]);
16711679 ASSERT_EQ (0, rv);
1672− EXPECT_TRUE (decoder[iIdx] != NULL);
1680+ ASSERT_TRUE (decoder[iIdx] != NULL);
16731681
16741682 SDecodingParam decParam;
16751683 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1681,10 +1689,11 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayerMixed) { · 5 unmodified lines
16811689 ASSERT_EQ (0, rv);
16821690 }
16831691
1684− TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0);
1692+ ASSERT_TRUE (TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0));
16851693
16861694 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
1687− free (pBsBuf[iIdx]);
1695+ if (pBsBuf[iIdx])
1696+ free (pBsBuf[iIdx]);
16881697
16891698 if (decoder[iIdx] != NULL) {
16901699 decoder[iIdx]->Uninitialize();
@@ -1725,11 +1734,11 @@ TEST_F (EncodeDecodeTestAPI, ThreadNumAndSliceNum) { · 34 unmodified lines
17251734 //create decoder
17261735 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
17271736 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1728− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1737+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
17291738
17301739 long rv = WelsCreateDecoder (&decoder[iIdx]);
17311740 ASSERT_EQ (0, rv);
1732− EXPECT_TRUE (decoder[iIdx] != NULL);
1741+ ASSERT_TRUE (decoder[iIdx] != NULL);
17331742
17341743 SDecodingParam decParam;
17351744 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1741,7 +1750,7 @@ TEST_F (EncodeDecodeTestAPI, ThreadNumAndSliceNum) { · 5 unmodified lines
17411750 ASSERT_EQ (0, rv);
17421751 }
17431752
1744− TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0);
1753+ ASSERT_TRUE (TestOneSimulcastAVC (&sParam, decoder, pBsBuf, iSpatialLayerNum, iEncFrameNum, 0));
17451754
17461755 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
17471756 free (pBsBuf[iIdx]);
@@ -1790,11 +1799,11 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 42 unmodified lines
17901799 //create decoder
17911800 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
17921801 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
1793− EXPECT_TRUE (pBsBuf[iIdx] != NULL);
1802+ ASSERT_TRUE (pBsBuf[iIdx] != NULL);
17941803
17951804 long rv = WelsCreateDecoder (&decoder[iIdx]);
17961805 ASSERT_EQ (0, rv);
1797− EXPECT_TRUE (decoder[iIdx] != NULL);
1806+ ASSERT_TRUE (decoder[iIdx] != NULL);
17981807
17991808 SDecodingParam decParam;
18001809 memset (&decParam, 0, sizeof (SDecodingParam));
@@ -1815,7 +1824,7 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 14 unmodified lines
18151824 int iLayerLen = 0;
18161825 unsigned char* pData[3] = { NULL };
18171826
1818− InitialEncDec (sParam.iPicWidth, sParam.iPicHeight);
1827+ ASSERT_TRUE (InitialEncDec (sParam.iPicWidth, sParam.iPicHeight));
18191828 int frameSize = EncPic.iPicWidth * EncPic.iPicHeight * 3 / 2;
18201829 memset (buf_.data(), rand() % 256, (frameSize >> 2));
18211830 memset (buf_.data() + (frameSize >> 2), rand() % 256, (frameSize - (frameSize >> 2)));
@@ -1920,16 +1929,16 @@ TEST_F (EncodeDecodeTestAPI, ProfileLevelSetting) { · 98 unmodified lines
19201929 int iSliceNum = 1;
19211930
19221931 EProfileIdc profileList[11] = {PRO_UNKNOWN, PRO_BASELINE, PRO_MAIN,
1923− PRO_EXTENDED , PRO_HIGH , PRO_HIGH10,
1924− PRO_HIGH422, PRO_HIGH444, PRO_CAVLC444,
1925− PRO_SCALABLE_BASELINE,
1926− PRO_SCALABLE_HIGH
1927− };
1932+ PRO_EXTENDED , PRO_HIGH , PRO_HIGH10,
1933+ PRO_HIGH422, PRO_HIGH444, PRO_CAVLC444,
1934+ PRO_SCALABLE_BASELINE,
1935+ PRO_SCALABLE_HIGH
1936+ };
19281937 ELevelIdc levelList[18] = { LEVEL_UNKNOWN, LEVEL_1_0, LEVEL_1_B, LEVEL_1_1, LEVEL_1_2,
1929− LEVEL_1_3, LEVEL_2_0, LEVEL_2_1, LEVEL_2_2, LEVEL_3_0,
1930− LEVEL_3_1, LEVEL_3_2, LEVEL_4_0, LEVEL_4_1,
1931− LEVEL_4_2, LEVEL_5_0, LEVEL_5_1, LEVEL_5_2
1932− };
1938+ LEVEL_1_3, LEVEL_2_0, LEVEL_2_1, LEVEL_2_2, LEVEL_3_0,
1939+ LEVEL_3_1, LEVEL_3_2, LEVEL_4_0, LEVEL_4_1,
1940+ LEVEL_4_2, LEVEL_5_0, LEVEL_5_1, LEVEL_5_2
1941+ };
19331942
19341943 EProfileIdc iEncProfileIdc = PRO_UNKNOWN;
19351944 ELevelIdc iEncLevelIdc = LEVEL_UNKNOWN;
@@ -1958,7 +1967,7 @@ TEST_F (EncodeDecodeTestAPI, ProfileLevelSetting) { · 22 unmodified lines
19581967 int rv = encoder_->InitializeExt (&sParam);
19591968 ASSERT_TRUE (rv == cmResultSuccess) << "InitializeExt: rv = " << rv << " at " << sParam.iPicWidth << "x" <<
19601969 sParam.iPicHeight;
1961− EncDecOneFrame (sParam.iPicWidth, sParam.iPicHeight, iEncFrameNum++, NULL);
1970+ ASSERT_TRUE (EncDecOneFrame (sParam.iPicWidth, sParam.iPicHeight, iEncFrameNum++, NULL));
19621971
19631972 decoder_->GetOption (DECODER_OPTION_PROFILE, &iDecProfileIdc);
19641973
@@ -2021,7 +2030,7 @@ TEST_F (EncodeDecodeTestAPI, ProfileLevelSetting) { · 56 unmodified lines
20212030 rv = encoder_->ForceIntraFrame (true);
20222031 ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv;
20232032
2024− EncDecOneFrame (sParam.iPicWidth, sParam.iPicHeight, iEncFrameNum++, NULL);
2033+ ASSERT_TRUE (EncDecOneFrame (sParam.iPicWidth, sParam.iPicHeight, iEncFrameNum++, NULL));
20252034
20262035 decoder_->GetOption (DECODER_OPTION_PROFILE, &iDecProfileIdc);
20272036

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