Merge pull request #1503 from huili2/ec_crossIDR

enable cross IDR EC method

dongzha committed 12 years ago

Commit 789603a2 parents 0fa667a 103fa5b6 files · +77 −50Browse files

Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 6 files). Show all

Unified · Split

codec/decoder/plus/src/welsDecoderExt.cpp+1−1

@@ -275,7 +275,7 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) { · 274 unmodified lines
275	return cmInitParaError;	275	return cmInitParaError;
276		276
277	iVal = * ((int*)pOption); // int value for error concealment idc	277	iVal = * ((int*)pOption); // int value for error concealment idc
278	iVal = WELS_CLIP3 (iVal, (int32_t) ERROR_CON_DISABLE, (int32_t) ERROR_CON_SLICE_COPY);	278	iVal = WELS_CLIP3 (iVal, (int32_t) ERROR_CON_DISABLE, (int32_t) ERROR_CON_SLICE_COPY_CROSS_IDR);
279	m_pDecContext->eErrorConMethod = (ERROR_CON_IDC) iVal;	279	m_pDecContext->eErrorConMethod = (ERROR_CON_IDC) iVal;
280	InitErrorCon (m_pDecContext);	280	InitErrorCon (m_pDecContext);
281	WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,	281	WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,