Changeset 976 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

7 Jul 2014, 17:27:51 (10 years ago)

Author:

tech

Message:

• Merged 11.1-dev0@975. (Clean ups)
• Added coding results.
• Changed version number.

File:

• trunk/source/Lib/TLibCommon/TComSlice.cpp (modified) (31 diffs)

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -48 +48 @@
 TComSlice::TComSlice()
 : m_iPPSId                        ( -1 )
-#if H_MV_HLS_8_POC_Q0142_32
+#if H_MV
 , m_slicePicOrderCntLsb           ( 0 )
 #endif
@@ -1863 +1863 @@
 #endif
 {
-#if H_MV_HLS_8_SYN_Q0041_03
+#if H_MV
   m_vpsBaseLayerInternalFlag = true; 
 #endif
@@ -1883 +1883 @@
   m_vpsNumProfileTierLevelMinus1 = -1; 
     
-#if H_MV_HLS_8_SYN_39_19
   m_numAddLayerSets              = 0;   
   m_numAddOlss                   = 0; 
-#else
-  m_numAddLayerSets              = -1;   
-#endif
   m_defaultOutputLayerIdc     = 0; 
   
@@ -1902 +1898 @@
   }
 
-#if H_MV_HLS_8_PMS_Q0195_20
   m_repFormatIdxPresentFlag = false; 
-#endif
   m_maxOneActiveRefLayerFlag = false; 
   m_directDepTypeLenMinus2   = 0;         
   
 
-#if H_MV_HLS_8_RPS_Q0100_36
   m_vpsExtensionFlag = true; 
-#endif
-  m_avcBaseLayerFlag = false;
   m_vpsNonVuiExtensionLength = 0;
   m_splittingFlag    = false;
@@ -2032 +2023 @@
   }
 
-
-#if H_MV_HLS_8_PMS_Q0195_20
   //The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
   assert( getVpsNumRepFormatsMinus1() >= 0 ); 
   assert( getVpsNumRepFormatsMinus1() <= 255 ); 
-#endif
 
   return true; 
@@ -2083 +2071 @@
   }
 
-#if H_MV_HLS_8
   for (Int i = 0 ; i < MAX_NUM_LAYER_IDS; i++ )
   {
@@ -2096 +2083 @@
     }
   }
-
 
   for( Int i = 0; i  <=  getMaxLayersMinus1(); i++ )
@@ -2107 +2093 @@
     }
   }
-
 
   for( Int i = 0; i <= getMaxLayersMinus1(); i++ )  // Bug in spec "<" instead of "<=" 
@@ -2149 +2134 @@
     m_numIndependentLayers = k;
   }
-#endif
 }
 
@@ -2314 +2298 @@
 Int    TComVPS::getNumOutputLayerSets() 
 {
-#if H_MV_HLS_8_SYN_39_19
   return getNumAddOlss() + getNumLayerSets(); 
-#else
-  return getNumAddLayerSets() + getVpsNumLayerSetsMinus1() + 1; 
-#endif
 }
 
@@ -2384 +2364 @@
     }
   }  
-#if H_MV_HLS_8_PMS_Q0165_18
   assert( getNumOutputLayersInOutputLayerSet( i ) > 0 ); 
-#endif
 }
 
@@ -2420 +2398 @@
 {
   Int maxSLMinus1 = 0; 
-#if H_MV_HLS_8_MIS_Q0102_30
   for( Int k = 0; k < getNumLayersInIdList( i ); k++ )
   {
     Int lId = m_layerSetLayerIdList[i][k];
-#else  
-  Int optLsIdx    = olsIdxToLsIdx( i );
-
-  for( Int k = 0; k < getNumLayersInIdList( optLsIdx ); k++ )
-  {
-    Int lId = m_layerSetLayerIdList[optLsIdx][k];
-#endif
     maxSLMinus1 = std::max( maxSLMinus1, getSubLayersVpsMaxMinus1( getLayerIdInVps( lId ) ));
   }
   return maxSLMinus1;
 }
-#if H_MV_HLS_8_RPS_Q0100_36
+
 Void TComVPS::inferDbpSizeLayerSetZero( TComSPS* sps, Bool encoder )
 {
@@ -2458 +2428 @@
   }
 }
-#endif
+
+Bool TComVPS::getAltOutputLayerFlagVar( Int i )
+{
+  // Semantics variable not syntax element !
+
+  Bool altOptLayerFlag = false;     
+  if ( i > 0 && getNumOutputLayersInOutputLayerSet( i ) == 1 && 
+    getNumDirectRefLayers( getOlsHighestOutputLayerId( i ) ) > 0 )
+  {
+    altOptLayerFlag = getAltOutputLayerFlag( i ); 
+  }
+  return altOptLayerFlag;
+}
+
+Int TComVPS::getMaxNumPics( Int layerId )
+{
+  Int maxNumPics = MAX_INT; 
+  for( Int olsIdx = 0; olsIdx < getNumOutputLayerSets(); olsIdx++)
+  {
+    Int lsIdx = olsIdxToLsIdx( olsIdx ); 
+    for( Int j = 0; j < getNumLayersInIdList( lsIdx ); j++ )
+    {
+      if( getLayerSetLayerIdList(lsIdx, j ) ==  layerId )
+      {
+        Int maxSL = getMaxSubLayersInLayerSetMinus1( lsIdx ); 
+        maxNumPics = std::min( maxNumPics, getDpbSize()->getMaxVpsDecPicBufferingMinus1( olsIdx , j,  maxSL ) );
+      }
+    }
+  }
+  assert( maxNumPics != MAX_INT ); 
+  return maxNumPics;
+}
+
+Void TComVPS::xSetRefLayerFlags( Int currLayerId )
+{
+  for( Int j = 0; j < getNumDirectRefLayers( currLayerId ); j++ )
+  {
+    Int refLayerId = m_refLayerId[ currLayerId ][ j ];
+    m_recursiveRefLayerFlag[ currLayerId ][ refLayerId ] = 1;
+    for( Int k = 0; k < MAX_NUM_LAYER_IDS; k++ )
+    {
+      m_recursiveRefLayerFlag[ currLayerId ][ k ] = m_recursiveRefLayerFlag[ currLayerId ][ k ]  ||  m_recursiveRefLayerFlag[ refLayerId ][ k ];
+    }
+  }
+}
+
 #endif // H_MV
 
@@ -2530 +2545 @@
   ::memset(m_usedByCurrPicLtSPSFlag, 0, sizeof(m_usedByCurrPicLtSPSFlag));
 #if H_MV
-#if !H_MV_HLS_8_SPS_NODOC_48
-  m_spsExtensionPresentFlag = false; 
-  for( Int i = 0; i < PS_EX_T_MAX_NUM; i++ ) 
-  {
-    m_spsExtensionTypeFlag[ i ] = false;
-  }
-#else 
   m_spsRangeExtensionsFlag     = false;
   m_spsMultilayerExtensionFlag = false;
@@ -2544 +2552 @@
 #else
   m_spsExtension6bits          = 0;
-#endif
 #endif
 
@@ -2726 +2733 @@
 
 #if H_MV
-#if H_MV_HLS_8_SPS_NODOC_48
   m_ppsRangeExtensionsFlag     = false;
   m_ppsMultilayerExtensionFlag = false;
@@ -2734 +2740 @@
   m_pps3dExtensionFlag         = false;
   m_ppsExtension5bits          = 0;
-#endif
-#else
-  for( Int i = 0; i < PS_EX_T_MAX_NUM; i++ ) 
-  {
-    m_ppsExtensionTypeFlag[ i ] = false;
-  }
 #endif
 #endif
@@ -2984 +2984 @@
   }
 }
+
+Void TComSPS::inferSpsMaxDecPicBufferingMinus1( TComVPS* vps, Int targetOptLayerSetIdx, Int currLayerId, Bool encoder )
+{
+  const std::vector<Int>& targetDecLayerIdList = vps->getTargetDecLayerIdList( vps->olsIdxToLsIdx( targetOptLayerSetIdx )); 
+
+  if (getLayerId() > 0 )
+  {
+    Int layerIdx = 0;         
+    while (layerIdx < (Int) targetDecLayerIdList.size() )
+    {
+      if ( targetDecLayerIdList[layerIdx] == currLayerId )
+      { 
+        break; 
+      }
+      layerIdx++; 
+    }
+
+    assert( layerIdx < (Int) targetDecLayerIdList.size() ); 
+
+    for (Int i = 0; i <= getSpsMaxSubLayersMinus1(); i++ ) 
+    {
+      Int maxDecPicBufferingMinus1 = vps->getDpbSize()->getMaxVpsDecPicBufferingMinus1( targetOptLayerSetIdx, layerIdx, i ) ; 
+
+      if ( encoder )
+      {
+        assert( getMaxDecPicBuffering( i ) - 1 == maxDecPicBufferingMinus1 ); 
+      }
+      else
+      {
+        setMaxDecPicBuffering(i, maxDecPicBufferingMinus1 + 1 ); 
+      }
+    }
+  }
+}
+
+Void TComSPS::checkRpsMaxNumPics( TComVPS* vps, Int currLayerId )
+{
+  // In spec, when rps is in SPS, nuh_layer_id of SPS is used instead 
+  // of nuh_layer_id of slice (currLayerId), this seems to be a bug.
+
+  for (Int i = 0; i < getRPSList()->getNumberOfReferencePictureSets(); i++ )
+  {
+    TComReferencePictureSet* rps = getRPSList()->getReferencePictureSet( i ); 
+    if ( !rps->getInterRPSPrediction() )
+    {
+      rps->checkMaxNumPics( vps->getVpsExtensionFlag(), vps->getMaxNumPics( currLayerId ), 
+        getLayerId(), getMaxDecPicBuffering( getSpsMaxSubLayersMinus1() ) - 1 );  
+    }
+  }
+}
+
 #endif
 
@@ -3133 +3184 @@
   printf("}\n");
 }
+#if H_MV
+Void TComReferencePictureSet::checkMaxNumPics( Bool vpsExtensionFlag, Int maxNumPics, Int nuhLayerId, Int spsMaxDecPicBufferingMinus1 )
+{
+  assert( getNumberOfPictures() >= 0 ); 
+  if ( nuhLayerId == 0 )
+  {
+    assert( getNumberOfPictures() <= spsMaxDecPicBufferingMinus1 ); 
+  }
+
+  if ( vpsExtensionFlag )
+  {
+    assert( getNumberOfPictures() <= maxNumPics );
+  }
+}
+#endif
 
 TComRPSList::TComRPSList()
@@ -3279 +3345 @@
 }
 
-#if !H_MV_HLS_8_DBP_NODOC_42
-Void TComSlice::markIvRefPicsAsUnused( TComPicLists* ivPicLists, std::vector<Int> targetDecLayerIdSet, TComVPS* vps, Int curLayerId, Int curPoc )
-{
-  // Fill targetDecLayerIdSet with all layers if empty (at encoder side) 
-  if (targetDecLayerIdSet.size() == 0 )    
-  {
-    for ( Int layerIdInVps = 0; layerIdInVps <= vps->getMaxLayersMinus1(); layerIdInVps++ )
-    {
-      targetDecLayerIdSet.push_back( vps->getLayerIdInNuh( layerIdInVps ) ); 
-    }
-  }     
-
-  Int numTargetDecLayers = (Int) targetDecLayerIdSet.size(); 
-  Int latestDecIdx; 
-  for ( latestDecIdx = 0; latestDecIdx < numTargetDecLayers; latestDecIdx++)
-  {
-    if ( targetDecLayerIdSet[ latestDecIdx ] == curLayerId )
-    {
-      break; 
-    }        
-  }        
-
-  for( Int i = 0; i <= latestDecIdx; i++ ) 
-  {
-    if ( vps->nuhLayerIdIncluded( targetDecLayerIdSet[ i ] ) )
-    {
-      TComPic* pcPic = ivPicLists->getPic( targetDecLayerIdSet[ i ], curPoc ); 
-      if ( pcPic )
-      {
-        if( pcPic->getSlice(0)->isReferenced() && pcPic->getSlice(0)->getTemporalLayerNonReferenceFlag() ) 
-        { 
-          Bool remainingInterLayerReferencesFlag = false; 
-          for( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ )
-          { 
-            TComVPS* vpsSlice = pcPic->getSlice(0)->getVPS(); 
-            if ( vps->nuhLayerIdIncluded( targetDecLayerIdSet[ j ] ) )
-            {
-              for( Int k = 0; k < vpsSlice->getNumDirectRefLayers( targetDecLayerIdSet[ j ] ); k++ )
-              {
-                if ( targetDecLayerIdSet[ i ] == vpsSlice->getRefLayerId( targetDecLayerIdSet[ j ],  k  ) )
-                {
-                  remainingInterLayerReferencesFlag = true;
-                }
-              }
-            }
-          }
-          if( !remainingInterLayerReferencesFlag )
-          {
-            pcPic->getSlice(0)->setReferenced( false );                   
-          }
-        }
-      }
-    }
-  }
-}
-#endif
 Void TComSlice::printRefPicList()
 {  
@@ -3351 +3361 @@
 Void TComSlice::markCurrPic( TComPic* currPic )
 {
-
-#if !H_MV_HLS_8_DBP_NODOC_42
-  if ( !currPic->getSlice(0)->getDiscardableFlag() )
-  {
-#endif
-    currPic->getSlice(0)->setReferenced( true ) ; 
-    currPic->setIsLongTerm( false ); 
-#if !H_MV_HLS_8_DBP_NODOC_42
-  }
-  else
-  {
-    currPic->getSlice(0)->setReferenced( false ) ; 
-  }
-#endif
-
-#if H_MV_HLS_7_VPS_P0300_27
+  currPic->getSlice(0)->setReferenced( true ) ; 
+  currPic->setIsLongTerm( false ); 
+
   currPic->setReconMark( true );
   currPic->setPicOutputFlag( currPic->getSlice(0)->getPicOutputFlag() );
-#endif
 }
 
@@ -3403 +3399 @@
   Int refLayerIdx = vps->getLayerIdInVps( vps->getRefLayerId( getLayerId(), i ) ); 
 
-#if H_MV_HLS_8_RPS_Q0060_17
   Bool refLayerPicFlag = ( vps->getSubLayersVpsMaxMinus1( refLayerIdx ) >=  getTLayer() )  && ( getTLayer() == 0  ) &&
     ( vps->getMaxTidIlRefPicsPlus1( refLayerIdx, vps->getLayerIdInVps( getLayerId() )) > getTLayer() ); 
-#else
-  Bool refLayerPicFlag = ( vps->getSubLayersVpsMaxMinus1( refLayerIdx ) >=  getTLayer() )  && 
-    ( vps->getMaxTidIlRefPicsPlus1( refLayerIdx, vps->getLayerIdInVps( getLayerId() )) > getTLayer() ); 
-#endif
 
   return refLayerPicFlag;       
@@ -3541 +3532 @@
 #endif
 #if H_3D_IC
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
 Void TComSlice::xSetApplyIC(Bool bUseLowLatencyICEnc)
-#else
-Void TComSlice::xSetApplyIC()
-#endif
-{
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
+{
   if(bUseLowLatencyICEnc)
   {
@@ -3592 +3578 @@
         Double ratio=Double(g_aICEnableNUM[refLayer])/Double(g_aICEnableCANDIDATE[refLayer]);
 
-        if( ratio > MTK_LOW_LATENCY_IC_ENCODING_THRESHOLD_H0086)
+        if( ratio > IC_LOW_LATENCY_ENCODING_THRESHOLD)
 {
           m_bApplyIC=true;
@@ -3608 +3594 @@
   else
   {
-#endif
   Int iMaxPelValue = ( 1 << g_bitDepthY ); 
   Int *aiRefOrgHist;
@@ -3682 +3667 @@
   aiCurrHist = NULL;
   aiRefOrgHist = NULL;
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086
   }//if(bUseLowLatencyICEnc)
-#endif
 }
 #endif
@@ -3774 +3757 @@
 
 #if H_3D_DDD
-    InitializeDDDPara( vps->getCamParPrecision(), codScale[ i ], codOffset[ i ], i );
+    initializeDDDPara( vps->getCamParPrecision(), codScale[ i ], codOffset[ i ], i );
 #endif
   }
@@ -3782 +3765 @@
 
 #if H_3D_DDD
-Void TComSlice::InitializeDDDPara( UInt uiCamParsCodedPrecision, Int  iCodedScale,Int  iCodedOffset, Int iBaseViewIdx )
+Void TComSlice::initializeDDDPara( UInt uiCamParsCodedPrecision, Int  iCodedScale,Int  iCodedOffset, Int iBaseViewIdx )
 {
     UInt uiViewId     = getViewIndex();
@@ -3839 +3822 @@
 
     return;
+}
+
+
+#endif
+
+#if H_MV
+Void TComSlice::checkCrossLayerBlaFlag()
+{
+  // cross_layer_bla_flag shall be equal to 0 for pictures with nal_unit_type not equal to IDR_W_RADL or IDR_N_LP or with nuh_layer_id not equal to 0.
+  if ( getLayerId() != 0 || getNalUnitType() != NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
+  {
+    assert( m_crossLayerBlaFlag == 0 ); 
+  }
+}
+
+Bool TComSlice::inferPocMsbValPresentFlag()
+{
+  Bool pocMsbValPresentFlag; 
+  if( getSliceSegmentHeaderExtensionLength() == 0 ) 
+  {
+    pocMsbValPresentFlag = false; 
+  }
+  else if ( getPocMsbValRequiredFlag() )
+  {
+    pocMsbValPresentFlag = true; 
+  }
+  else
+  {
+    pocMsbValPresentFlag = false; 
+  }
+
+  return pocMsbValPresentFlag;
+}
+
+
+#endif
+
+#if H_3D_DBBP
+Int TComSlice::getDepthFromDV( Int iDV, Int iBaseViewIdx )
+{
+  return ClipY(( iDV * m_aiDDDInvScale[ iBaseViewIdx ] + m_aiDDDInvOffset[ iBaseViewIdx ] ) >> m_aiDDDShift[ iBaseViewIdx ]);
 }
 #endif
@@ -4331 +4355 @@
 }
 
+Void TComVpsVuiBspHrdParameters::checkBspCombHrdAndShedIdx( TComVPS* vps, Int h, Int i, Int j )
+{
+  // bsp_comb_hrd_idx
+  assert( getBspCombSchedIdx(h, i, j ) >= 0 );
+  assert( getBspCombSchedIdx(h, i, j ) <= getVpsNumBspHrdParametersMinus1() );
+
+  // bsp_comb_sched_idx
+  assert( getBspCombSchedIdx(h, i, j ) >= 0 );
+
+  //* This check needs to activated,  when HighestTid is available here    
+  //  assert(  getBspCombSchedIdx(h, i, j ) <= vps->getHrdParameters( getBspCombHrdIdx( h, i, j ) )->getCpbCntMinus1( highestTid ) );
+}
+
 Void TComVUI::inferVideoSignalInfo( TComVPS* vps, Int layerIdCurr )
 {
@@ -4370 +4407 @@
   }
 }
-#endif
+
+Void Window::scaleOffsets( Int scal )
+{
+  if (! m_scaledFlag )
+  {
+    m_scaledFlag         = true; 
+    m_winLeftOffset     *= scal; 
+    m_winRightOffset    *= scal; 
+    m_winTopOffset      *= scal; 
+    m_winBottomOffset   *= scal; 
+  }
+}
+#endif
+