shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2910 from mstorsjo/fix-msvc-pow

Fix errors and warnings when building with msvc and for android with stlport

--- a/test/api/encode_options_test.cpp

+++ b/test/api/encode_options_test.cpp

@@ -2302,7 +2302,7 @@

       if ( (iStepIdx < 3) && (iFrameNum == ((iTotalFrame / 3) * (iStepIdx + 1)))) {

         sParam.iTemporalLayerNum = originalTemporalLayerNum * iSteps[iStepIdx];

         sParam.iTargetBitrate = sParam.sSpatialLayers[0].iSpatialBitrate = originalBR * iSteps[iStepIdx];

-        sParam.fMaxFrameRate = sParam.sSpatialLayers[0].fFrameRate = originalFR * pow (2, iSteps[iStepIdx]);

+        sParam.fMaxFrameRate = sParam.sSpatialLayers[0].fFrameRate = originalFR * pow (2.0f, iSteps[iStepIdx]);

         encoder_->SetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &sParam);

         bSetOption = true;