shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1446 from sijchen/for_format

[Encoder] fix a small range of slice idx

--- a/codec/encoder/core/inc/slice.h

+++ b/codec/encoder/core/inc/slice.h

@@ -168,7 +168,7 @@

 uint8_t		uiMvcNum;

 uint8_t		sScaleShift;

-uint8_t		uiSliceIdx;

+uint32_t		uiSliceIdx;

 bool		bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?

 uint8_t		uiLastMbQp;		// stored qp for last mb coded, maybe more efficient for mb skip detection etc.

--- a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp

+++ b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp

@@ -208,7 +208,7 @@

   }

 }

-int32_t CheckBitstreamBuffer (const uint8_t	kuiSliceIdx, sWelsEncCtx* pEncCtx,  SBitStringAux* pBs) {

+int32_t CheckBitstreamBuffer (const uint32_t	kuiSliceIdx, sWelsEncCtx* pEncCtx,  SBitStringAux* pBs) {

   const intX_t iLeftLength = pBs->pBufEnd - pBs->pBufPtr - 1;

   assert (iLeftLength > 0);