Changeset 850 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

1 Aug 2014, 22:23:56 (11 years ago)

Author:

qualcomm

Message:

Constraint checking such when slice_temporal_mvp_enabled_flag is equal to 0, and TemporalId is equal to 0, succeeding pictures shall not use earlier pictures as TMVP reference

Adoption of JCTVC-R0226. (Macro: R0226_SLICE_TMVP)

From: Hendry <fhendry@…>

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -106 +106 @@
 , m_temporalLayerNonReferenceFlag ( false )
 , m_enableTMVPFlag                ( true )
+#if R0226_SLICE_TMVP
+, m_availableForTMVPRefFlag       ( true )
+#endif
 #if SVC_EXTENSION
 , m_layerId                     ( 0 )

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

@@ -2050 +2050 @@
   Int         m_associatedIrapPocBeforeReset;
 #endif
-
   NalUnitType m_iAssociatedIRAPType;
   static Int  m_prevTid0POC;
@@ -2141 +2140 @@
 
   Bool       m_enableTMVPFlag;
+#if R0226_SLICE_TMVP
+  Bool       m_availableForTMVPRefFlag;
+#endif
 
 #if SVC_EXTENSION
@@ -2448 +2450 @@
   Bool      getEnableTMVPFlag     ()              { return m_enableTMVPFlag;}
 
+#if R0226_SLICE_TMVP
+  Void      setAvailableForTMVPRefFlag     ( Bool   b )    { m_availableForTMVPRefFlag = b; }
+  Bool      getAvailableForTMVPRefFlag     ()              { return m_availableForTMVPRefFlag;}
+#endif
+
 #if SVC_EXTENSION
   Bool      setBaseColPic       ( TComList<TComPic*>& rcListPic , UInt refLayerIdc );

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

@@ -51 +51 @@
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
 
+#define R0226_SLICE_TMVP                 1      ///< JCTVC-R0226, Regarding slice_temporal_mvp_enabled_flag
 #define R0279_REP_FORMAT_INBL            1      ///< JCTVC-R0279, For any independent non-base layer the used representation format is the one that is signalled in the active SPS for the layer
 #define R0227_VUI_BSP_HRD_FLAG           1      ///< JCTVC-R0227, Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled