History

modify reserved nal header size and change source frame in NalSizeChecking UT

Karina committed 10 years ago

Commit b5cef5d1 parent 2171d848 files · +4626 −4632Browse files

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

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+6−12
@@ -1091,18 +1091,16 @@ TEST_F (EncoderInterfaceTest, NalSizeChecking) { · 1090 unmodified lines
1091 m_iWidth = pParamExt->iPicWidth;1091 m_iWidth = pParamExt->iPicWidth;
1092 m_iHeight = pParamExt->iPicHeight;1092 m_iHeight = pParamExt->iPicHeight;
1093 m_iPicResSize = m_iWidth * m_iHeight * 3 >> 1;1093 m_iPicResSize = m_iWidth * m_iHeight * 3 >> 1;
1094 delete []pYUV;1094 if(pYUV)
1095 delete []pYUV;
1095 pYUV = new unsigned char [m_iPicResSize];1096 pYUV = new unsigned char [m_iPicResSize];
1097 ASSERT_TRUE (pYUV != NULL);
1096 FileInputStream fileStream;1098 FileInputStream fileStream;
1097 ASSERT_TRUE (fileStream.Open ("res/Cisco_Absolute_Power_1280x720_30fps.yuv"));1099 ASSERT_TRUE (fileStream.Open ("res/Cisco_Absolute_Power_1280x720_30fps.yuv"));
1098 PrepareOneSrcFrame();1100 PrepareOneSrcFrame();
1099 for (int i = 0; i < kiFrameNumber; i ++) {1101 for (int i = 0; i < kiFrameNumber; i ++) {
1100 if(fileStream.read (pYUV, m_iPicResSize) != m_iPicResSize){1102 if(fileStream.read (pYUV, m_iPicResSize) != m_iPicResSize){
1101 int iStartX = rand() % (m_iPicResSize >> 1);1103 break;
1102 int iEndX = (iStartX + (rand() % MEM_VARY_SIZE)) % m_iPicResSize;
1103 for (int j = iStartX; j < iEndX; j++)
1104 pYUV[j] = rand() % 256;
1105
1106 }1104 }
1107 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);1105 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
1108 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));1106 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
@@ -1125,7 +1123,7 @@ TEST_F (EncoderInterfaceTest, NalSizeChecking) { · 16 unmodified lines
1125 m_iPicResSize = m_iWidth * m_iHeight * 3 >> 1;1123 m_iPicResSize = m_iWidth * m_iHeight * 3 >> 1;
1126 delete []pYUV;1124 delete []pYUV;
1127 pYUV = new unsigned char [m_iPicResSize];1125 pYUV = new unsigned char [m_iPicResSize];
1128 1126 ASSERT_TRUE (pYUV != NULL);
1129 iResult = pPtrEnc->InitializeExt (pParamExt);1127 iResult = pPtrEnc->InitializeExt (pParamExt);
1130 PrepareOneSrcFrame();1128 PrepareOneSrcFrame();
1131 1129
@@ -1137,11 +1135,7 @@ TEST_F (EncoderInterfaceTest, NalSizeChecking) { · 5 unmodified lines
1137 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));1135 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
1138 1136
1139 for (int i = 0; i < kiFrameNumber; i ++) {1137 for (int i = 0; i < kiFrameNumber; i ++) {
1140 int iStartX = rand() % (m_iPicResSize >> 1);1138 PrepareOneSrcFrame();
1141 int iEndX = (iStartX + (rand() % MEM_VARY_SIZE)) % m_iPicResSize;
1142 for (int j = iStartX; j < iEndX; j++)
1143 pYUV[j] = rand() % 256;
1144
1145 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);1139 iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
1146 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));1140 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
1147 pSrcPic->uiTimeStamp += 30;1141 pSrcPic->uiTimeStamp += 30;

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