shithub: openh264

Download patch

ref: 8b7af7cbefc1f1de89eba3d9e7c366709a172f9c
parent: 585b61626c801437cefc832f09cc637e19732ed1
author: Sijia Chen <sijchen@cisco.com>
date: Tue May 26 11:19:47 EDT 2015 

add comment for interface and better condiction for warning trace


--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -537,7 +537,7 @@
   unsigned char*  pData[4];        ///< plane pData
   int       iPicWidth;             ///< luma picture width in x coordinate
   int       iPicHeight;            ///< luma picture height in y coordinate
-  long long uiTimeStamp;
+  long long uiTimeStamp;           ///< timestamp of the source picture, unit: millisecond
 } SSourcePicture;
 /**
 * @brief Structure for bit rate info
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -597,7 +597,8 @@
     }
 
     if (m_pEncContext->pSvcParam->iRCMode == RC_QUALITY_MODE || m_pEncContext->pSvcParam->iRCMode == RC_BITRATE_MODE) {
-      if (WELS_ABS (pStatistics->fLatestFrameRate - m_pEncContext->pSvcParam->fMaxFrameRate) > 5) {
+      if ((pStatistics->fLatestFrameRate > 0)
+          && WELS_ABS (m_pEncContext->pSvcParam->fMaxFrameRate - pStatistics->fLatestFrameRate) > 5) {
         WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
                  "Actual Input Framerate %f is different from framerate in setting %f, suggest to use other rate control modes",
                  pStatistics->fLatestFrameRate, m_pEncContext->pSvcParam->fMaxFrameRate);