History

Wc++11-compat-reserved-user-defined-literal

Daniel J. Hofmann committed 12 years ago

Commit 4fc27711 parent 3ad4d902 files · +4 −4Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 2 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+3−3
@@ -3029,21 +3029,21 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3028 unmodified lines
3029 if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate)3029 if (iSpatialNum < 1) { // skip due to temporal layer settings (different frame rate)
3030 ++ pCtx->iCodingIndex;3030 ++ pCtx->iCodingIndex;
3031 pFbi->eFrameType = videoFrameTypeSkip;3031 pFbi->eFrameType = videoFrameTypeSkip;
3032 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8"PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);3032 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8" PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);
3033 return ENC_RETURN_SUCCESS;3033 return ENC_RETURN_SUCCESS;
3034 }3034 }
3035 3035
3036 eFrameType = DecideFrameType (pCtx, iSpatialNum);3036 eFrameType = DecideFrameType (pCtx, iSpatialNum);
3037 if (eFrameType == videoFrameTypeSkip) {3037 if (eFrameType == videoFrameTypeSkip) {
3038 pFbi->eFrameType = eFrameType;3038 pFbi->eFrameType = eFrameType;
3039 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8"PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);3039 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8" PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);
3040 return ENC_RETURN_SUCCESS;3040 return ENC_RETURN_SUCCESS;
3041 }3041 }
3042 3042
3043 //loop each layer to check if have skip frame when RC and frame skip enable3043 //loop each layer to check if have skip frame when RC and frame skip enable
3044 if (CheckFrameSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, (uint32_t)pSrcPic->uiTimeStamp)) {3044 if (CheckFrameSkipBasedMaxbr (pCtx, iSpatialNum, eFrameType, (uint32_t)pSrcPic->uiTimeStamp)) {
3045 pFbi->eFrameType = videoFrameTypeSkip;3045 pFbi->eFrameType = videoFrameTypeSkip;
3046 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8"PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);3046 WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,"[Rc] Frame timestamp = %8" PRId64", skip one frame", (int64_t)pSrcPic->uiTimeStamp);
3047 return ENC_RETURN_SUCCESS;3047 return ENC_RETURN_SUCCESS;
3048 }3048 }
3049 3049

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t