History

fix a calculation of fAverageFrameRate

Sijia Chen committed 12 years ago

Commit cd5928d1 parent 54c677c2 files · +15 −3Browse files

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

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+10−0
@@ -124,6 +124,7 @@ void EncoderInterfaceTest::EncodeOneIDRandP (ISVCEncoder* pPtrEnc) { · 123 unmodified lines
124124 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
125125 EXPECT_EQ (sFbi.eFrameType, static_cast<int> (videoFrameTypeIDR));
126126
127+ pSrcPic->uiTimeStamp += 30;
127128 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
128129 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
129130 EXPECT_NE (sFbi.eFrameType, static_cast<int> (videoFrameTypeIDR));
@@ -687,6 +688,7 @@ void EncoderInterfaceTest::ChangeResolutionAndCheckStatistics (const SEncParamBa · 557 unmodified lines
687688
688689 // 3, code one frame
689690 PrepareOneSrcFrame();
691+ pSrcPic->uiTimeStamp = 30 * pEncoderStatistics->uiInputFrameCount;
690692 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
691693 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
692694 iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, pEncoderStatistics);
@@ -738,6 +740,14 @@ TEST_F (EncoderInterfaceTest, GetStatistics) { · 45 unmodified lines
738740 sEncParamBase.iPicHeight = (sEncParamBase.iPicHeight % 16) + 1; //try 1~16
739741 ChangeResolutionAndCheckStatistics (sEncParamBase, &sEncoderStatistics);
740742
743+ // try timestamp and frame rate
744+ pSrcPic->uiTimeStamp = 1000;
745+ iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
746+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
747+ iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, &sEncoderStatistics);
748+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
749+ EXPECT_EQ (static_cast<int> (sEncoderStatistics.fAverageFrameRate), sEncoderStatistics.uiInputFrameCount);
750+
741751 // 4, change log interval
742752 int32_t iInterval = 0;
743753 iResult = pPtrEnc->GetOption (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