Changeset 1421 in SHVCSoftware for branches/SHM-dev

Timestamp:

5 Aug 2015, 03:39:25 (9 years ago)

Author:

seregin

Message:

add posScalingFactor to reduceSetOfIntraModes

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComDataCU.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3362 +3362 @@
 *\returns Number of intra coding modes (nb of remaining modes + 3 MPMs)
 */
-Int TComDataCU::reduceSetOfIntraModes( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int &fullSetOfModes )
+Int TComDataCU::reduceSetOfIntraModes( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int** posScalingFactor, Int &fullSetOfModes )
 {
   // check BL mode
   UInt uiCUAddrBase = 0, uiAbsPartAddrBase = 0;
   // the right reference layerIdc should be specified, currently it is set to m_layerId-1
-  TComDataCU* pcTempCU = getBaseColCU(m_layerId - 1, uiAbsPartIdx, uiCUAddrBase, uiAbsPartAddrBase, false );
+  TComDataCU* pcTempCU = getBaseColCU(m_layerId - 1, uiAbsPartIdx, uiCUAddrBase, uiAbsPartAddrBase, posScalingFactor, false );
 
   if( pcTempCU->getPredictionMode( uiAbsPartAddrBase ) != MODE_INTRA )

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -484 +484 @@
 #endif
 #if FAST_INTRA_SHVC
-  Int           reduceSetOfIntraModes(  UInt   uiAbsPartIdx, Int* uiIntraDirPred, Int &fullSetOfModes );
+  Int           reduceSetOfIntraModes(  UInt   uiAbsPartIdx, Int* uiIntraDirPred, Int** posScalingFactor, Int &fullSetOfModes );
 #endif
 #if REF_IDX_ME_ZEROMV

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2283 +2283 @@
       if( m_pcEncCfg->getUseFastIntraScalable() && pcCU->getLayerId() > 0 )
       {
-        numModesAvailable = pcCU->reduceSetOfIntraModes(uiPartOffset, uiPreds, iMode );
+        numModesAvailable = pcCU->reduceSetOfIntraModes(uiPartOffset, uiPreds, pcCU->getPic()->getPosScalingFactor(), iMode );
         if( numModesForFullRD > numModesAvailable ) //fast HAD can be skipped
         {