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
502#else502#else
503 pCtx->bReferenceLostAtT0Flag = true;503 pCtx->bReferenceLostAtT0Flag = true;
504#endif504#endif
505 if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
506 ResetParameterSetsState (pCtx);
507
508 if (dsOutOfMemory & pCtx->iErrorCode) {505 if (dsOutOfMemory & pCtx->iErrorCode) {
509 return pCtx->iErrorCode;506 return pCtx->iErrorCode;
510 }507 }
@@ -518,8 +515,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 7 unmodified lines
518#else515#else
519 pCtx->bReferenceLostAtT0Flag = true;516 pCtx->bReferenceLostAtT0Flag = true;
520#endif517#endif
521 if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
522 ResetParameterSetsState (pCtx);
523 }518 }
524 return pCtx->iErrorCode;519 return pCtx->iErrorCode;
525 }520 }
@@ -563,8 +558,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 37 unmodified lines
563#else558#else
564 pCtx->bReferenceLostAtT0Flag = true;559 pCtx->bReferenceLostAtT0Flag = true;
565#endif560#endif
566 if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
567 ResetParameterSetsState (pCtx);
568 return pCtx->iErrorCode;561 return pCtx->iErrorCode;
569 }562 }
570 }563 }
@@ -576,7 +569,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 5 unmodified lines
576#else569#else
577 pCtx->bReferenceLostAtT0Flag = true;570 pCtx->bReferenceLostAtT0Flag = true;
578#endif571#endif
579 ResetParameterSetsState (pCtx);
580 }572 }
581 return pCtx->iErrorCode;573 return pCtx->iErrorCode;
582 }574 }
@@ -598,8 +590,6 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 15 unmodified lines
598#else590#else
599 pCtx->bReferenceLostAtT0Flag = true;591 pCtx->bReferenceLostAtT0Flag = true;
600#endif592#endif
601 if ((pCtx->eErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
602 ResetParameterSetsState (pCtx);
603 return pCtx->iErrorCode;593 return pCtx->iErrorCode;
604 }594 }
605 }595 }

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