generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1901 from mstorsjo/cleanup

Browse Source 
Clean up warnings and incorrect indentation in the console tools
This commit is contained in:
sijchen 2015-04-20 11:18:59 +08:00
commit 473f2e3d42
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/console/dec/src/h264dec.cpp
View File

@ -305,7 +305,7 @@ void H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, cons
#if defined (WINDOWS_PHONE)
g_dDecTime = dElapsed;
g_fDecFPS = (iFrameCount * 1.0) / dElapsed;
g_fDecFPS = (iFrameCount * 1.0f) / (float) dElapsed;
g_iDecodedFrameNum = iFrameCount;
#endif

8
codec/console/enc/src/welsenc.cpp
View File

@ -439,7 +439,7 @@ int ParseCommandLine (int argc, char** argv, SSourcePicture* pSrcPic, SEncParamE
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 @@ int ProcessEncoding (ISVCEncoder* pPtrEnc, int argc, char** argv, bool bConfigFi
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: