Changeset 289 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

17 Jun 2013, 03:02:26 (12 years ago)

Author:

samsung

Message:

integrate M0163 and M0152 into SHM-2.1-dev

File:

• branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -726 +726 @@
   }
 
+#if VPS_SPLIT_FLAG
+  for(j = 0; j < vps->getNumScalabilityTypes() - vps->getSplittingFlag(); j++)
+#else
   for(j = 0; j < vps->getNumScalabilityTypes(); j++)
+#endif
   {
     WRITE_CODE( vps->getDimensionIdLen(j) - 1, 3,      "dimension_id_len_minus1[j]" );
@@ -738 +742 @@
       WRITE_CODE( vps->getLayerIdInNuh(i),     6,      "layer_id_in_nuh[i]" );
     }
+#if VPS_SPLIT_FLAG
+    if(!vps->getSplittingFlag())
+#endif
     for(j = 0; j < vps->getNumScalabilityTypes(); j++)
     {
@@ -904 +911 @@
   if ( !pcSlice->getDependentSliceSegmentFlag() )
   {
-    for (Int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
+
+#if SH_DISCARDABLE_FLAG
+    if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
+    {
+      assert(!!"discardable_flag");
+      WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag");
+    }
+    for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
     {
       assert(!!"slice_reserved_undetermined_flag[]");
       WRITE_FLAG(0, "slice_reserved_undetermined_flag[]");
     }
+#else
+    for (Int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
+    {
+      assert(!!"slice_reserved_undetermined_flag[]");
+      WRITE_FLAG(0, "slice_reserved_undetermined_flag[]");
+    }
+#endif
 
     WRITE_UVLC( pcSlice->getSliceType(),       "slice_type" );