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/decode_slice.cpp (1 of 11 files). Show all

Unified · Split

codec/decoder/core/src/decode_slice.cpp+2−2
@@ -90,7 +90,7 @@ int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) { · 89 unmodified lines
90 break;90 break;
91 }91 }
92 92
93 if (!pCtx->pParam->bParseOnly) { //for parse only, actual recon MB unnecessary93 if (!pCtx->bParseOnly) { //for parse only, actual recon MB unnecessary
94 if (WelsTargetMbConstruction (pCtx)) {94 if (WelsTargetMbConstruction (pCtx)) {
95 WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,95 WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
96 "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d",96 "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d",
@@ -134,7 +134,7 @@ int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) { · 37 unmodified lines
134 if ((pCurSlice->eSliceType != I_SLICE) && (pCurSlice->eSliceType != P_SLICE))134 if ((pCurSlice->eSliceType != I_SLICE) && (pCurSlice->eSliceType != P_SLICE))
135 return 0;135 return 0;
136 136
137 if (pCtx->pParam->bParseOnly) //for parse only, deblocking should not go on137 if (pCtx->bParseOnly) //for parse only, deblocking should not go on
138 return 0;138 return 0;
139 139
140 pDeblockMb = WelsDeblockingMb;140 pDeblockMb = WelsDeblockingMb;

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