improve error logging in UT
Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -491,13 +491,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) { · 490 unmodified lines | ||
| 491 | 491 | GetValidEncParamBase (&sEncParamBase); |
| 492 | 492 | |
| 493 | 493 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 494 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 495 | − if (iResult != cmResultSuccess) { | |
| 496 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 494 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 495 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 496 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 501 | 497 | |
| 502 | 498 | PrepareOneSrcFrame(); |
| 503 | 499 | |
| @@ -514,13 +510,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) { · 10 unmodified lines | ||
| 514 | 510 | GetValidEncParamBase (&sEncParamBase); |
| 515 | 511 | |
| 516 | 512 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 517 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 518 | − if (iResult != cmResultSuccess) { | |
| 519 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 513 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 514 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 515 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 524 | 516 | |
| 525 | 517 | PrepareOneSrcFrame(); |
| 526 | 518 | |
| @@ -630,13 +622,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) { · 103 unmodified lines | ||
| 630 | 622 | GetValidEncParamBase (&sEncParamBase); |
| 631 | 623 | |
| 632 | 624 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 633 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 634 | − if (iResult != cmResultSuccess) { | |
| 635 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 625 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 626 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 627 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 640 | 628 | |
| 641 | 629 | PrepareOneSrcFrame(); |
| 642 | 630 | |
| @@ -680,13 +668,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 37 unmodified lines | ||
| 680 | 668 | sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2; |
| 681 | 669 | |
| 682 | 670 | int iResult = pPtrEnc->InitializeExt (&sEncParamExt); |
| 683 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 684 | − if (iResult != cmResultSuccess) { | |
| 685 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 671 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType << | |
| 672 | + ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " << | |
| 673 | + sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate; | |
| 690 | 674 | |
| 691 | 675 | PrepareOneSrcFrame(); |
| 692 | 676 | |
| @@ -712,13 +696,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) { · 19 unmodified lines | ||
| 712 | 696 | GetValidEncParamBase (&sEncParamBase); |
| 713 | 697 | |
| 714 | 698 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 715 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 716 | − if (iResult != cmResultSuccess) { | |
| 717 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 699 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 700 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 701 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 722 | 702 | PrepareOneSrcFrame(); |
| 723 | 703 | EncodeOneIDRandP (pPtrEnc); |
| 724 | 704 | |
| @@ -801,13 +781,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 76 unmodified lines | ||
| 801 | 781 | GetValidEncParamBase (&sEncParamBase); |
| 802 | 782 | |
| 803 | 783 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 804 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 805 | − if (iResult != cmResultSuccess) { | |
| 806 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 784 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 785 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 786 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 811 | 787 | |
| 812 | 788 | PrepareOneSrcFrame(); |
| 813 | 789 | EncodeOneIDRandP (pPtrEnc); |
| @@ -868,13 +844,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) { · 54 unmodified lines | ||
| 868 | 844 | GetValidEncParamBase (&sEncParamBase); |
| 869 | 845 | |
| 870 | 846 | int iResult = pPtrEnc->Initialize (&sEncParamBase); |
| 871 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 872 | − if (iResult != cmResultSuccess) { | |
| 873 | − fprintf (stderr, "Unexpected ParamBase? \ | |
| 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 | − } | |
| 847 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType << | |
| 848 | + ", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " << | |
| 849 | + sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate; | |
| 878 | 850 | |
| 879 | 851 | PrepareOneSrcFrame(); |
| 880 | 852 | iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi); |
| @@ -925,13 +897,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) { · 44 unmodified lines | ||
| 925 | 897 | pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight; |
| 926 | 898 | |
| 927 | 899 | iResult = pPtrEnc->InitializeExt (&sEncParamExt); |
| 928 | − EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 929 | − if (iResult != cmResultSuccess) { | |
| 930 | − fprintf (stderr, "Unexpected sEncParamExt? \ | |
| 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 | − } | |
| 900 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType << | |
| 901 | + ", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " << | |
| 902 | + sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate; | |
| 935 | 903 | |
| 936 | 904 | int iInterval = 300; |
| 937 | 905 | iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval); |