Ignore:
Timestamp:
4 Feb 2013, 02:58:35 (12 years ago)
Author:
mediatek-htm
Message:

Integration of JCT3V-C0137

The added texture merging candidate is controlled by the MACRO "MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137"

From MediaTek
yiwen.chen@…

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r210 r254  
    14681468#endif
    14691469#endif
    1470 #if HHI_MPI
     1470#if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
    14711471Void TDecCavlc::parseSPS(TComSPS* pcSPS, Bool bIsDepth)
    14721472#else
     
    18921892
    18931893#if LCU_SYNTAX_ALF
     1894#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     1895Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth)
     1896#else
    18941897Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet)
     1898#endif
    18951899#else
    18961900Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl)
     
    24952499  #elif HHI_MPI
    24962500  const int iExtraMergeCandidates = sps->getUseMVI() ? 1 : 0;
     2501  #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     2502  const int iExtraMergeCandidates = (  (isDepth || sps->getMultiviewMvPredMode()) ) ? 1 : 0;   
    24972503  #else
    24982504  const int iExtraMergeCandidates = sps->getMultiviewMvPredMode() ? 1 : 0;
Note: See TracChangeset for help on using the changeset viewer.