add protection for decoder and data format

huili2 committed 12 years ago

Commit f8d2ae41 parent 06e56ec4 files · +36 −17Browse files

Showing the changes to test/decoder/DecUT_DecExt.cpp (1 of 4 files). Show all

Unified · Split

   m_szBuffer[3] = 1;
   m_iBufLength = 4;
   CM_RETURN eRet = (CM_RETURN) m_pDec->Initialize (&m_sDecParam);
-  ASSERT_EQ (eRet, cmResultSuccess);
+  if ((m_sDecParam.eOutputColorFormat != videoFormatI420) ||
+      (m_sDecParam.eOutputColorFormat != videoFormatInternal))
+    ASSERT_EQ (eRet, cmUnsupportedData);
+  else
+    ASSERT_EQ (eRet, cmResultSuccess);
 }
 void DecoderInterfaceTest::Uninit() {
   m_pDec->Initialize (&m_sDecParam);
   eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOutput);
   EXPECT_EQ (eRet, cmResultSuccess);
-  EXPECT_EQ (20, iOutput);
+  EXPECT_EQ ((int32_t) videoFormatI420, iOutput);
   //Uninitialize, no GetOption can be done
   m_pDec->Uninitialize();
   //valid input
   eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_DATAFORMAT, &iTmp);
-  EXPECT_EQ (eRet, cmResultSuccess);
+  if ((iTmp != (int32_t) videoFormatI420) && (iTmp != (int32_t) videoFormatInternal))
+    EXPECT_EQ (eRet, cmUnsupportedData);
+  else
+    EXPECT_EQ (eRet, cmResultSuccess);
   eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOut);
   EXPECT_EQ (eRet, cmResultSuccess);

Keyboard shortcuts