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
487 GetValidEncParamBase (&sEncParamBase);487 GetValidEncParamBase (&sEncParamBase);
488 488
489 int iResult = pPtrEnc->Initialize (&sEncParamBase);489 int iResult = pPtrEnc->Initialize (&sEncParamBase);
490 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));490 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
491 if (iResult != cmResultSuccess) {491 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
492 fprintf (stderr, "Unexpected ParamBase? \492 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
497 493
498 PrepareOneSrcFrame();494 PrepareOneSrcFrame();
499 495
@@ -510,13 +506,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) { · 10 unmodified lines
510 GetValidEncParamBase (&sEncParamBase);506 GetValidEncParamBase (&sEncParamBase);
511 507
512 int iResult = pPtrEnc->Initialize (&sEncParamBase);508 int iResult = pPtrEnc->Initialize (&sEncParamBase);
513 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));509 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
514 if (iResult != cmResultSuccess) {510 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
515 fprintf (stderr, "Unexpected ParamBase? \511 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
520 512
521 PrepareOneSrcFrame();513 PrepareOneSrcFrame();
522 514
@@ -626,13 +618,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) { · 103 unmodified lines
626 GetValidEncParamBase (&sEncParamBase);618 GetValidEncParamBase (&sEncParamBase);
627 619
628 int iResult = pPtrEnc->Initialize (&sEncParamBase);620 int iResult = pPtrEnc->Initialize (&sEncParamBase);
629 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));621 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
630 if (iResult != cmResultSuccess) {622 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
631 fprintf (stderr, "Unexpected ParamBase? \623 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
636 624
637 PrepareOneSrcFrame();625 PrepareOneSrcFrame();
638 626
@@ -676,13 +664,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 37 unmodified lines
676 sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;664 sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;
677 665
678 int iResult = pPtrEnc->InitializeExt (&sEncParamExt);666 int iResult = pPtrEnc->InitializeExt (&sEncParamExt);
679 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));667 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
680 if (iResult != cmResultSuccess) {668 ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
681 fprintf (stderr, "Unexpected ParamBase? \669 sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
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 }
686 670
687 PrepareOneSrcFrame();671 PrepareOneSrcFrame();
688 672
@@ -708,13 +692,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) { · 19 unmodified lines
708 GetValidEncParamBase (&sEncParamBase);692 GetValidEncParamBase (&sEncParamBase);
709 693
710 int iResult = pPtrEnc->Initialize (&sEncParamBase);694 int iResult = pPtrEnc->Initialize (&sEncParamBase);
711 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));695 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
712 if (iResult != cmResultSuccess) {696 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
713 fprintf (stderr, "Unexpected ParamBase? \697 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
718 PrepareOneSrcFrame();698 PrepareOneSrcFrame();
719 EncodeOneIDRandP (pPtrEnc);699 EncodeOneIDRandP (pPtrEnc);
720 700
@@ -797,13 +777,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 76 unmodified lines
797 GetValidEncParamBase (&sEncParamBase);777 GetValidEncParamBase (&sEncParamBase);
798 778
799 int iResult = pPtrEnc->Initialize (&sEncParamBase);779 int iResult = pPtrEnc->Initialize (&sEncParamBase);
800 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));780 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
801 if (iResult != cmResultSuccess) {781 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
802 fprintf (stderr, "Unexpected ParamBase? \782 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
807 783
808 PrepareOneSrcFrame();784 PrepareOneSrcFrame();
809 EncodeOneIDRandP (pPtrEnc);785 EncodeOneIDRandP (pPtrEnc);
@@ -864,13 +840,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) { · 54 unmodified lines
864 GetValidEncParamBase (&sEncParamBase);840 GetValidEncParamBase (&sEncParamBase);
865 841
866 int iResult = pPtrEnc->Initialize (&sEncParamBase);842 int iResult = pPtrEnc->Initialize (&sEncParamBase);
867 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));843 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
868 if (iResult != cmResultSuccess) {844 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
869 fprintf (stderr, "Unexpected ParamBase? \845 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
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 }
874 846
875 PrepareOneSrcFrame();847 PrepareOneSrcFrame();
876 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);848 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
@@ -921,13 +893,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) { · 44 unmodified lines
921 pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;893 pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;
922 894
923 iResult = pPtrEnc->InitializeExt (&sEncParamExt);895 iResult = pPtrEnc->InitializeExt (&sEncParamExt);
924 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));896 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
925 if (iResult != cmResultSuccess) {897 ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
926 fprintf (stderr, "Unexpected sEncParamExt? \898 sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
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 }
931 899
932 int iInterval = 300;900 int iInterval = 300;
933 iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval);901 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