shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1493 from ruil2/printf

use %lld instead of %8d for longlong type

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -2089,7 +2089,7 @@

   if (pCodingParam->iMultipleThreadIdc > 1)

     iRet = CreateSliceThreads (pCtx);

-  if(pCodingParam->iEntropyCodingModeFlag)

+  if (pCodingParam->iEntropyCodingModeFlag)

     WelsCabacInit (pCtx);

   WelsRcInitModule (pCtx,  pCtx->pSvcParam->iRCMode);

@@ -3059,8 +3059,8 @@

   if (iSpatialNum < 1) {	// skip due to temporal layer settings (different frame rate)

     ++ pCtx->iCodingIndex;

     pFbi->eFrameType = videoFrameTypeSkip;

-    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame",

-             (int64_t)pSrcPic->uiTimeStamp);

+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld",

+             pSrcPic->uiTimeStamp);

     return ENC_RETURN_SUCCESS;

   }

@@ -3067,8 +3067,8 @@

   eFrameType = DecideFrameType (pCtx, iSpatialNum);

   if (eFrameType == videoFrameTypeSkip) {

     pFbi->eFrameType = eFrameType;

-    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame",

-             (int64_t)pSrcPic->uiTimeStamp);

+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld",

+             pSrcPic->uiTimeStamp);

     return ENC_RETURN_SUCCESS;

   }

@@ -3075,8 +3075,8 @@

   //loop each layer to check if have skip frame when RC and frame skip enable

   if (CheckFrameSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, (uint32_t)pSrcPic->uiTimeStamp)) {

     pFbi->eFrameType = videoFrameTypeSkip;

-    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %8" PRId64", skip one frame",

-             (int64_t)pSrcPic->uiTimeStamp);

+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] Frame timestamp = %lld",

+             pSrcPic->uiTimeStamp);

     return ENC_RETURN_SUCCESS;

   }

--- a/codec/encoder/core/src/ratectl.cpp

+++ b/codec/encoder/core/src/ratectl.cpp

@@ -767,9 +767,9 @@

   SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];

   WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,

-    "[Rc] Frame timestamp = %8d, Frame type =%d, encoding_qp%d, average qp = %3d, max qp = %3d, min qp = %3d, index = %8d,\

+    "[Rc] Frame timestamp = %lld, Frame type =%d, encoding_qp%d, average qp = %3d, max qp = %3d, min qp = %3d, index = %8d,\

     iTid = %1d, used = %8d, bitsperframe = %8d, target = %8d, remaingbits = %8d, skipbuffersize = %8d",

-    (uint32_t)uiTimeStamp,pEncCtx->eSliceType, pEncCtx->uiDependencyId, pWelsSvcRc->iAverageFrameQp,pWelsSvcRc->iMaxFrameQp,pWelsSvcRc->iMinFrameQp,

+    uiTimeStamp,pEncCtx->eSliceType, pEncCtx->uiDependencyId, pWelsSvcRc->iAverageFrameQp,pWelsSvcRc->iMaxFrameQp,pWelsSvcRc->iMinFrameQp,

     pEncCtx->iFrameIndex, pEncCtx->uiTemporalId, pWelsSvcRc->iFrameDqBits,WELS_DIV_ROUND (pWelsSvcRc->iBitsPerFrame, INT_MULTIPLY),

     pWelsSvcRc->iTargetBits, pWelsSvcRc->iRemainingBits, pWelsSvcRc->iBufferSizeSkip);

--- a/module/gmp-openh264.cpp

+++ b/module/gmp-openh264.cpp

@@ -382,7 +382,7 @@

     src.pData[3] = nullptr;

     src.iPicWidth = inputImage->Width();

     src.iPicHeight = inputImage->Height();

-    src.uiTimeStamp = inputImage->Timestamp();

+    src.uiTimeStamp = inputImage->Timestamp()/1000; //encoder needs millisecond

     const SSourcePicture* pics = &src;

     int result = encoder_->EncodeFrame (pics, &encoded);