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

Merge pull request #1426 from sijchen/fix_paramtranscode1

Browse Source 
[Encoder] add clip in ParamTranscode for input para checking
This commit is contained in:
ruil2 2014-10-21 17:23:57 +08:00
commit d720122a37
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/encoder/core/inc/param_svc.h
View File

@ -399,8 +399,11 @@ typedef struct TagWelsSvcCodingParam: SEncParamExt {
#ifdef ENABLE_FRAME_DUMP #ifdef ENABLE_FRAME_DUMP
pDlp->sRecFileName[0] = '\0'; // file to be constructed pDlp->sRecFileName[0] = '\0'; // file to be constructed
#endif//ENABLE_FRAME_DUMP #endif//ENABLE_FRAME_DUMP
pSpatialLayer->iVideoWidth = pCodingParam.sSpatialLayers[iIdxSpatial].iVideoWidth; // frame width pSpatialLayer->iVideoWidth = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].iVideoWidth, MB_WIDTH_LUMA,
pSpatialLayer->iVideoHeight = pCodingParam.sSpatialLayers[iIdxSpatial].iVideoHeight;// frame height iPicWidth); // frame width
pSpatialLayer->iVideoHeight = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].iVideoHeight, MB_HEIGHT_LUMA,
iPicHeight);// frame height
pSpatialLayer->iSpatialBitrate = pSpatialLayer->iSpatialBitrate =
pCodingParam.sSpatialLayers[iIdxSpatial].iSpatialBitrate; // target bitrate for current spatial layer pCodingParam.sSpatialLayers[iIdxSpatial].iSpatialBitrate; // target bitrate for current spatial layer
pSpatialLayer->iMaxSpatialBitrate = pSpatialLayer->iMaxSpatialBitrate =

2
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -207,6 +207,7 @@ int CWelsH264SVCEncoder::Initialize (const SEncParamBase* argv) {
if (sConfig.ParamBaseTranscode (*argv)) { if (sConfig.ParamBaseTranscode (*argv)) {
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
"CWelsH264SVCEncoder::Initialize(), parameter_translation failed."); "CWelsH264SVCEncoder::Initialize(), parameter_translation failed.");
TraceParamInfo (&sConfig);
Uninitialize(); Uninitialize();
return cmInitParaError; return cmInitParaError;
} }
@ -230,6 +231,7 @@ int CWelsH264SVCEncoder::InitializeExt (const SEncParamExt* argv) {
if (sConfig.ParamTranscode (*argv)) { if (sConfig.ParamTranscode (*argv)) {
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
"CWelsH264SVCEncoder::InitializeExt(), parameter_translation failed."); "CWelsH264SVCEncoder::InitializeExt(), parameter_translation failed.");
TraceParamInfo (&sConfig);
Uninitialize(); Uninitialize();
return cmInitParaError; return cmInitParaError;
} }