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

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@…>

Location:

branches/SHM-3.1-dev/source/Lib

Files:

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

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

@@ -49 +49 @@
 #define VPS_NUH_LAYER_ID                 1      ///< N0085: Assert that the nuh_layer_id of VPS NAL unit should be 0
 #if SVC_EXTENSION
-#define POC_RESET_FLAG                1         ///< N0244: POC reset flag for  layer pictures.
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle
+#define POC_RESET_FLAG                   1      ///< N0244: POC reset flag for  layer pictures.
+#define ALIGN_TSA_STSA_PICS              1      ///< N0084: Alignment of TSA and STSA pictures across AU.
 #define REPN_FORMAT_IN_VPS               1      ///< N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
 #define TIMING_INFO_NONZERO_LAYERID_SPS  1      ///< N0085: Semantics of vui_timing_info_present_flag to always set that flag to zero for non-zero layer ID SPS 

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