Changeset 185 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

12 May 2013, 01:23:02 (12 years ago)

Author:

qualcomm

Message:

Bug fix in JCTVC_M0458_INTERLAYER_RPS_SIG

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

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

@@ -1347 +1347 @@
         if(rpcSlice->getNumILRRefIdx() > 1) 
         {
+          Int numBits = 1;
+          while ((1 << numBits) < rpcSlice->getNumILRRefIdx())
+          {
+            numBits++;
+          }
           if( !rpcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
           {
-            READ_UVLC(uiCode,"num_inter_layer_ref_pics_minus1");   
+            READ_CODE( numBits, uiCode,"num_inter_layer_ref_pics_minus1" );
             rpcSlice->setActiveNumILRRefIdx(uiCode + 1);          
           }
@@ -1355 +1360 @@
           {
             rpcSlice->setActiveNumILRRefIdx(1);          
-            rpcSlice->setInterLayerPredLayerIdc(0,0);          
           }
           for(Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) 
           {
-            READ_UVLC(uiCode,"inter_layer_pred_layer_idc[i]");          
+            READ_CODE( numBits,uiCode,"inter_layer_pred_layer_idc[i]" );  
             rpcSlice->setInterLayerPredLayerIdc(uiCode,i);          
           }

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1028 +1028 @@
         if(pcSlice->getNumILRRefIdx() > 1)
         {
+          Int numBits = 1;
+          while ((1 << numBits) < pcSlice->getNumILRRefIdx())
+          {
+            numBits++;
+          }
           if( !pcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
           {
-            WRITE_UVLC(pcSlice->getNumInterLayerRefPics(),"num_inter_layer_ref_pics_minus1");                     
+            WRITE_CODE( numBits,pcSlice->getNumInterLayerRefPics(),"num_inter_layer_ref_pics_minus1");
           }       
           for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) 
-            WRITE_UVLC(pcSlice->getInterLayerPredLayerIdc(i),"inter_layer_pred_layer_idc[i]");     
+            WRITE_CODE( numBits,pcSlice->getInterLayerPredLayerIdc(i),"inter_layer_pred_layer_idc[i]");   
         }
       }

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

@@ -659 +659 @@
     if(m_layerId > 0)
     {
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+      if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
+      {
+        pcSlice->setNumRefIdx(REF_PIC_LIST_0, pcSlice->getActiveNumILRRefIdx());
+        pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getActiveNumILRRefIdx());
+      }
+      else
+      {
+        pcSlice->setNumRefIdx(REF_PIC_LIST_0, pcSlice->getNumRefIdx(REF_PIC_LIST_0)+pcSlice->getActiveNumILRRefIdx());
+        pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getNumRefIdx(REF_PIC_LIST_1)+pcSlice->getActiveNumILRRefIdx());
+      }
+#else
       if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
       {
@@ -669 +681 @@
         pcSlice->setNumRefIdx(REF_PIC_LIST_1, pcSlice->getNumRefIdx(REF_PIC_LIST_1)+pcSlice->getNumILRRefIdx());
       }
+#endif
     }
 #endif