enable api test for decoder VclNal

huili2 committed 12 years ago

Commit f82726d1 parent 49f8fe84 files · +185 −13Browse files

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

Unified · Split

   CM_RETURN eRet;
   //No initialize, no GetOption can be done
   m_pDec->Uninitialize();
-  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOutput);
+  for (int i = 0; i <= (int) DECODER_OPTION_TRACE_CALLBACK_CONTEXT; ++i) {
-  EXPECT_EQ (eRet, cmInitExpected);
+    eRet = (CM_RETURN) m_pDec->GetOption ((DECODER_OPTION) i, &iOutput);
+    EXPECT_EQ (eRet, cmInitExpected);
+  }
   //Initialize first, can get input color format
   m_sDecParam.eOutputColorFormat = (EVideoFormatType) 20; //just for test
   m_pDec->Initialize (&m_sDecParam);
   //Uninitialize, no GetOption can be done
   m_pDec->Uninitialize();
   iOutput = 21;
-  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_DATAFORMAT, &iOutput);
+  for (int i = 0; i <= (int) DECODER_OPTION_TRACE_CALLBACK_CONTEXT; ++i) {
-  EXPECT_EQ (iOutput, 21);
+    eRet = (CM_RETURN) m_pDec->GetOption ((DECODER_OPTION) i, &iOutput);
-  EXPECT_EQ (eRet, cmInitExpected);
+    EXPECT_EQ (iOutput, 21);
+    EXPECT_EQ (eRet, cmInitExpected);
+  }
 }
 //DECODER_OPTION_DATAFORMAT
   int iOut;
   CM_RETURN eRet;
+  Init();
   //invalid input
   eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_DATAFORMAT, NULL);
   EXPECT_EQ (eRet, cmInitParaError);
   EXPECT_EQ (eRet, cmResultSuccess);
   EXPECT_EQ (iOut, (int32_t) videoFormatI420);
+  Uninit();
 }
 //DECODER_OPTION_END_OF_STREAM
   int iTmp, iOut;
   CM_RETURN eRet;
+  Init();
   //invalid input
   eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_END_OF_STREAM, NULL);
   EXPECT_EQ (eRet, cmInitParaError);
   eRet = (CM_RETURN) m_pDec->DecodeFrame2 (NULL, 0, m_pData, &m_sBufferInfo);
   eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_END_OF_STREAM, &iOut);
   EXPECT_EQ (iOut, true); //decoder should have EOS == true
+  Uninit();
 }
 //DECODER_OPTION_VCL_NAL
+//Here Test illegal bitstream input
+//legal bitstream decoding test, please see api test
 void DecoderInterfaceTest::TestVclNal() {
-  //TODO
+  int iTmp, iOut;
+  CM_RETURN eRet;
+  Init();
+  //Test SetOption
+  //VclNal never supports SetOption
+  iTmp = rand();
+  eRet = (CM_RETURN) m_pDec->SetOption (DECODER_OPTION_VCL_NAL, &iTmp);
+  EXPECT_EQ (eRet, cmInitParaError);
+  //Test GetOption
+  //invalid input
+  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_VCL_NAL, NULL);
+  EXPECT_EQ (eRet, cmInitParaError);
+  //valid input without actual decoding
+  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_VCL_NAL, &iOut);
+  EXPECT_EQ (eRet, cmResultSuccess);
+  EXPECT_EQ (iOut, FEEDBACK_NON_VCL_NAL);
+  //valid input with decoding error
+  MockPacketType (NAL_UNIT_CODED_SLICE_IDR, 50);
+  m_pDec->DecodeFrame2 (m_szBuffer, m_iBufLength, m_pData, &m_sBufferInfo);
+  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_VCL_NAL, &iOut);
+  EXPECT_EQ (eRet, cmResultSuccess);
+  EXPECT_EQ (iOut, FEEDBACK_UNKNOWN_NAL);
+  m_pDec->DecodeFrame2 (NULL, 0, m_pData, &m_sBufferInfo);
+  eRet = (CM_RETURN) m_pDec->GetOption (DECODER_OPTION_VCL_NAL, &iOut);
+  EXPECT_EQ (eRet, cmResultSuccess);
+  EXPECT_EQ (iOut, FEEDBACK_UNKNOWN_NAL);
+  Uninit();
 }
 //DECODER_OPTION_TEMPORAL_ID
   //Initialize Uninitialize
   TestInitUninit();
-  //AfterInitialize is OK, do the following tests
-  Init();
   //DECODER_OPTION_DATAFORMAT
   TestDataFormat();
   //DECODER_OPTION_END_OF_STREAM
   TestTraceCallback();
   //DECODER_OPTION_TRACE_CALLBACK_CONTEXT
   TestTraceCallbackContext();
-  //uninitialize
-  Uninit();
 }

enable api test for decoder VclNal

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code