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

Timestamp:

4 Aug 2015, 03:50:01 (10 years ago)

Author:

seregin

Message:

port rev 4553

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -2008 +2008 @@
   Int64 iDC;
 #if SVC_EXTENSION
-  Int iSamples;
+  Int   numSamples;
 #endif
 };
@@ -2186 +2186 @@
   Int                         getPOC() const                                         { return m_iPOC;                                                }
   Int                         getSliceQp() const                                     { return m_iSliceQp;                                            }
+  Bool                        getUseWeightedPrediction() const                       { return( (m_eSliceType==P_SLICE && testWeightPred()) || (m_eSliceType==B_SLICE && testWeightBiPred()) ); }
   Bool                        getDependentSliceSegmentFlag() const                   { return m_dependentSliceSegmentFlag;                           }
   Void                        setDependentSliceSegmentFlag(Bool val)                 { m_dependentSliceSegmentFlag = val;                            }

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

@@ -659 +659 @@
 };
 
+enum WeightedPredictionMethod
+{
+  WP_PER_PICTURE_WITH_SIMPLE_DC_COMBINED_COMPONENT                          =0,
+  WP_PER_PICTURE_WITH_SIMPLE_DC_PER_COMPONENT                               =1,
+  WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT                           =2,
+  WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING              =3,
+  WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION=4
+};
+
 enum SPSExtensionFlagIndex
 {