History

Revert "Merge pull request #2217 from huili2/simply_dec_ctx"

This reverts commit 27172bafd7ff2cc80b08768a32a23470f3d6d3fd, reversing changes made to 24916a652ee5d3e36d931c222df20966f7c158fa.

Haibo Zhu committed 11 years ago

Commit 628befe1 parent 513a34011 files · +86 −133Browse files

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

Unified · Split

codec/decoder/core/src/au_parser.cpp+4−4
@@ -317,7 +317,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 316 unmodified lines
317317 iNalSize -= NAL_UNIT_HEADER_EXT_SIZE;
318318 *pConsumedBytes += NAL_UNIT_HEADER_EXT_SIZE;
319319
320− if (pCtx->pParam->bParseOnly) {
320+ if (pCtx->bParseOnly) {
321321 pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;
322322 int32_t iTrailingZeroByte = 0;
323323 while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
@@ -346,7 +346,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 22 unmodified lines
346346 pSavedData->pCurPos += iActualLen - iOffset;
347347 }
348348 } else {
349− if (pCtx->pParam->bParseOnly) {
349+ if (pCtx->bParseOnly) {
350350 pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;
351351 int32_t iTrailingZeroByte = 0;
352352 while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
@@ -1113,7 +1113,7 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 760 unmodified lines
11131113 WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //vui_parameters_present_flag
11141114 pSps->bVuiParamPresentFlag = !!uiCode;
11151115
1116− if (pCtx->pParam->bParseOnly) {
1116+ if (pCtx->bParseOnly) {
11171117 if (kSrcNalLen >= SPS_PPS_BS_SIZE - 4) { //sps bs exceeds!
11181118 pCtx->iErrorCode |= dsOutOfMemory;
11191119 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_OUT_OF_MEMORY);
@@ -1416,7 +1416,7 @@ int32_t ParsePps (PWelsDecoderContext pCtx, PPps pPpsList, PBitStringAux pBsAux, · 296 unmodified lines
14161416 memcpy (&pCtx->sPpsBuffer[uiPpsId], pPps, sizeof (SPps));
14171417 pCtx->bPpsAvailFlags[uiPpsId] = true;
14181418 }
1419− if (pCtx->pParam->bParseOnly) {
1419+ if (pCtx->bParseOnly) {
14201420 if (kSrcNalLen >= SPS_PPS_BS_SIZE - 4) { //pps bs exceeds
14211421 pCtx->iErrorCode |= dsOutOfMemory;
14221422 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_OUT_OF_MEMORY);

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