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

Timestamp:

8 Oct 2013, 08:37:32 (11 years ago)

Author:

qualcomm

Message:

JCTVC-N0084: Alignment of TSA and STSA pictures (MACRO: ALIGN_TSA_STSA_PICS)

Added check at the encoder to ensure that the TSA and STSA pictures are aligned.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

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

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

@@ -818 +818 @@
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_R);
         }
+#if ALIGN_TSA_STSA_PICS
+        if( pcSlice->getLayerId() > 0 )
+        {
+          for(Int i = 0; i < pcSlice->getLayerId(); i++)
+          {
+            TComList<TComPic*> *cListPic = m_ppcTEncTop[i]->getListPic();
+            TComPic* lowerLayerPic = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+            if( lowerLayerPic ) // If picture exists in Layer i
+            {
+              assert( ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N ) ||
+                      ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_R ) );
+              // TSA pictures are aligned within an access unit.
+            }
+          }
+        }
+#endif
       }
       else if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic))
@@ -859 +875 @@
             pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R);
           }
+#if ALIGN_TSA_STSA_PICS
+          if( pcSlice->getLayerId() > 0 )
+          {
+            for(Int i = 0; i < pcSlice->getLayerId(); i++)
+            {
+              TComList<TComPic*> *cListPic = m_ppcTEncTop[i]->getListPic();
+              TComPic* lowerLayerPic = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+              if( lowerLayerPic ) // If picture exists in Layer i
+              {
+                assert( ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA_N ) ||
+                        ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA_R ) );
+              }
+              // STSA pictures are aligned within an access unit.
+            }
+          }
+#endif
         }
       }