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

Timestamp:

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

Author:

seregin

Message:

remove macro ALIGN_TSA_STSA_PICS

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (6 diffs)

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
         }
       }