shithub: openh264

Download patch

ref: a73c1e6814973acfe8e2d59346a77f913a77e0fd
parent: 4e9e5f5c3671281275ff409e2415afdaa573e645
parent: 7d6d86b63a66950b08fe518ddfc4466b63d73975
author: huili2 <[email protected]>
date: Wed Feb 11 12:28:08 EST 2015

Merge pull request #1810 from dongzha/addUTLargeSize

add a UT for large picture

--- a/test/api/encode_decode_api_test.cpp
+++ b/test/api/encode_decode_api_test.cpp
@@ -3254,31 +3254,49 @@
 }
 
 struct EncodeOptionParam {
-  int iCaseId;
+  bool bTestNalSize;
+  bool bAllRandom;
+  bool bTestDecoder;
   int iNumframes;
   int iWidth;
   int iHeight;
   int iQp;
+  SliceModeEnum eSliceMode;
   int uiMaxNalLen;
   float fFramerate;
   int iThreads;
+  std::string sFileSave;
 };
 
 static const EncodeOptionParam kOptionParamArray[] = {
-  {0, 30, 600, 460, 1, 450, 15.0, 1},
-  {1, 30, 340, 96, 24, 1000, 30.0, 1},
-  {2, 30, 140, 196, 51, 500, 7.5, 1},
-  {3, 30, 110, 296, 50, 500, 7.5, 1},
-  {4, 30, 104, 416, 44, 500, 7.5, 1},
-  {5, 30, 16, 16, 2, 500, 7.5, 1},
-  {6, 30, 32, 16, 2, 500, 7.5, 1},
-  {7, 30, 600, 460, 1, 450, 15.0, 4},
-  {8, 30, 340, 96, 24, 1000, 30.0, 2},
-  {9, 30, 140, 196, 51, 500, 7.5, 3},
-  {10, 30, 110, 296, 50, 500, 7.5, 2},
-  {11, 30, 104, 416, 44, 500, 7.5, 2},
-  {12, 30, 16, 16, 2, 500, 7.5, 3},
-  {13, 30, 32, 16, 2, 500, 7.5, 3},
+  {true, true, false, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 1, ""},
+  {true, true, false, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 1, ""},
+  {true, true, false, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, true, false, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, true, false, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, true, false, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, false, true, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 1, ""},
+  {true, false, true, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 1, ""},
+  {true, false, true, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, false, true, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, false, true, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {true, false, true, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  // enable the following when all random input is supported
+  //{true, true, true, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 1, ""},
+  //{true, true, true, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 1, ""},
+  //{true, true, true, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  //{true, true, true, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  //{true, true, true, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  //{true, true, true, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {false, false, true, 3, 4096, 2304, 2, SM_SINGLE_SLICE, 0, 7.5, 1, ""}, // large picture size
+  {false, true, false, 30, 32, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""},
+  {false, true, false, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 4, ""},
+  {false, true, false, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 2, ""},
+  {false, true, false, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 3, ""},
+  {false, true, false, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 2, ""},
+  {false, true, false, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 2, ""},
+  {false, true, false, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 3, ""},
+  {false, true, false, 30, 32, 16, 2, SM_DYN_SLICE, 500, 7.5, 3, ""},
 };
 
 class EncodeTestAPI : public ::testing::TestWithParam<EncodeOptionParam>, public ::EncodeDecodeTestAPIBase {
@@ -3290,11 +3308,12 @@
   void TearDown() {
     EncodeDecodeTestAPIBase::TearDown();
   }
-  void EncodeOneFrameAllRandom (int iCheckTypeIndex) {
+  void EncodeOneFrameRandom (int iCheckTypeIndex, bool bAllRandom) {
     int frameSize = EncPic.iPicWidth * EncPic.iPicHeight * 3 / 2;
     uint8_t* ptr = buf_.data();
+    uint8_t uiVal = rand() % 256;
     for (int i = 0; i < frameSize; i++) {
-      ptr[i] = rand() % 256;
+      ptr[i] = bAllRandom? (rand() % 256) :uiVal;
     }
     int rv = encoder_->EncodeFrame (&EncPic, &info);
     if (0 == iCheckTypeIndex)
@@ -3307,8 +3326,13 @@
 INSTANTIATE_TEST_CASE_P (EncodeDecodeTestAPIBase, EncodeTestAPI,
                          ::testing::ValuesIn (kOptionParamArray));
 
-TEST_P (EncodeTestAPI, SetEncOptionNalSize) {
+TEST_P (EncodeTestAPI, SetEncOptionSize) {
+  srand(1002);
   EncodeOptionParam p = GetParam();
+  FILE * pFile = NULL;
+  if(!p.sFileSave.empty()) {
+    pFile = fopen(p.sFileSave.c_str(), "wb");
+  }
   memset (&param_, 0, sizeof (SEncParamExt));
   encoder_->GetDefaultParams (&param_);
   param_.uiMaxNalSize = p.uiMaxNalLen;
@@ -3324,7 +3348,7 @@
   param_.sSpatialLayers[0].iVideoWidth = p.iWidth ;
   param_.sSpatialLayers[0].iVideoHeight = p.iHeight;
   param_.sSpatialLayers[0].fFrameRate = p.fFramerate;
-  param_.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_DYN_SLICE;
+  param_.sSpatialLayers[0].sSliceCfg.uiSliceMode = p.eSliceMode;
 
   encoder_->Uninitialize();
   int rv = encoder_->InitializeExt (&param_);
@@ -3339,8 +3363,21 @@
   int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1);
   encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod);
   int iIdx = 0;
+  int iLen;
+  unsigned char* pData[3] = { NULL };
   while (iIdx <= p.iNumframes) {
-    EncodeOneFrameAllRandom (1);
+    EncodeOneFrameRandom (0, p.bAllRandom);
+    encToDecData(info, iLen);
+    if( pFile ) {
+      fwrite (info.sLayerInfo[0].pBsBuf, iLen, 1, pFile);
+      fflush (pFile);
+    }
+    memset(&dstBufInfo_, 0, sizeof(SBufferInfo));
+    if(iLen && p.bTestDecoder) {
+      rv = decoder_->DecodeFrameNoDelay(info.sLayerInfo[0].pBsBuf, iLen, pData, &dstBufInfo_);
+      ASSERT_EQ(rv, 0);
+      ASSERT_EQ(dstBufInfo_.iBufferStatus, 1);
+    }
     int iLayer = 0;
     while (iLayer < info.iLayerNum) {
       SLayerBSInfo* pLayerBsInfo = &info.sLayerInfo[iLayer];
@@ -3347,8 +3384,7 @@
       if (pLayerBsInfo != NULL) {
         int iNalIdx = WELS_MAX (pLayerBsInfo->iNalCount - 2, 0); // ignore last slice under single slice mode
         do {
-          if (p.iCaseId <
-              6) { // ignore the case that 2 MBs in one picture, and the multithreads case, enable them when code is ready
+          if (p.bTestNalSize) { // ignore the case that 2 MBs in one picture, and the multithreads case, enable them when code is ready
             ASSERT_GE (((int)param_.uiMaxNalSize), pLayerBsInfo->pNalLengthInByte[iNalIdx]);
           }
           -- iNalIdx;
@@ -3358,7 +3394,9 @@
     }
     iIdx++;
   }
+  if( pFile ) {
+    fclose (pFile);
+  }
 }
-