shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2680 from shihuade/RCUTFixed

fixed RC UT faiked issue: verify with frame rate

--- a/test/encoder/EncUT_EncoderExt.cpp

+++ b/test/encoder/EncUT_EncoderExt.cpp

@@ -220,7 +220,7 @@

   sInfo.iLayer = SPATIAL_LAYER_0;

   iResult = pPtrEnc->SetOption (eOptionId, &sInfo);

   pPtrEnc->GetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, pParamExt);

-  if (sInfo.iBitrate <= 0)

+  if (sInfo.iBitrate <= 0 || pParamExt->sSpatialLayers[sInfo.iLayer].iSpatialBitrate <= (int) (fFrameRate + 0.5f))

     EXPECT_EQ (iResult, static_cast<int> (cmInitParaError));

   else if (pParamExt->sSpatialLayers[sInfo.iLayer].iSpatialBitrate >

            pParamExt->sSpatialLayers[sInfo.iLayer].iMaxSpatialBitrate) {