Changeset 1015 in 3DVCSoftware for branches/HTM-11.2-dev3-Samsung/source/Lib/TLibCommon

Timestamp:

24 Jul 2014, 06:42:46 (11 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-I0085: Separate enabling flag for intra-view prediction mode (DMM4)

Location:

branches/HTM-11.2-dev3-Samsung/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (2 diffs)
• TComSlice.h (modified) (3 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-11.2-dev3-Samsung/source/Lib/TLibCommon/TComSlice.cpp

@@ -1952 +1952 @@
     m_viewIndex         [i] = -1; 
     m_vpsDepthModesFlag [i] = false;
+#if SEPARATE_FLAG_I0085
+    m_bIVPFlag [i]      = false;
+#endif
     m_ivMvScalingFlag = true; 
 #endif
@@ -1992 +1995 @@
 #if H_3D_INTER_SDC
     m_bInterSDCFlag        [ i ] = false;
+#endif
+#if SEPARATE_FLAG_I0085
+    m_bIVPFlag             [ i ] = false;
 #endif
 #if H_3D_DBBP

branches/HTM-11.2-dev3-Samsung/source/Lib/TLibCommon/TComSlice.h

@@ -810 +810 @@
 #endif
   Bool        m_vpsDepthModesFlag        [MAX_NUM_LAYERS   ];
+#if SEPARATE_FLAG_I0085
+  Bool        m_bIVPFlag                 [MAX_NUM_LAYERS   ];
+#endif
 
 #if H_3D
@@ -1144 +1147 @@
   Void    setVpsDepthModesFlag( Int layerIdInVps, Bool val )               { m_vpsDepthModesFlag[ layerIdInVps ] = val; }
   Bool    getVpsDepthModesFlag( Int layerIdInVps )                         { return m_vpsDepthModesFlag[ layerIdInVps ]; }
+#if SEPARATE_FLAG_I0085
+  Void    setIVPFlag( Int layerIdInVps, Bool val )                    { m_bIVPFlag[ layerIdInVps ] = val; }
+  Bool    getIVPFlag( Int layerIdInVps )                              { return m_bIVPFlag[ layerIdInVps ]; }
+#endif
 
   Bool    getIvMvScalingFlag   (  )                       { return m_ivMvScalingFlag; }
@@ -2515 +2522 @@
   Int* getDepthToDisparityF( Int refViewIdx ) { return m_depthToDisparityF[ refViewIdx ]; }; 
   Bool getVpsDepthModesFlag  ()  { return getVPS()->getVpsDepthModesFlag( getVPS()->getLayerIdInVps( m_layerId ) ); }
-
+#if SEPARATE_FLAG_I0085
+  Bool getIVPFlag       ()  { return getVPS()->getIVPFlag( getVPS()->getLayerIdInVps( m_layerId ) ); }
+#endif
 #endif
 #if H_MV

branches/HTM-11.2-dev3-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -300 +300 @@
 #define FIX_WARNING                       1   // fix narrowing conversion of NumPocStCurr0,NumPocStCurr1 at TComSlice.cpp
 #define FAST_SDC_OFFSET_DECISION_I0084    1
+#define SEPARATE_FLAG_I0085               1
 
 #if H_3D_DIM_DLT