Changeset 887 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

17 Sep 2014, 01:08:52 (11 years ago)

Author:

qualcomm

Message:

Fix for earlier implementation mistake that omit the signalling of cross_layer_bla_flag

MACRO: CROSS_LAYER_BLA_FLAG_FIX

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2807 +2807 @@
     }
 #else
+#if CROSS_LAYER_BLA_FLAG_FIX
+    Int iBits = 0;
+    if(rpcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
+#else
     if(rpcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
+#endif
     {
       READ_FLAG(uiCode, "discardable_flag"); // ignored
@@ -2821 +2826 @@
       }
 #endif
-
-    }
+#if CROSS_LAYER_BLA_FLAG_FIX
+      iBits++;
+#endif
+    }
+#if CROSS_LAYER_BLA_FLAG_FIX
+    if(rpcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
+    {
+      READ_FLAG(uiCode, "cross_layer_bla_flag");  rpcSlice->setCrossLayerBLAFlag( uiCode ? true : false );
+      iBits++;
+    }
+    for ( ; iBits < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
+#else
     for (Int i = 1; i < rpcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
+#endif
     {
       READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored