History

Remove the SPS/PPS exist ahead reset logic and change the CheckSpsActive logic

Haibo Zhu committed 11 years ago

Commit aa5e7f71 parent f48b2e55 files · +14 −40Browse files

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

Unified · Split

codec/decoder/core/src/decoder.cpp+0−10
@@ -502,9 +502,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 501 unmodified lines
502502 #else
503503 pCtx->bReferenceLostAtT0Flag = true;
504504 #endif
505− if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
506− ResetParameterSetsState (pCtx);
507−
508505 if (dsOutOfMemory & pCtx->iErrorCode) {
509506 return pCtx->iErrorCode;
510507 }
@@ -518,8 +515,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 7 unmodified lines
518515 #else
519516 pCtx->bReferenceLostAtT0Flag = true;
520517 #endif
521− if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
522− ResetParameterSetsState (pCtx);
523518 }
524519 return pCtx->iErrorCode;
525520 }
@@ -563,8 +558,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 37 unmodified lines
563558 #else
564559 pCtx->bReferenceLostAtT0Flag = true;
565560 #endif
566− if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
567− ResetParameterSetsState (pCtx);
568561 return pCtx->iErrorCode;
569562 }
570563 }
@@ -576,7 +569,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 5 unmodified lines
576569 #else
577570 pCtx->bReferenceLostAtT0Flag = true;
578571 #endif
579− ResetParameterSetsState (pCtx);
580572 }
581573 return pCtx->iErrorCode;
582574 }
@@ -598,8 +590,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 15 unmodified lines
598590 #else
599591 pCtx->bReferenceLostAtT0Flag = true;
600592 #endif
601− if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
602− ResetParameterSetsState (pCtx);
603593 return pCtx->iErrorCode;
604594 }
605595 }

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