Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -487,13 +487,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) { · 486 unmodified lines | ||
| 487 | 487 | GetValidEncParamBase (&sEncParamBase); |
| 488 | 488 | |
| 489 | 489 | 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; | |
| 497 | 493 | |
| 498 | 494 | PrepareOneSrcFrame(); |
| 499 | 495 | |
| @@ -510,13 +506,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) { · 10 unmodified lines | ||
| 510 | 506 | GetValidEncParamBase (&sEncParamBase); |
| 511 | 507 | |
| 512 | 508 | 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; | |
| 520 | 512 | |
| 521 | 513 | PrepareOneSrcFrame(); |
| 522 | 514 | |
| @@ -626,13 +618,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) { · 103 unmodified lines | ||
| 626 | 618 | GetValidEncParamBase (&sEncParamBase); |
| 627 | 619 | |
| 628 | 620 | 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; | |
| 636 | 624 | |
| 637 | 625 | PrepareOneSrcFrame(); |
| 638 | 626 | |
| @@ -676,13 +664,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 37 unmodified lines | ||
| 676 | 664 | sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2; |
| 677 | 665 | |
| 678 | 666 | 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; | |
| 686 | 670 | |
| 687 | 671 | PrepareOneSrcFrame(); |
| 688 | 672 | |
| @@ -708,13 +692,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) { · 19 unmodified lines | ||
| 708 | 692 | GetValidEncParamBase (&sEncParamBase); |
| 709 | 693 | |
| 710 | 694 | 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; | |
| 718 | 698 | PrepareOneSrcFrame(); |
| 719 | 699 | EncodeOneIDRandP (pPtrEnc); |
| 720 | 700 | |
| @@ -797,13 +777,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 76 unmodified lines | ||
| 797 | 777 | GetValidEncParamBase (&sEncParamBase); |
| 798 | 778 | |
| 799 | 779 | 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; | |
| 807 | 783 | |
| 808 | 784 | PrepareOneSrcFrame(); |
| 809 | 785 | EncodeOneIDRandP (pPtrEnc); |
| @@ -864,13 +840,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) { · 54 unmodified lines | ||
| 864 | 840 | GetValidEncParamBase (&sEncParamBase); |
| 865 | 841 | |
| 866 | 842 | 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; | |
| 874 | 846 | |
| 875 | 847 | PrepareOneSrcFrame(); |
| 876 | 848 | iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi); |
| @@ -921,13 +893,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) { · 44 unmodified lines | ||
| 921 | 893 | pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight; |
| 922 | 894 | |
| 923 | 895 | 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; | |
| 931 | 899 | |
| 932 | 900 | int iInterval = 300; |
| 933 | 901 | iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval); |