Changeset 296 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibDecoder

Timestamp:

20 Jun 2013, 17:44:29 (12 years ago)

Author:

nokia

Message:

Implementation of JCTVC-M0040 "Adaptive Resolution Change"

Location:

branches/SHM-2.1-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1158 +1158 @@
   }
 #endif
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+  READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
+#endif
 }
 #endif
@@ -1619 +1622 @@
       rpcSlice->setColRefLayerIdx( 0 );
       rpcSlice->setAltColIndicationFlag( false );
-      if ( sps->getLayerId() > 0 && rpcSlice->getNumMotionPredRefLayers() > 0 )
+      if ( sps->getLayerId() > 0 && rpcSlice->getActiveNumILRRefIdx() > 0 && rpcSlice->getNumMotionPredRefLayers() > 0 )
       {
         READ_FLAG( uiCode, "alt_collocated_indication_flag" );

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -937 +937 @@
       pcSlice->setRefPicList( m_cListPic, false, m_cIlpPic);
     }
+#if M0040_ADAPTIVE_RESOLUTION_CHANGE
+    else if ( m_layerId > 0 )
+    {
+      pcSlice->setRefPicList( m_cListPic, false, NULL);
+    }
+#endif
 #endif