Showing the changes to test/decoder/DecUT_DecExt.cpp (1 of 4 files). Show all
Unified · Split
| @@ -86,7 +86,11 @@ void DecoderInterfaceTest::Init() { · 85 unmodified lines | ||
| 86 | 86 | m_szBuffer[3] = 1; |
| 87 | 87 | m_iBufLength = 4; |
| 88 | 88 | CM_RETURN eRet = (CM_RETURN) m_pDec->Initialize (&m_sDecParam); |
| 89 | − ASSERT_EQ (eRet, cmResultSuccess); | |
| 89 | + if ((m_sDecParam.eOutputColorFormat != videoFormatI420) || | |
| 90 | + (m_sDecParam.eOutputColorFormat != videoFormatInternal)) | |
| 91 | + ASSERT_EQ (eRet, cmUnsupportedData); | |
| 92 | + else | |
| 93 | + ASSERT_EQ (eRet, cmResultSuccess); | |
| 90 | 94 | } |
| 91 | 95 | |
| 92 | 96 | void DecoderInterfaceTest::Uninit() { |
| @@ -154,7 +158,7 @@ void DecoderInterfaceTest::TestInitUninit() { · 61 unmodified lines | ||
| 154 | 158 | m_pDec->Initialize (&m_sDecParam); |
| 155 | 159 | eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOutput); |
| 156 | 160 | EXPECT_EQ (eRet, cmResultSuccess); |
| 157 | − EXPECT_EQ (20, iOutput); | |
| 161 | + EXPECT_EQ ((int32_t) videoFormatI420, iOutput); | |
| 158 | 162 | |
| 159 | 163 | //Uninitialize, no GetOption can be done |
| 160 | 164 | m_pDec->Uninitialize(); |
| @@ -180,7 +184,10 @@ void DecoderInterfaceTest::TestDataFormat() { · 19 unmodified lines | ||
| 180 | 184 | |
| 181 | 185 | //valid input |
| 182 | 186 | eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_DATAFORMAT, &iTmp); |
| 183 | − EXPECT_EQ (eRet, cmResultSuccess); | |
| 187 | + if ((iTmp != (int32_t) videoFormatI420) && (iTmp != (int32_t) videoFormatInternal)) | |
| 188 | + EXPECT_EQ (eRet, cmUnsupportedData); | |
| 189 | + else | |
| 190 | + EXPECT_EQ (eRet, cmResultSuccess); | |
| 184 | 191 | eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOut); |
| 185 | 192 | EXPECT_EQ (eRet, cmResultSuccess); |
| 186 | 193 | |