Changeset 418 in SHVCSoftware for branches/SHM-3.1-dev

Timestamp:

8 Oct 2013, 19:10:25 (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

@@ -41 +41 @@
 #define SVC_EXTENSION                    1
 
-#define SCALABILITY_MASK_E0104           1
-
 #define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]
 
@@ -66 +64 @@
 #define SCALED_REF_LAYER_OFFSETS         1      ///< M0309: Signal scaled reference layer offsets in SPS
 #define VERT_MV_CONSTRAINT               1      ///< Vertical MV component constraint flag
+#define SCALABILITY_MASK_E0104           1      ///< scalability mask for depth
 
 #define ILP_SSH_SIG                      1      ///< JCTVC-N0195 proposal 2, JCTVC-N0118: add presence flag in VPS ext to condition inter-layer prediction signaling in slice segment header

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

@@ -773 +773 @@
       {
 #if N0147_IRAP_ALIGN_FLAG
-       if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
-       {
-         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(NAL_UNIT_CODED_SLICE_CRA);
-         }
-       }
-#else
+        if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
+        {
+          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(NAL_UNIT_CODED_SLICE_CRA);
+          }
+        }
+#else
+        pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+#endif 
+
+#if IDR_ALIGNMENT
+        TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
+        TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
+        if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
+        {
+          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
+        }
+        else
+        {
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
-#endif 
-
-#if IDR_ALIGNMENT
-         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
-         TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
-        if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
-         {
-           pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
-         }
-         else
-         {
-          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
-         }
+        }
 #endif 
       }