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

disable color format check for parse only

Browse Source
This commit is contained in:
huili2
2014-12-28 23:33:53 -08:00
parent 26ccd837f1
commit b12b39a47b
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codec/decoder/core/src/decoder.cpp
View File

@@ -516,9 +516,11 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa
memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam)); memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat; pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;
int32_t iRet = DecoderSetCsp (pCtx, pCtx->pParam->eOutputColorFormat); if (!pCtx->bParseOnly) {
if (iRet) int32_t iRet = DecoderSetCsp (pCtx, pCtx->pParam->eOutputColorFormat);
return iRet; if (iRet)
return iRet;
}
pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc; pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;
if (pCtx->bParseOnly) //parse only, disable EC method if (pCtx->bParseOnly) //parse only, disable EC method

5
codec/decoder/plus/src/welsDecoderExt.cpp
View File

@@ -258,6 +258,11 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {
return dsInitialOptExpected; return dsInitialOptExpected;
if (eOptID == DECODER_OPTION_DATAFORMAT) { // Set color space of decoding output frame if (eOptID == DECODER_OPTION_DATAFORMAT) { // Set color space of decoding output frame
if (m_pDecContext->bParseOnly) {
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
"CWelsDecoder::SetOption for data format meaningless for parseonly.");
return cmResultSuccess;
}
if (pOption == NULL) if (pOption == NULL)
return cmInitParaError; return cmInitParaError;

2
test/api/encode_decode_api_test.cpp
View File

@@ -2337,7 +2337,7 @@ class DecodeParseAPI : public EncodeDecodeTestBase {
decoder_->Uninitialize(); decoder_->Uninitialize();
SDecodingParam decParam; SDecodingParam decParam;
memset (&decParam, 0, sizeof (SDecodingParam)); memset (&decParam, 0, sizeof (SDecodingParam));
decParam.eOutputColorFormat = videoFormatI420; decParam.eOutputColorFormat = videoFormatRGB;
decParam.uiTargetDqLayer = UCHAR_MAX; decParam.uiTargetDqLayer = UCHAR_MAX;
decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY; decParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
decParam.bParseOnly = true; decParam.bParseOnly = true;