Changeset 1237 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

13 Jul 2015, 20:56:47 (10 years ago)

Author:

seregin

Message:

port rev 4221

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• NALwrite.cpp (modified) (1 diff)
• NALwrite.h (modified) (1 diff)
• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (2 diffs)

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

@@ -53 +53 @@
   bsNALUHeader.write(0,1);                    // forbidden_zero_bit
   bsNALUHeader.write(nalu.m_nalUnitType, 6);  // nal_unit_type
-#if SVC_EXTENSION
-  bsNALUHeader.write(nalu.m_layerId, 6); // reserved_one_5bits
-#else
-  bsNALUHeader.write(nalu.m_reservedZero6Bits, 6);                   // nuh_reserved_zero_6bits
-#endif
+  bsNALUHeader.write(nalu.m_nuhLayerId, 6);   // nuh_layer_id
   bsNALUHeader.write(nalu.m_temporalId+1, 3); // nuh_temporal_id_plus1
 

branches/SHM-dev/source/Lib/TLibEncoder/NALwrite.h

@@ -61 +61 @@
     UInt temporalID = 0,
 #if SVC_EXTENSION
-    UInt     layerId = 0,
+    UInt     layerId = 0)
+#else
+    UInt reserved_zero_6bits = 0)
 #endif
-    UInt reserved_zero_6bits = 0)
 #if SVC_EXTENSION
-  : NALUnit(nalUnitType, temporalID, layerId, reserved_zero_6bits)
+  : NALUnit(nalUnitType, temporalID, layerId)
 #else
   : NALUnit(nalUnitType, temporalID, reserved_zero_6bits)

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

@@ -785 +785 @@
 #else
   WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
-  WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );
+  WRITE_CODE( 0,                                    6,        "vps_max_layers_minus1" );
 #endif
   WRITE_CODE( pcVPS->getMaxTLayers() - 1,           3,        "vps_max_sub_layers_minus1" );

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

@@ -2139 +2139 @@
       {
         // For independent base layer rewriting
-        nalu.m_layerId = 0; 
+        nalu.m_nuhLayerId = 0; 
       }
 #else
@@ -2163 +2163 @@
       {
         // For independent base layer rewriting
-        nalu.m_layerId = 0;
+        nalu.m_nuhLayerId = 0;
       }
 #else