Changeset 825 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

11 Jul 2014, 20:42:00 (10 years ago)

Author:

qualcomm

Message:

Integration of R0151(R0151_CGS_3D_ASYMLUT_IMPROVE), R0150 (R0150_CGS_SIGNAL_CONSTRAINTS), and R0164 (R0164_CGS_LUT_BUGFIX)

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1153 +1153 @@
         if( pcSlice->getPPS()->getCGSFlag() )
         {
+#if R0150_CGS_SIGNAL_CONSTRAINTS
+          // all reference layers are currently taken as CGS reference layers
+          m_Enc3DAsymLUTPPS.addRefLayerId( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) );
+          m_Enc3DAsymLUTPicUpdate.addRefLayerId( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) );
+#endif
           if(g_posScalingFactor[refLayerIdc][0] < (1<<16) || g_posScalingFactor[refLayerIdc][1] < (1<<16)) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
           {
@@ -3987 +3992 @@
   if( m_layerId && pcSlice->getPPS()->getCGSFlag() )
   {
+    if( m_Enc3DAsymLUTPPS.getPPSBit() > 0 )
+      m_Enc3DAsymLUTPicUpdate.copy3DAsymLUT( &m_Enc3DAsymLUTPPS );
     m_Enc3DAsymLUTPicUpdate.updatePicCGSBits( pcSlice , m_Enc3DAsymLUTPPS.getPPSBit() );
   }