Changeset 1396 in 3DVCSoftware for trunk/source/Lib/TLibDecoder

Timestamp:

11 Mar 2016, 16:54:51 (9 years ago)

Author:

tech

Message:

Merged HTM-16.0-dev1@1395.

Location:

trunk/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)
• TDecTop.h (modified) (1 diff)

trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2135 +2135 @@
     for( Int j = 0; j  <=  vps->getMaxSubLayersInLayerSetMinus1( currLsIdx ); j++ )
     {  
+#if NH_3D_FIX_TICKET_114
+      if( j > 0  &&  dpbSize.getSubLayerFlagInfoPresentFlag( i )  )  
+#else
       if( j > 0  &&  dpbSize.getSubLayerDpbInfoPresentFlag( i, j )  )  
+#endif
       {
         READ_FLAG( uiCode, "sub_layer_dpb_info_present_flag" ); dpbSize.setSubLayerDpbInfoPresentFlag( i, j, uiCode == 1 );

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1063 +1063 @@
     m_pcPic->setLayerId( nalu.m_nuhLayerId );
     m_pcPic->setViewId ( getViewId() );
-#if NH_3D
+#if NH_3D || NH_3D_VSO
     m_pcPic->setViewIndex( getViewIndex() );
     m_pcPic->setIsDepth  ( getIsDepth  () );

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -247 +247 @@
   Int                     m_layerId;
   Int                     m_viewId;
-#if NH_3D                 
+#if NH_3D || NH_3D_VSO
   Int                     m_viewIndex; 
   Bool                    m_isDepth;