Changeset 689 in SHVCSoftware

Timestamp:

17 Apr 2014, 05:10:35 (11 years ago)

Author:

qualcomm

Message:

minor fixes for CGS checking

Location:

branches/SHM-6-dev

Files:

• cfg/layers.cfg (modified) (1 diff)
• cfg/layers_avcbase.cfg (modified) (1 diff)
• source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-6-dev/cfg/layers.cfg

@@ -9 +9 @@
 CrossLayerPictureTypeAlignFlag: 1           # Picture type alignment across layers
 CrossLayerIrapAlignFlag       : 1           # Align IRAP across layers
-InterLayerWeightedPred        : 0           # enable IL WP parameters estimation at encoder
 SEIpictureDigest              : 1
 

branches/SHM-6-dev/cfg/layers_avcbase.cfg

@@ -6 +6 @@
 CrossLayerPictureTypeAlignFlag: 0           # Picture type alignment across layers
 CrossLayerIrapAlignFlag       : 0           # Align IRAP across layers
-InterLayerWeightedPred        : 0           # enable IL WP parameters estimation at encoder
 SEIpictureDigest              : 1
 

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

@@ -552 +552 @@
         Int sameBitDepth = g_bitDepthYLayer[m_layerId] - g_bitDepthYLayer[refLayerId] + g_bitDepthCLayer[m_layerId] - g_bitDepthCLayer[refLayerId];
 
-        if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepth ) // ratio 1x
+        if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepth 
+#if Q0048_CGS_3D_ASYMLUT
+          || getPPS()->getCGSFlag()
+#endif
+          ) // ratio 1x
 #else
         if(!( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || (!scalingOffset)) // ratio 1x

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -861 +861 @@
           Bool sameBitDepths = ( g_bitDepthYLayer[m_layerId] == g_bitDepthYLayer[refLayerId] ) && ( g_bitDepthCLayer[m_layerId] == g_bitDepthCLayer[refLayerId] );
 
-          if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets || !sameBitDepths )
+          if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets || !sameBitDepths 
+#if Q0048_CGS_3D_ASYMLUT
+            || m_cPPS.getCGSFlag() > 0
+#endif
+            )
 #else
           if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !zeroOffsets )