Changeset 913 in SHVCSoftware for branches

Timestamp:

4 Nov 2014, 00:58:54 (10 years ago)

Author:

seregin

Message:

add getNonHEVCBaseLayerFlag check for getBitDepthY and getBitDepthC

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)

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

@@ -2301 +2301 @@
 #if R0279_REP_FORMAT_INBL
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
+  {
 #else
   if ( layerId == 0 )
-#endif
-  {
-    retVal = sps->getBitDepthY();
+  {
+#endif
+#if VPS_AVC_BL_FLAG_REMOVAL
+    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
+#else
+    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
+#endif
+    {
+      retVal = vps->getVpsRepFormat(layerId)->getBitDepthVpsLuma();
+    }
+    else
+    {
+      retVal = sps->getBitDepthY();
+    }
   }
   else
@@ -2331 +2343 @@
 #if R0279_REP_FORMAT_INBL
   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
+  {
 #else
   if ( layerId == 0 )
-#endif
-  {
-    retVal = sps->getBitDepthC();
+  {
+#endif
+#if VPS_AVC_BL_FLAG_REMOVAL
+    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
+#else
+    if( layerId == 0 && vps->getAvcBaseLayerFlag() )
+#endif
+    {
+      retVal = vps->getVpsRepFormat(layerId)->getBitDepthVpsChroma();
+    }
+    else
+    {
+      retVal = sps->getBitDepthC();
+    }
   }
   else