Showing the changes to codec/encoder/core/src/encoder.cpp (1 of 3 files). Show all
Unified · Split
| @@ -330,7 +330,8 @@ void InitFrameCoding (sWelsEncCtx* pEncCtx, const EVideoFrameType keFrameType, c · 329 unmodified lines | |||
| 330 | #endif//FRAME_INFO_OUTPUT | 330 | #endif//FRAME_INFO_OUTPUT |
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum, const int32_t kiDidx, bool bSkipFrameFlag) { | 333 | EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum, const int32_t kiDidx, |
| 334 | bool bSkipFrameFlag) { | ||
| 334 | SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam; | 335 | SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam; |
| 335 | SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx]; | 336 | SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx]; |
| 336 | EVideoFrameType iFrameType = videoFrameTypeInvalid; | 337 | EVideoFrameType iFrameType = videoFrameTypeInvalid; |
| @@ -401,15 +402,15 @@ EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum · 64 unmodified lines | |||
| 401 | */ | 402 | */ |
| 402 | 403 | ||
| 403 | extern "C" void DumpDependencyRec (SPicture* pCurPicture, const char* kpFileName, const int8_t kiDid, bool bAppend, | 404 | extern "C" void DumpDependencyRec (SPicture* pCurPicture, const char* kpFileName, const int8_t kiDid, bool bAppend, |
| 404 | SDqLayer* pDqLayer,bool bSimulCastAVC) { | 405 | SDqLayer* pDqLayer, bool bSimulCastAVC) { |
| 405 | WelsFileHandle* pDumpRecFile = NULL; | 406 | WelsFileHandle* pDumpRecFile = NULL; |
| 406 | int32_t iWrittenSize = 0; | 407 | int32_t iWrittenSize = 0; |
| 407 | const char* openMode = bAppend ? "ab" : "wb"; | 408 | const char* openMode = bAppend ? "ab" : "wb"; |
| 408 | SWelsSPS* pSpsTmp = NULL; | 409 | SWelsSPS* pSpsTmp = NULL; |
| 409 | if(bSimulCastAVC ||(kiDid == BASE_DEPENDENCY_ID)) { | 410 | if (bSimulCastAVC || (kiDid == BASE_DEPENDENCY_ID)) { |
| 410 | pSpsTmp = pDqLayer->sLayerInfo.pSpsP; | 411 | pSpsTmp = pDqLayer->sLayerInfo.pSpsP; |
| 411 | } else { | 412 | } else { |
| 412 | pSpsTmp = &(pDqLayer->sLayerInfo.pSubsetSpsP->pSps); | 413 | pSpsTmp = & (pDqLayer->sLayerInfo.pSubsetSpsP->pSps); |
| 413 | } | 414 | } |
| 414 | bool bFrameCroppingFlag = pSpsTmp->bFrameCroppingFlag; | 415 | bool bFrameCroppingFlag = pSpsTmp->bFrameCroppingFlag; |
| 415 | SCropOffset* pFrameCrop = &pSpsTmp->sFrameCrop; | 416 | SCropOffset* pFrameCrop = &pSpsTmp->sFrameCrop; |