Changeset 254 in 3DVCSoftware for branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibDecoder/TDecCAVLC.cpp
- Timestamp:
- 4 Feb 2013, 02:58:35 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibDecoder/TDecCAVLC.cpp
r210 r254 1468 1468 #endif 1469 1469 #endif 1470 #if HHI_MPI 1470 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 1471 1471 Void TDecCavlc::parseSPS(TComSPS* pcSPS, Bool bIsDepth) 1472 1472 #else … … 1892 1892 1893 1893 #if LCU_SYNTAX_ALF 1894 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 1895 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth) 1896 #else 1894 1897 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet) 1898 #endif 1895 1899 #else 1896 1900 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl) … … 2495 2499 #elif HHI_MPI 2496 2500 const int iExtraMergeCandidates = sps->getUseMVI() ? 1 : 0; 2501 #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 2502 const int iExtraMergeCandidates = ( (isDepth || sps->getMultiviewMvPredMode()) ) ? 1 : 0; 2497 2503 #else 2498 2504 const int iExtraMergeCandidates = sps->getMultiviewMvPredMode() ? 1 : 0;
Note: See TracChangeset for help on using the changeset viewer.