History

improve error logging in UT

Sijia Chen committed 11 years ago

Commit 3c085ae1 parent 9b442b31 file · +24 −56Browse files

Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 1 file). Show all

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+24−56
@@ -487,13 +487,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) { · 486 unmodified lines
487487 GetValidEncParamBase (&sEncParamBase);
488488
489489 int iResult = pPtrEnc->Initialize (&sEncParamBase);
490− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
491− if (iResult != cmResultSuccess) {
492− fprintf (stderr, "Unexpected ParamBase? \
493− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
494− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
495− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
496− }
490+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
491+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
492+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
497493
498494 PrepareOneSrcFrame();
499495
@@ -510,13 +506,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) { · 10 unmodified lines
510506 GetValidEncParamBase (&sEncParamBase);
511507
512508 int iResult = pPtrEnc->Initialize (&sEncParamBase);
513− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
514− if (iResult != cmResultSuccess) {
515− fprintf (stderr, "Unexpected ParamBase? \
516− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
517− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
518− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
519− }
509+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
510+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
511+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
520512
521513 PrepareOneSrcFrame();
522514
@@ -626,13 +618,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) { · 103 unmodified lines
626618 GetValidEncParamBase (&sEncParamBase);
627619
628620 int iResult = pPtrEnc->Initialize (&sEncParamBase);
629− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
630− if (iResult != cmResultSuccess) {
631− fprintf (stderr, "Unexpected ParamBase? \
632− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
633− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
634− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
635− }
621+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
622+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
623+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
636624
637625 PrepareOneSrcFrame();
638626
@@ -676,13 +664,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 37 unmodified lines
676664 sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;
677665
678666 int iResult = pPtrEnc->InitializeExt (&sEncParamExt);
679− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
680− if (iResult != cmResultSuccess) {
681− fprintf (stderr, "Unexpected ParamBase? \
682− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
683− sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
684− sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
685− }
667+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
668+ ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
669+ sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
686670
687671 PrepareOneSrcFrame();
688672
@@ -708,13 +692,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) { · 19 unmodified lines
708692 GetValidEncParamBase (&sEncParamBase);
709693
710694 int iResult = pPtrEnc->Initialize (&sEncParamBase);
711− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
712− if (iResult != cmResultSuccess) {
713− fprintf (stderr, "Unexpected ParamBase? \
714− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
715− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
716− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
717− }
695+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
696+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
697+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
718698 PrepareOneSrcFrame();
719699 EncodeOneIDRandP (pPtrEnc);
720700
@@ -797,13 +777,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 76 unmodified lines
797777 GetValidEncParamBase (&sEncParamBase);
798778
799779 int iResult = pPtrEnc->Initialize (&sEncParamBase);
800− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
801− if (iResult != cmResultSuccess) {
802− fprintf (stderr, "Unexpected ParamBase? \
803− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
804− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
805− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
806− }
780+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
781+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
782+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
807783
808784 PrepareOneSrcFrame();
809785 EncodeOneIDRandP (pPtrEnc);
@@ -864,13 +840,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) { · 54 unmodified lines
864840 GetValidEncParamBase (&sEncParamBase);
865841
866842 int iResult = pPtrEnc->Initialize (&sEncParamBase);
867− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
868− if (iResult != cmResultSuccess) {
869− fprintf (stderr, "Unexpected ParamBase? \
870− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
871− sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
872− sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
873− }
843+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
844+ ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
845+ sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
874846
875847 PrepareOneSrcFrame();
876848 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
@@ -921,13 +893,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) { · 44 unmodified lines
921893 pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;
922894
923895 iResult = pPtrEnc->InitializeExt (&sEncParamExt);
924− EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
925− if (iResult != cmResultSuccess) {
926− fprintf (stderr, "Unexpected sEncParamExt? \
927− iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
928− sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
929− sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
930− }
896+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
897+ ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
898+ sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
931899
932900 int iInterval = 300;
933901 iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval);

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