Changeset 416 in SHVCSoftware

Timestamp:

8 Oct 2013, 18:55:47 (11 years ago)

Author:

seregin

Message:

formatting the code

Location:

branches/SHM-3.1-dev/source/Lib

Files:

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

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

@@ -112 +112 @@
 #define ILP_RAP                          1      ///< JCTVC-M0208 proposal 3
 
-#define IDR_ALIGNMENT                    0      ///< align IDR picures across layers : As per JCTVC-N0373, IDR are not required to be aligned.
-
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
 #if AVC_BASE
@@ -147 +145 @@
 #endif
 
-#define N0147_IRAP_ALIGN_FLAG            1
+#define N0147_IRAP_ALIGN_FLAG            1      ///< a flag to indicatate whether IRAPs are aligned across layers
+#if !N0147_IRAP_ALIGN_FLAG
+#define IDR_ALIGNMENT                    1      ///< align IDR picures across layers : As per JCTVC-N0373, IDR are not required to be aligned.
+#endif
 #define FAST_INTRA_SHVC                  1      ///< M0115: reduction number of intra modes in the EL (encoder only)
 #if FAST_INTRA_SHVC

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

@@ -775 +775 @@
        if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
        {
-        TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
-        TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
+         TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
          if( picLayer0->getSlice(0)->isIRAP())
-        {
-          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
-        }
-        else
+         {
+           pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
+         }
+         else
          {
            pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);