shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1605 from sijchen/fix_ut1

fix a UT function

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -96,6 +96,7 @@

     param_.fMaxFrameRate = framerate;

     param_.iRCMode = RC_OFF_MODE; //rc off

     param_.iMultipleThreadIdc = 1; //single thread

+    param_.iSpatialLayerNum = iLayers;

     for (int i = 0; i < iLayers; i++) {

       param_.sSpatialLayers[i].iVideoWidth = width >> (iLayers - i - 1);

       param_.sSpatialLayers[i].iVideoHeight = height >> (iLayers - i - 1);

@@ -2055,8 +2056,8 @@

 }

 TEST_F (EncodeDecodeTestAPI, SetOptionEncParamExt) {

-  int iWidth       = (((rand() % MAX_WIDTH) >> 1) + 16) << 1;

-  int iHeight      = (((rand() % MAX_HEIGHT) >> 1) + 16) << 1;

+  int iWidth       = WELS_CLIP3 ((((rand() % MAX_WIDTH) >> 1)  + 1) << 1, 2, MAX_WIDTH);

+  int iHeight      = WELS_CLIP3 ((((rand() % MAX_HEIGHT) >> 1)  + 1) << 1, 2, MAX_HEIGHT);

   float fFrameRate = rand() + 0.5f;

   int iEncFrameNum = WELS_CLIP3 ((rand() % ENCODE_FRAME_NUM) + 1, 1, ENCODE_FRAME_NUM);

   int iSpatialLayerNum = 4;