Changeset 765 in SHVCSoftware

Timestamp:

30 Apr 2014, 01:34:14 (11 years ago)

Author:

seregin

Message:

remove macro ALIGN_TSA_STSA_PICS

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (6 diffs)

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

@@ -113 +113 @@
 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
 #define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag
-#define ALIGN_TSA_STSA_PICS              1      ///< JCTVC-N0084: Alignment of TSA and STSA pictures across AU.
 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
 #if REPN_FORMAT_IN_VPS

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

@@ -1173 +1173 @@
   }
 #endif
-#if ALIGN_TSA_STSA_PICS
+
+  // Alignment of TSA and STSA pictures across AU
   if( m_apcSlicePilot->getLayerId() > 0 )
   {
@@ -1210 +1211 @@
     }
   }
-#endif
+
 #else //SVC_EXTENSION
   //we should only get a different poc for a new picture (with CTU address==0)

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

@@ -1283 +1283 @@
       if(pcSlice->isTemporalLayerSwitchingPoint(rcListPic) || pcSlice->getSPS()->getTemporalIdNestingFlag())
       {
-#if ALIGN_TSA_STSA_PICS
+#if SVC_EXTENSION
+        // Alignment of TSA pictures across AU
         if( pcSlice->getLayerId() > 0 )
         {
@@ -1339 +1340 @@
           }
         }
-#else
+#else  //SVC_EXTENSION
         if(pcSlice->getTemporalLayerNonReferenceFlag())
         {
@@ -1348 +1349 @@
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_R);
         }
-#endif
+#endif //SVC_EXTENSION
       }
       else if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic))
@@ -1382 +1383 @@
         if(isSTSA==true)
         {    
-#if ALIGN_TSA_STSA_PICS
+#if SVC_EXTENSION
+          // Alignment of STSA pictures across AU
           if( pcSlice->getLayerId() > 0 )
           {
@@ -1438 +1440 @@
             }
           }
-#else
+#else  //SVC_EXTENSION
           if(pcSlice->getTemporalLayerNonReferenceFlag())
           {
@@ -1447 +1449 @@
             pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R);
           }
-#endif
+#endif //SVC_EXTENSION
         }
       }