Changeset 193 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

19 Nov 2012, 21:15:40 (12 years ago)

Author:

mitsubishi-htm

Message:

A second release, as planned

• Migrate to HTM 4.1
• Move VSP related switches to cfg file instead of #define in the source code
• A few bug fixes
• For VC project files, only VC9 file is updated

TODO

• Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (6 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1757 +1757 @@
       }
     }
+#if VSP_N
+    if( pcSPS->getViewId() )
+    {
+      READ_FLAG( uiCode, "vsp_present_flag" );
+      pcSPS->setVspPresentFlag( (Bool)uiCode );
+#if VSP_CFG
+      if( pcSPS->getVspPresentFlag() )
+      {
+        READ_FLAG( uiCode, "vsp_depth_present_flag" );
+        pcSPS->setVspDepthPresentFlag( (Bool)uiCode );
+      }
+#endif
+    }
+#endif
     READ_FLAG( uiCode, "sps_extension2_flag");
     if (uiCode)
@@ -1781 +1795 @@
   UInt  uiCode;
   Int   iCode;
-  
+#if VSP_CFG
+  Int   iNumOfVspRefsL0 = 0;
+  Int   iNumOfVspRefsL1 = 0;
+#endif
 #if ENC_DEC_TRACE
   xTraceSliceHeader(rpcSlice);
@@ -2006 +2023 @@
       READ_UVLC (    uiCode, "aps_id" );  rpcSlice->setAPSId(uiCode);
     }
+
+#if VSP_SLICE_HEADER && VSP_CFG
+    if( rpcSlice->getSPS()->getViewId()!=0 
+     && rpcSlice->getSliceType() != I_SLICE
+     && rpcSlice->getSPS()->getVspPresentFlag()
+      )
+    {
+      if( !rpcSlice->getSPS()->isDepth() || rpcSlice->getSPS()->getVspDepthPresentFlag() )
+      {
+        READ_UVLC( uiCode, "num_vsp_ref_pics");
+        rpcSlice->setVspFlag( uiCode > 0 ? true : false );
+        rpcSlice->setNumVspRefPics( uiCode );
+        //printf("SH:num_vsp_ref_pics(%d)\n",uiCode);
+        for( UInt i = 0; i < rpcSlice->getNumVspRefPics(); i++ )
+        {
+          READ_UVLC( uiCode, "vsp_ref_list0_pos");
+          rpcSlice->setVspRefPos( REF_PIC_LIST_0, i, uiCode );
+          //printf("SH:vsp_ref_list0_pos(%d)\n",uiCode);
+          if( rpcSlice->getSliceType() == B_SLICE )
+          {
+            READ_UVLC( uiCode, "vsp_ref_list1_pos");
+            rpcSlice->setVspRefPos( REF_PIC_LIST_1, i, uiCode );
+            //printf("SH:vsp_ref_list1_pos(%d)\n",uiCode);
+          }
+        }
+        iNumOfVspRefsL0 = ( (rpcSlice->getSPS()->getViewId()==0 
+                         || (!rpcSlice->getSPS()->getVspDepthPresentFlag() && rpcSlice->getSPS()->isDepth()) 
+                         || !rpcSlice->getVspFlag() 
+                         || rpcSlice->getVspRefPos(REF_PIC_LIST_0, 0) == 0 ) ? 0 : 1 );
+        iNumOfVspRefsL1 = ( (rpcSlice->getSPS()->getViewId()==0 
+                         || (!rpcSlice->getSPS()->getVspDepthPresentFlag() && rpcSlice->getSPS()->isDepth()) 
+                         || !rpcSlice->getVspFlag() 
+                         || rpcSlice->getVspRefPos(REF_PIC_LIST_1, 0) == 0 ) ? 0 : 1 );
+      }
+    }
+#endif
+
     if (!rpcSlice->isIntra())
     {
@@ -2011 +2065 @@
       if (uiCode)
       {
-        READ_CODE (3, uiCode, "num_ref_idx_l0_active_minus1" );  rpcSlice->setNumRefIdx( REF_PIC_LIST_0, uiCode + 1 );
+        READ_CODE (3, uiCode, "num_ref_idx_l0_active_minus1" );  
+#if VSP_CFG
+        rpcSlice->setNumRefIdx( REF_PIC_LIST_0, uiCode + 1 + iNumOfVspRefsL0 );
+#else
+        rpcSlice->setNumRefIdx( REF_PIC_LIST_0, uiCode + 1 );
+#endif
         if (rpcSlice->isInterB())
         {
-          READ_CODE (3, uiCode, "num_ref_idx_l1_active_minus1" );  rpcSlice->setNumRefIdx( REF_PIC_LIST_1, uiCode + 1 );
+          READ_CODE (3, uiCode, "num_ref_idx_l1_active_minus1" );  
+#if VSP_CFG
+          rpcSlice->setNumRefIdx( REF_PIC_LIST_1, uiCode + 1 + iNumOfVspRefsL1 );
+#else
+          rpcSlice->setNumRefIdx( REF_PIC_LIST_1, uiCode + 1 );
+#endif
         }
         else
@@ -2183 +2247 @@
     if(uiCode)
     {
-      READ_UVLC( uiCode, "num_ref_idx_lc_active_minus1" );      rpcSlice->setNumRefIdx( REF_PIC_LIST_C, uiCode + 1 );
+      READ_UVLC( uiCode, "num_ref_idx_lc_active_minus1" );      
+#if VSP_CFG
+      rpcSlice->setNumRefIdx( REF_PIC_LIST_C, uiCode + 1 + iNumOfVspRefsL0 );
+#else
+      rpcSlice->setNumRefIdx( REF_PIC_LIST_C, uiCode + 1 );
+#endif
       
 #if H0412_REF_PIC_LIST_RESTRICTION
@@ -2348 +2417 @@
 #endif
 
+#if !VSP_CFG
 #if VSP_SLICE_HEADER
   if( rpcSlice->getSPS()->getViewId()!=0 
-#if VSP_TEXT_ONLY
-      && !(rpcSlice->getSPS()->isDepth()) 
-#endif
+   && rpcSlice->getSPS()->getVspPresentFlag()
     )
   {
     READ_FLAG( uiCode, "vsp_flag" );
     rpcSlice->setVspFlag( uiCode ? true : false );
-  }
+    if( rpcSlice->getVspFlag() )
+    {
+      READ_FLAG( uiCode, "vsp_depth_disable_flag" );
+      rpcSlice->setVspDepthDisableFlag( uiCode ? true : false );
+    }
+  }
+#endif
 #endif