Showing the changes to test/decoder/DecUT_DecExt.cpp (1 of 12 files). Show all
Unified · Split
| @@ -34,8 +34,6 @@ class DecoderInterfaceTest : public ::testing::Test { · 33 unmodified lines | ||
| 34 | 34 | void DecoderBs (const char* sFileName); |
| 35 | 35 | //Test Initialize/Uninitialize |
| 36 | 36 | void TestInitUninit(); |
| 37 | − //DECODER_OPTION_DATAFORMAT | |
| 38 | − void TestDataFormat(); | |
| 39 | 37 | //DECODER_OPTION_END_OF_STREAM |
| 40 | 38 | void TestEndOfStream(); |
| 41 | 39 | //DECODER_OPTION_VCL_NAL |
| @@ -78,7 +76,6 @@ void DecoderInterfaceTest::Init() { · 36 unmodified lines | ||
| 78 | 76 | memset (&m_sBufferInfo, 0, sizeof (SBufferInfo)); |
| 79 | 77 | memset (&m_sDecParam, 0, sizeof (SDecodingParam)); |
| 80 | 78 | m_sDecParam.pFileNameRestructed = NULL; |
| 81 | − m_sDecParam.eOutputColorFormat = (EVideoFormatType) (rand() % 100); | |
| 82 | 79 | m_sDecParam.uiCpuLoad = rand() % 100; |
| 83 | 80 | m_sDecParam.uiTargetDqLayer = rand() % 100; |
| 84 | 81 | m_sDecParam.eEcActiveIdc = (ERROR_CON_IDC) (rand() & 7); |
| @@ -90,11 +87,7 @@ void DecoderInterfaceTest::Init() { · 5 unmodified lines | ||
| 90 | 87 | m_szBuffer[3] = 1; |
| 91 | 88 | m_iBufLength = 4; |
| 92 | 89 | CM_RETURN eRet = (CM_RETURN) m_pDec->Initialize (&m_sDecParam); |
| 93 | − if ((m_sDecParam.eOutputColorFormat != videoFormatI420) && | |
| 94 | − (m_sDecParam.eOutputColorFormat != videoFormatInternal)) | |
| 95 | − ASSERT_EQ (eRet, cmUnsupportedData); | |
| 96 | − else | |
| 97 | − ASSERT_EQ (eRet, cmResultSuccess); | |
| 90 | + ASSERT_EQ (eRet, cmResultSuccess); | |
| 98 | 91 | } |
| 99 | 92 | |
| 100 | 93 | void DecoderInterfaceTest::Uninit() { |
| @@ -210,12 +203,8 @@ void DecoderInterfaceTest::TestInitUninit() { · 109 unmodified lines | ||
| 210 | 203 | EXPECT_EQ (eRet, cmInitExpected); |
| 211 | 204 | } |
| 212 | 205 | //Initialize first, can get input color format |
| 213 | − m_sDecParam.eOutputColorFormat = (EVideoFormatType) 20; //just for test | |
| 214 | 206 | m_sDecParam.bParseOnly = false; |
| 215 | 207 | m_pDec->Initialize (&m_sDecParam); |
| 216 | − eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOutput); | |
| 217 | − EXPECT_EQ (eRet, cmResultSuccess); | |
| 218 | − EXPECT_EQ ((int32_t) videoFormatI420, iOutput); | |
| 219 | 208 | |
| 220 | 209 | //Uninitialize, no GetOption can be done |
| 221 | 210 | m_pDec->Uninitialize(); |
| @@ -227,32 +216,6 @@ void DecoderInterfaceTest::TestInitUninit() { · 5 unmodified lines | ||
| 227 | 216 | } |
| 228 | 217 | } |
| 229 | 218 | |
| 230 | −//DECODER_OPTION_DATAFORMAT | |
| 231 | −void DecoderInterfaceTest::TestDataFormat() { | |
| 232 | − int iTmp = rand(); | |
| 233 | − int iOut; | |
| 234 | − CM_RETURN eRet; | |
| 235 | − | |
| 236 | − Init(); | |
| 237 | − | |
| 238 | − //invalid input | |
| 239 | − eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_DATAFORMAT, NULL); | |
| 240 | − EXPECT_EQ (eRet, cmInitParaError); | |
| 241 | − | |
| 242 | − //valid input | |
| 243 | − eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_DATAFORMAT, &iTmp); | |
| 244 | − if ((iTmp != (int32_t) videoFormatI420) && (iTmp != (int32_t) videoFormatInternal)) | |
| 245 | − EXPECT_EQ (eRet, cmUnsupportedData); | |
| 246 | − else | |
| 247 | − EXPECT_EQ (eRet, cmResultSuccess); | |
| 248 | − eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOut); | |
| 249 | − EXPECT_EQ (eRet, cmResultSuccess); | |
| 250 | − | |
| 251 | − EXPECT_EQ (iOut, (int32_t) videoFormatI420); | |
| 252 | − | |
| 253 | − Uninit(); | |
| 254 | −} | |
| 255 | − | |
| 256 | 219 | //DECODER_OPTION_END_OF_STREAM |
| 257 | 220 | void DecoderInterfaceTest::TestEndOfStream() { |
| 258 | 221 | int iTmp, iOut; |
| @@ -515,8 +478,6 @@ TEST_F (DecoderInterfaceTest, DecoderInterfaceAll) { · 256 unmodified lines | ||
| 515 | 478 | |
| 516 | 479 | //Initialize Uninitialize |
| 517 | 480 | TestInitUninit(); |
| 518 | − //DECODER_OPTION_DATAFORMAT | |
| 519 | − TestDataFormat(); | |
| 520 | 481 | //DECODER_OPTION_END_OF_STREAM |
| 521 | 482 | TestEndOfStream(); |
| 522 | 483 | //DECODER_OPTION_VCL_NAL |