History

change resolution update logic

licaiguo committed 12 years ago

Commit 1a2dd0c1 parent a1c49145 files · +1 −26Browse files

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

Unified · Split

codec/decoder/core/src/decoder.cpp+0−15
@@ -345,8 +345,6 @@ void_t WelsOpenDecoder (PWelsDecoderContext pCtx) { · 344 unmodified lines
345 if (ERR_NONE != WelsInitMemory (pCtx))345 if (ERR_NONE != WelsInitMemory (pCtx))
346 return;346 return;
347 347
348 pCtx->iMaxWidthInSps = 0;
349 pCtx->iMaxHeightInSps = 0;
350#ifdef LONG_TERM_REF348#ifdef LONG_TERM_REF
351 pCtx->bParamSetsLostFlag = true;349 pCtx->bParamSetsLostFlag = true;
352#else350#else
@@ -685,19 +683,6 @@ int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWi · 332 unmodified lines
685 return iErr;683 return iErr;
686}684}
687 685
688/*!
689 * \brief update maximal picture width and height if applicable when receiving a SPS NAL
690 */
691void_t UpdateMaxPictureResolution (PWelsDecoderContext pCtx, const int32_t kiCurWidth, const int32_t kiCurHeight) {
692 //any dimension larger than that of current dimension, should modify the max-dimension
693 if ((kiCurWidth * kiCurHeight) > (pCtx->iMaxWidthInSps * pCtx->iMaxHeightInSps)) {
694 pCtx->iMaxWidthInSps = kiCurWidth;
695 pCtx->iMaxHeightInSps = kiCurHeight;
696 }
697
698 return;
699}
700
701void_t AssignFuncPointerForRec (PWelsDecoderContext pCtx) {686void_t AssignFuncPointerForRec (PWelsDecoderContext pCtx) {
702 pCtx->pGetI16x16LumaPredFunc[I16_PRED_V ] = WelsI16x16LumaPredV_c;687 pCtx->pGetI16x16LumaPredFunc[I16_PRED_V ] = WelsI16x16LumaPredV_c;
703 pCtx->pGetI16x16LumaPredFunc[I16_PRED_H ] = WelsI16x16LumaPredH_c;688 pCtx->pGetI16x16LumaPredFunc[I16_PRED_H ] = WelsI16x16LumaPredH_c;

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