Changeset 1110 in 3DVCSoftware for branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon

Timestamp:

7 Nov 2014, 14:05:45 (10 years ago)

Author:

tech

Message:

H_MV_HLS_FIX. Various fixes for MV-HEVC HLS syntax.

Location:

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon

Files:

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

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.cpp ¶

@@ -1878 +1878 @@
   m_vpsBaseLayerInternalFlag = true; 
   m_vpsBaseLayerAvailableFlag = true; 
+
+
 #endif
 
@@ -1913 +1915 @@
   m_repFormatIdxPresentFlag = false; 
   m_maxOneActiveRefLayerFlag = false; 
+#if H_MV_HLS_FIX
+  m_vpsPocLsbAlignedFlag  = false; 
+#endif
   m_directDepTypeLenMinus2   = 0;         
   
@@ -2366 +2371 @@
   return numViews;
 }
-
 
 Void TComVPS::deriveLayerSetLayerIdList()

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.h ¶

@@ -861 +861 @@
   TComRepFormat* m_repFormat             [MAX_NUM_LAYERS]; 
   Bool        m_maxOneActiveRefLayerFlag;       
-#if H_MV_HLS7_GEN
+#if H_MV_HLS7_GEN || H_MV_HLS_FIX
   Bool        m_vpsPocLsbAlignedFlag;
 #endif
@@ -1146 +1146 @@
   Bool    getMaxOneActiveRefLayerFlag( )                                   { return m_maxOneActiveRefLayerFlag; } 
 
-#if H_MV_HLS7_GEN
+#if H_MV_HLS7_GEN || H_MV_HLS_FIX
   Void    setVpsPocLsbAlignedFlag( Bool flag )                             { m_vpsPocLsbAlignedFlag = flag; } 
   Bool    getVpsPocLsbAlignedFlag(  )                                      { return m_vpsPocLsbAlignedFlag; } 
@@ -2880 +2880 @@
   Int  getPocMsbVal(  ) { return m_pocMsbVal; } 
 
+#if H_MV_HLS_FIX
+  Bool getCraOrBlaPicFlag() { return ( getCraPicFlag() || getBlaPicFlag() ); } 
+  Bool getPocMsbValRequiredFlag() { return ( getCraOrBlaPicFlag() && ( getVPS()->getVpsPocLsbAlignedFlag() || getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) == 0 ) );  }
+#else
   Bool getPocMsbValRequiredFlag() { return m_pocMsbValRequiredFlag; }
   Void setPocMsbValRequiredFlag(Bool x) { m_pocMsbValRequiredFlag = x; }
+#endif
+
 
   UInt getPocLsbValLen() { return getSPS()->getBitsForPOC(); }; //log2_max_pic_order_cnt_lsb_minus4 + 4  

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TypeDef.h ¶

@@ -383 +383 @@
 /////////////////////////////////////////////////////////////////////////////////
 // TBD: Check if integration is necessary. 
+
+#define H_MV_HLS_FIX                         1
 #define H_MV_HLS_PTL_LIMITS                  0
 #define H_MV_HLS7_GEN                        0  // General changes (not tested)