Changeset 1010 in SHVCSoftware for branches/SHM-upgrade/source/Lib/TLibEncoder

Timestamp:

3 Feb 2015, 23:23:47 (10 years ago)

Author:

seregin

Message:

port the fix for the ticket #56 (rev 1009)

Location:

branches/SHM-upgrade/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -3109 +3109 @@
       if( vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0 ) 
       {
-        if( (vps->getSPSId(i) == 0) && (vps->getPPSId(i) == 0) )
-        {
-          vps->setBaseLayerPSCompatibilityFlag(i, 1);
-        }
-        else
-        {
-          vps->setBaseLayerPSCompatibilityFlag(i, 0);
-        }
         WRITE_FLAG(vps->getBaseLayerPSCompatibilityFlag(i), "base_layer_parameter_set_compatibility_flag" );
       }

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1639 +1639 @@
       }
     }
+
+#if P0182_VPS_VUI_PS_FLAG
+    if( m_cVPS.getNumRefLayers( m_layerId ) == 0 )
+    {
+      UInt layerIdx = m_cVPS.getLayerIdInVps( m_layerId );
+      RepFormat* repFormat = m_cVPS.getVpsRepFormat(m_cVPS.getVpsRepFormatIdx(layerIdx));
+      
+      if( m_cPPS.getLayerId() == 0 && 
+          m_cSPS.getLayerId() == 0 &&
+          repFormat->getChromaFormatVpsIdc() == m_cSPS.getChromaFormatIdc() &&
+          repFormat->getSeparateColourPlaneVpsFlag() == 0 &&
+          repFormat->getPicHeightVpsInLumaSamples() == m_cSPS.getPicHeightInLumaSamples() &&
+          repFormat->getPicWidthVpsInLumaSamples()  == m_cSPS.getPicWidthInLumaSamples() &&
+          repFormat->getBitDepthVpsLuma()   == m_cSPS.getBitDepth(CHANNEL_TYPE_LUMA) &&
+          repFormat->getBitDepthVpsChroma() == m_cSPS.getBitDepth(CHANNEL_TYPE_CHROMA) &&
+          repFormat->getConformanceWindowVps().getWindowLeftOffset()   == m_cSPS.getConformanceWindow().getWindowLeftOffset() &&
+          repFormat->getConformanceWindowVps().getWindowRightOffset()  == m_cSPS.getConformanceWindow().getWindowRightOffset() &&
+          repFormat->getConformanceWindowVps().getWindowTopOffset()    == m_cSPS.getConformanceWindow().getWindowTopOffset() &&
+          repFormat->getConformanceWindowVps().getWindowBottomOffset() == m_cSPS.getConformanceWindow().getWindowBottomOffset() )
+      {
+        m_cVPS.setBaseLayerPSCompatibilityFlag(layerIdx, 1);
+      }
+      else
+      {
+        m_cVPS.setBaseLayerPSCompatibilityFlag(layerIdx, 0);
+      }
+    }
+#endif
   }
 }