Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2680,7 +2680,6 @@ void ParasetIdAdditionIdAdjust (SParaSetOffsetVariable* sParaSetOffsetVariable, · 2679 unmodified lines | ||
| 2680 | 2680 | //31st finish: next_spsid_in_bs == 1; |
| 2681 | 2681 | |
| 2682 | 2682 | const int32_t kiEncId = kiCurEncoderParaSetId; |
| 2683 | − const bool* kpUsedIdPointer = &sParaSetOffsetVariable->bUsedParaSetIdInBs[0]; | |
| 2684 | 2683 | uint32_t uiNextIdInBs = sParaSetOffsetVariable->uiNextParaSetIdToUseInBs; |
| 2685 | 2684 | |
| 2686 | 2685 | //update current layer's pCodingParam |
| @@ -2691,20 +2690,12 @@ void ParasetIdAdditionIdAdjust (SParaSetOffsetVariable* sParaSetOffsetVariable, · 4 unmodified lines | ||
| 2691 | 2690 | |
| 2692 | 2691 | //prepare for next update: |
| 2693 | 2692 | // find the next avaibable iId |
| 2694 | − do { | |
| 2695 | − ++uiNextIdInBs; | |
| 2696 | − if (uiNextIdInBs >= kuiMaxIdInBs) { | |
| 2697 | − uiNextIdInBs = 0;//ensure the SPS_ID wound not exceed MAX_SPS_COUNT | |
| 2698 | − } | |
| 2699 | − } while (kpUsedIdPointer[uiNextIdInBs]); | |
| 2700 | − | |
| 2693 | + ++uiNextIdInBs; | |
| 2694 | + if (uiNextIdInBs >= kuiMaxIdInBs) { | |
| 2695 | + uiNextIdInBs = 0;//ensure the SPS_ID wound not exceed MAX_SPS_COUNT | |
| 2696 | + } | |
| 2701 | 2697 | // update next_id |
| 2702 | 2698 | sParaSetOffsetVariable->uiNextParaSetIdToUseInBs = uiNextIdInBs; |
| 2703 | − | |
| 2704 | −#if _DEBUG | |
| 2705 | − assert (!sParaSetOffsetVariable->bUsedParaSetIdInBs[uiNextIdInBs]); //sure the next-to-use one is marked activated correctly | |
| 2706 | −#endif | |
| 2707 | − | |
| 2708 | 2699 | } |
| 2709 | 2700 | |
| 2710 | 2701 | /*! |