History

reuse dsNoParamSets in dec

huili2 committed 12 years ago

Commit c4fc6641 parent 27919292 files · +12 −4Browse files

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

Unified · Split

codec/decoder/core/src/decoder.cpp+8−4
@@ -474,7 +474,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 473 unmodified lines
474474 #else
475475 pCtx->bReferenceLostAtT0Flag = true;
476476 #endif
477− ResetParameterSetsState (pCtx);
477+ if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
478+ ResetParameterSetsState (pCtx);
478479
479480 if (dsOutOfMemory & pCtx->iErrorCode) {
480481 return pCtx->iErrorCode;
@@ -489,7 +490,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 8 unmodified lines
489490 #else
490491 pCtx->bReferenceLostAtT0Flag = true;
491492 #endif
492− ResetParameterSetsState (pCtx);
493+ if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
494+ ResetParameterSetsState (pCtx);
493495 }
494496 return pCtx->iErrorCode;
495497 }
@@ -532,7 +534,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 36 unmodified lines
532534 #else
533535 pCtx->bReferenceLostAtT0Flag = true;
534536 #endif
535− ResetParameterSetsState (pCtx);
537+ if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
538+ ResetParameterSetsState (pCtx);
536539 return pCtx->iErrorCode;
537540 }
538541 }
@@ -567,7 +570,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 28 unmodified lines
567570 #else
568571 pCtx->bReferenceLostAtT0Flag = true;
569572 #endif
570− ResetParameterSetsState (pCtx);
573+ if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
574+ ResetParameterSetsState (pCtx);
571575 return pCtx->iErrorCode;
572576 }
573577 }

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