History

Merge pull request #1559 from HaiboZhu/EC_off_crash_no_output

Debug for (1) decoder crash when delay decoding (2) no output when EC off

zhilwang committed 11 years ago

Commit 3a731792 parents 69f6db1 aa5e7f75 files · +8 −36Browse files

Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 5 files). Show all

Unified · Split

codec/decoder/core/src/decoder_core.cpp+0−23
@@ -156,13 +156,6 @@ inline void HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal · 155 unmodified lines
156156 if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {
157157 pCtx->bReferenceLostAtT0Flag = true;
158158 }
159− if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) {
160−#ifndef LONG_TERM_REF
161− if (pCtx->bReferenceLostAtT0Flag) {
162− ResetParameterSetsState (pCtx);
163− }
164−#endif
165− }
166159 pCtx->iErrorCode |= dsBitstreamError;
167160 }
168161
@@ -170,13 +163,6 @@ inline void HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) · 1 unmodified line
170163 if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {
171164 pCtx->bReferenceLostAtT0Flag = true;
172165 }
173− if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) {
174−#ifndef LONG_TERM_REF
175− if (pCtx->bReferenceLostAtT0Flag) {
176− ResetParameterSetsState (pCtx);
177− }
178−#endif
179− }
180166 pCtx->iErrorCode |= dsRefLost;
181167 }
182168
@@ -1883,14 +1869,6 @@ void InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) { · 1700 unmodified lines
18831869 }
18841870 }
18851871
1886−// added to reset state of parameter sets to waiting successive incoming IDR, 6/4/2010
1887−// It will be called in case packets lost/ broken and decoded failed at temporal level 0
1888−void ResetParameterSetsState (PWelsDecoderContext pCtx) {
1889− pCtx->bSpsExistAheadFlag = false;
1890− pCtx->bSubspsExistAheadFlag = false;
1891− pCtx->bPpsExistAheadFlag = false;
1892−}
1893−
18941872 /*
18951873 * DecodeCurrentAccessUnit
18961874 * Decode current access unit when current AU is completed.
@@ -2028,7 +2006,6 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 131 unmodified lines
20282006 #else
20292007 pCtx->bReferenceLostAtT0Flag = true;
20302008 #endif
2031− ResetParameterSetsState (pCtx);
20322009 return ERR_INFO_REFERENCE_PIC_LOST;
20332010 }
20342011 }

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