Changeset 1219 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

8 Jul 2015, 23:52:07 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0130_EOB

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1905 +1905 @@
 
     // write bitstream out
-    if(iTotalNumEncoded)
-    {
-#if P0130_EOB
+    if( iTotalNumEncoded )
+    {
       if( bEos )
       {
@@ -1917 +1916 @@
         accessUnit.push_back(new NALUnitEBSP(nalu));
       }
-#endif
+
       xWriteStream(bitstreamFile, iTotalNumEncoded, outputAccessUnits);
       outputAccessUnits.clear();
@@ -2130 +2129 @@
   return;
 }
-#endif
+#endif //SVC_EXTENSION
 
 // ====================================================================================================================

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -46 +46 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
-#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
 
 #define Q0177_EOS_CHECKS                 1      ///< JCTVC-Q0177; Put checks on handling EOS
-#define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
@@ -121 +119 @@
 #endif
 #define P0123_ALPHA_CHANNEL_SEI          1      ///< JCTVC-P0123: SEI message for alpha channel information
+#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
 
 /// constants

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

@@ -2070 +2070 @@
 
     case NAL_UNIT_EOB:
-#if P0130_EOB
+#if SVC_EXTENSION
       //Check layer id of the nalu. if it is not 0, give a warning message.
       if (nalu.m_layerId > 0)