shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1901 from mstorsjo/cleanup

Clean up warnings and incorrect indentation in the console tools

--- a/codec/console/dec/src/h264dec.cpp

+++ b/codec/console/dec/src/h264dec.cpp

@@ -305,7 +305,7 @@

 #if defined (WINDOWS_PHONE)

   g_dDecTime = dElapsed;

-  g_fDecFPS = (iFrameCount * 1.0) / dElapsed;

+  g_fDecFPS = (iFrameCount * 1.0f) / (float) dElapsed;

   g_iDecodedFrameNum = iFrameCount;

 #endif

--- a/codec/console/enc/src/welsenc.cpp

+++ b/codec/console/enc/src/welsenc.cpp

@@ -439,7 +439,7 @@

       sFileSet.uiFrameToBeCoded = atoi (argv[n++]);

     else if (!strcmp (pCommand, "-frin") && (n < argc))

-      pSvcParam.fMaxFrameRate = atof (argv[n++]);

+      pSvcParam.fMaxFrameRate = (float) atof (argv[n++]);

     else if (!strcmp (pCommand, "-numtl") && (n < argc))

       pSvcParam.iTemporalLayerNum = atoi (argv[n++]);

@@ -923,9 +923,9 @@

             sSvcParam.iPicWidth, sSvcParam.iPicHeight,

             iActualFrameEncodedCount, dElapsed, (iActualFrameEncodedCount * 1.0) / dElapsed);

 #if defined (WINDOWS_PHONE)

-	g_fFPS = (iActualFrameEncodedCount * 1.0) / dElapsed;

-	g_dEncoderTime = dElapsed;

-	g_iEncodedFrame = iActualFrameEncodedCount;

+    g_fFPS = (iActualFrameEncodedCount * 1.0f) / (float) dElapsed;

+    g_dEncoderTime = dElapsed;

+    g_iEncodedFrame = iActualFrameEncodedCount;

 #endif

   }

 INSIDE_MEM_FREE: