History

Convert tabs to spaces in multiline comments

Martin Storsjö committed 11 years ago

Commit b05468b1 parent 853423b67 files · +805 −805Browse files

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

Unified · Split

codec/decoder/core/src/decoder_core.cpp+20−20
@@ -315,7 +315,7 @@ int32_t ParsePredWeightedTable (PBitStringAux pBs, PSliceHeader pSh) { · 314 unmodified lines
315}315}
316 316
317/*317/*
318 * Predeclared function routines ..318 * Predeclared function routines ..
319 */319 */
320int32_t ParseRefPicListReordering (PBitStringAux pBs, PSliceHeader pSh) {320int32_t ParseRefPicListReordering (PBitStringAux pBs, PSliceHeader pSh) {
321 int32_t iList = 0;321 int32_t iList = 0;
@@ -538,7 +538,7 @@ int32_t CheckBsBuffer (PWelsDecoderContext pCtx, const int32_t kiSrcLen) { · 216 unmodified lines
538 * Especially for:538 * Especially for:
539 * rbsp_au_buffer, cur_dq_layer_ptr and ref_dq_layer_ptr in MB info cache.539 * rbsp_au_buffer, cur_dq_layer_ptr and ref_dq_layer_ptr in MB info cache.
540 * return:540 * return:
541 * 0 - success; otherwise returned error_no defined in error_no.h.541 * 0 - success; otherwise returned error_no defined in error_no.h.
542*/542*/
543int32_t WelsInitMemory (PWelsDecoderContext pCtx) {543int32_t WelsInitMemory (PWelsDecoderContext pCtx) {
544 if (pCtx == NULL) {544 if (pCtx == NULL) {
@@ -600,11 +600,11 @@ void WelsFreeMemory (PWelsDecoderContext pCtx) { · 55 unmodified lines
600 }600 }
601}601}
602/*602/*
603 * DecodeNalHeaderExt603 * DecodeNalHeaderExt
604 * Trigger condition: NAL_UNIT_TYPE = NAL_UNIT_PREFIX or NAL_UNIT_CODED_SLICE_EXT604 * Trigger condition: NAL_UNIT_TYPE = NAL_UNIT_PREFIX or NAL_UNIT_CODED_SLICE_EXT
605 * Parameter:605 * Parameter:
606 * pNal: target NALUnit ptr606 * pNal: target NALUnit ptr
607 * pSrc: NAL Unit bitstream607 * pSrc: NAL Unit bitstream
608 */608 */
609void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {609void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {
610 PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;610 PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;
@@ -636,8 +636,8 @@ void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) { · 25 unmodified lines
636#define MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1 15636#define MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1 15
637#define SLICE_HEADER_CABAC_INIT_IDC_MAX 2637#define SLICE_HEADER_CABAC_INIT_IDC_MAX 2
638/*638/*
639 * decode_slice_header_avc639 * decode_slice_header_avc
640 * Parse slice header of bitstream in avc for storing data structure640 * Parse slice header of bitstream in avc for storing data structure
641 */641 */
642int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {642int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {
643 PNalUnit const kpCurNal = pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum - 1];643 PNalUnit const kpCurNal = pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum - 1];
@@ -1108,9 +1108,9 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 464 unmodified lines
1108}1108}
1109 1109
1110/*1110/*
1111 * Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.1111 * Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
1112 * pSrc: mark as decoded prefix NAL1112 * pSrc: mark as decoded prefix NAL
1113 * ppDst: succeeded VCL NAL based AVC (I/P Slice)1113 * ppDst: succeeded VCL NAL based AVC (I/P Slice)
1114 */1114 */
1115bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {1115bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {
1116 PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;1116 PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;
@@ -1507,9 +1507,9 @@ void ResetCurrentAccessUnit (PWelsDecoderContext pCtx) { · 390 unmodified lines
1507}1507}
1508 1508
1509/*!1509/*!
1510 * \brief Force reset current Acess Unit Nal list in case error parsing/decoding in current AU1510 * \brief Force reset current Acess Unit Nal list in case error parsing/decoding in current AU
1511 * \author1511 * \author
1512 * \history 11/16/20091512 * \history 11/16/2009
1513 */1513 */
1514void ForceResetCurrentAccessUnit (PAccessUnit pAu) {1514void ForceResetCurrentAccessUnit (PAccessUnit pAu) {
1515 uint32_t uiSucAuIdx = pAu->uiEndPos + 1;1515 uint32_t uiSucAuIdx = pAu->uiEndPos + 1;
@@ -1929,12 +1929,12 @@ void DecodeFinishUpdate (PWelsDecoderContext pCtx) { · 413 unmodified lines
1929 * construct an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to1929 * construct an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to
1930 * joint a collective access unit.1930 * joint a collective access unit.
1931 * parameter\1931 * parameter\
1932 * buf: bitstream data buffer1932 * buf: bitstream data buffer
1933 * bit_len: size in bit length of data1933 * bit_len: size in bit length of data
1934 * buf_len: size in byte length of data1934 * buf_len: size in byte length of data
1935 * coded_au: mark an Access Unit decoding finished1935 * coded_au: mark an Access Unit decoding finished
1936 * return:1936 * return:
1937 * 0 - success; otherwise returned error_no defined in error_no.h1937 * 0 - success; otherwise returned error_no defined in error_no.h
1938 */1938 */
1939int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {1939int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
1940 int32_t iErr;1940 int32_t iErr;
@@ -2152,7 +2152,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 211 unmodified lines
2152 memset (&pLayerInfo, 0, sizeof (SLayerInfo));2152 memset (&pLayerInfo, 0, sizeof (SLayerInfo));
2153 2153
2154 /*2154 /*
2155 * Loop decoding for slices (even FMO and/ multiple slices) within a dq layer2155 * Loop decoding for slices (even FMO and/ multiple slices) within a dq layer
2156 */2156 */
2157 while (iIdx <= iEndIdx) {2157 while (iIdx <= iEndIdx) {
2158 bool bReconstructSlice;2158 bool bReconstructSlice;

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