History

Merge pull request #1786 from sijchen/fix_over

improve error logging in UT

ruil2 committed 11 years ago

Commit 7d055ca2 parents 8246225 3c085ae1 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
@@ -491,13 +491,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) { · 490 unmodified lines
491 GetValidEncParamBase (&sEncParamBase);491 GetValidEncParamBase (&sEncParamBase);
492 492
493 int iResult = pPtrEnc->Initialize (&sEncParamBase);493 int iResult = pPtrEnc->Initialize (&sEncParamBase);
494 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));494 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
495 if (iResult != cmResultSuccess) {495 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
496 fprintf (stderr, "Unexpected ParamBase? \496 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
497 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
498 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
499 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
500 }
501 497
502 PrepareOneSrcFrame();498 PrepareOneSrcFrame();
503 499
@@ -514,13 +510,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) { · 10 unmodified lines
514 GetValidEncParamBase (&sEncParamBase);510 GetValidEncParamBase (&sEncParamBase);
515 511
516 int iResult = pPtrEnc->Initialize (&sEncParamBase);512 int iResult = pPtrEnc->Initialize (&sEncParamBase);
517 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));513 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
518 if (iResult != cmResultSuccess) {514 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
519 fprintf (stderr, "Unexpected ParamBase? \515 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
520 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
521 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
522 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
523 }
524 516
525 PrepareOneSrcFrame();517 PrepareOneSrcFrame();
526 518
@@ -630,13 +622,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) { · 103 unmodified lines
630 GetValidEncParamBase (&sEncParamBase);622 GetValidEncParamBase (&sEncParamBase);
631 623
632 int iResult = pPtrEnc->Initialize (&sEncParamBase);624 int iResult = pPtrEnc->Initialize (&sEncParamBase);
633 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));625 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
634 if (iResult != cmResultSuccess) {626 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
635 fprintf (stderr, "Unexpected ParamBase? \627 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
636 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
637 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
638 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
639 }
640 628
641 PrepareOneSrcFrame();629 PrepareOneSrcFrame();
642 630
@@ -680,13 +668,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 37 unmodified lines
680 sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;668 sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;
681 669
682 int iResult = pPtrEnc->InitializeExt (&sEncParamExt);670 int iResult = pPtrEnc->InitializeExt (&sEncParamExt);
683 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));671 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
684 if (iResult != cmResultSuccess) {672 ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
685 fprintf (stderr, "Unexpected ParamBase? \673 sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
686 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
687 sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
688 sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
689 }
690 674
691 PrepareOneSrcFrame();675 PrepareOneSrcFrame();
692 676
@@ -712,13 +696,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) { · 19 unmodified lines
712 GetValidEncParamBase (&sEncParamBase);696 GetValidEncParamBase (&sEncParamBase);
713 697
714 int iResult = pPtrEnc->Initialize (&sEncParamBase);698 int iResult = pPtrEnc->Initialize (&sEncParamBase);
715 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));699 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
716 if (iResult != cmResultSuccess) {700 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
717 fprintf (stderr, "Unexpected ParamBase? \701 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
718 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
719 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
720 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
721 }
722 PrepareOneSrcFrame();702 PrepareOneSrcFrame();
723 EncodeOneIDRandP (pPtrEnc);703 EncodeOneIDRandP (pPtrEnc);
724 704
@@ -801,13 +781,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 76 unmodified lines
801 GetValidEncParamBase (&sEncParamBase);781 GetValidEncParamBase (&sEncParamBase);
802 782
803 int iResult = pPtrEnc->Initialize (&sEncParamBase);783 int iResult = pPtrEnc->Initialize (&sEncParamBase);
804 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));784 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
805 if (iResult != cmResultSuccess) {785 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
806 fprintf (stderr, "Unexpected ParamBase? \786 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
807 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
808 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
809 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
810 }
811 787
812 PrepareOneSrcFrame();788 PrepareOneSrcFrame();
813 EncodeOneIDRandP (pPtrEnc);789 EncodeOneIDRandP (pPtrEnc);
@@ -868,13 +844,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) { · 54 unmodified lines
868 GetValidEncParamBase (&sEncParamBase);844 GetValidEncParamBase (&sEncParamBase);
869 845
870 int iResult = pPtrEnc->Initialize (&sEncParamBase);846 int iResult = pPtrEnc->Initialize (&sEncParamBase);
871 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));847 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
872 if (iResult != cmResultSuccess) {848 ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
873 fprintf (stderr, "Unexpected ParamBase? \849 sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
874 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
875 sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
876 sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
877 }
878 850
879 PrepareOneSrcFrame();851 PrepareOneSrcFrame();
880 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);852 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
@@ -925,13 +897,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) { · 44 unmodified lines
925 pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;897 pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;
926 898
927 iResult = pPtrEnc->InitializeExt (&sEncParamExt);899 iResult = pPtrEnc->InitializeExt (&sEncParamExt);
928 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));900 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
929 if (iResult != cmResultSuccess) {901 ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
930 fprintf (stderr, "Unexpected sEncParamExt? \902 sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
931 iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
932 sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
933 sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
934 }
935 903
936 int iInterval = 300;904 int iInterval = 300;
937 iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval);905 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