Changeset 882 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibEncoder


Ignore:
Timestamp:
28 Mar 2014, 01:17:13 (11 years ago)
Author:
tech
Message:

Cleanups part 7.

Location:
branches/HTM-10.1-dev0/source/Lib/TLibEncoder
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/NALwrite.cpp

    r872 r882  
    9191  vector<uint8_t>& rbsp   = nalu.m_Bitstream.getFIFO();
    9292
    93 #if H_MV_HLS_7_MISC_P0130_EOS  // This will handle situation when writing NAL with zero payload
     93#if H_MV  // This will handle situation when writing NAL with zero payload
    9494  if (rbsp.size() == 0) return;
    9595#endif

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/SEIwrite.cpp

    r872 r882  
    9393    fprintf( g_hTrace, "=========== Scalable Nesting SEI message ===========\n");
    9494    break;
    95 #if H_MV_HLS_7_SEI_P0204_26
     95#if H_MV
    9696    case SEI::SUB_BITSTREAM_PROPERTY:
    9797    fprintf( g_hTrace, "=========== Sub-bitstream property SEI message ===========\n");
    … …  
    151151    xWriteSEIScalableNesting(bs, *static_cast<const SEIScalableNesting*>(&sei), sps);
    152152    break;
    153 #if H_MV_HLS_7_SEI_P0204_26
     153#if H_MV
    154154   case SEI::SUB_BITSTREAM_PROPERTY:
    155155   xWriteSEISubBitstreamProperty(*static_cast<const SEISubBitstreamProperty*>(&sei));
    … …  
    589589}
    590590
    591 #if H_MV_HLS_7_SEI_P0204_26
     591#if H_MV
    592592Void SEIWriter::xWriteSEISubBitstreamProperty(const SEISubBitstreamProperty &sei)
    593593{

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/SEIwrite.h

    r872 r882  
    6666  Void xWriteSEISOPDescription(const SEISOPDescription& sei);
    6767  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComSPS *sps);
    68 #if H_MV_HLS_7_SEI_P0204_26
     68#if H_MV
    6969  Void xWriteSEISubBitstreamProperty(const SEISubBitstreamProperty &sei);
    7070#endif

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r877 r882  
    272272  WRITE_FLAG( pcPPS->getSliceHeaderExtensionPresentFlag() ? 1 : 0, "slice_segment_header_extension_present_flag");
    273273
    274 #if H_MV_HLS_7_GEN_P0166_PPS_EXTENSION
    275274#if !H_MV
    276275  WRITE_FLAG( 0, "pps_extension_flag" );
    … …  
    290289  if( pcPPS->getPpsExtensionTypeFlag( PPS_EX_T_MV ) )
    291290  {
    292 #if H_MV_HLS_7_POC_P0041
    293291    WRITE_FLAG( pcPPS->getPocResetInfoPresentFlag( ) ? 1 : 0 , "poc_reset_info_present_flag" );
    294 #endif
    295292  }
    296293
    … …  
    303300
    304301#endif
    305 #else
    306 #if !H_3D
    307   WRITE_FLAG( 0, "pps_extension_flag" );
    308 #else
    309   WRITE_FLAG( 1, "pps_extension_flag" );
    310   codePPSExtension( pcPPS );
    311   WRITE_FLAG( 0, "pps_extension2_flag" );
    312 #endif
    313 #endif
     302
    314303}
    315304
    … …  
    725714#endif
    726715  WRITE_UVLC( pcSPS->getBitsForPOC()-4,                 "log2_max_pic_order_cnt_lsb_minus4" );
    727 #if H_MV_HLS_7_SPS_P0155_16_32
     716#if H_MV
    728717  if ( pcSPS->getLayerId() == 0 )
    729718  { 
    … …  
    741730    }
    742731  }
    743 #if H_MV_HLS_7_SPS_P0155_16_32
     732#if H_MV
    744733  }
    745734#endif
    … …  
    871860    WRITE_SVLC( pcSPS->getScaledRefLayerRightOffset( j ), "scaled_ref_layer_right_offset" );
    872861    WRITE_SVLC( pcSPS->getScaledRefLayerBottomOffset( j ), "scaled_ref_layer_bottom_offset" );
    873 #if H_MV_HLS_7_RESERVED_FLAGS
    874862    WRITE_FLAG( 0, "sps_multilayer_ext_reserved_zero_flag[ j ]" );
    875 #endif
    876863  }
    877864}
    … …  
    904891  WRITE_FLAG( pcVPS->getTemporalNestingFlag(),                "vps_temporal_id_nesting_flag" );
    905892  assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
    906 #if H_MV_HLS_7_VPS_P0125_24
    907893  WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
    908 #else
    909 #if H_MV && !H_MV_HLS7_GEN
    910   WRITE_CODE( 0xffff,                              16,        "vps_extension_offset" );
    911 #else
    912   WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
    913 #endif
    914 #endif
    915894  codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 );
    916895  const Bool subLayerOrderingInfoPresentFlag = 1;
    … …  
    1010989{
    1011990  WRITE_FLAG( pcVPS->getAvcBaseLayerFlag() ? 1 : 0,          "avc_base_layer_flag" );
    1012 #if !H_MV_HLS_7_VPS_P0307_23
    1013   WRITE_FLAG( pcVPS->getVpsVuiPresentFlag() ? 1 : 0 , "vps_vui_present_flag" );
    1014   if ( pcVPS->getVpsVuiPresentFlag() )
    1015   { 
    1016   WRITE_CODE( pcVPS->getVpsVuiOffset( ), 16,                 "vps_vui_offset" );  // TBD
    1017   }
    1018 #endif
    1019 
    1020991  WRITE_FLAG( pcVPS->getSplittingFlag() ? 1 : 0,             "splitting_flag" );
    1021  
     992
    1022993  for( Int type = 0; type < MAX_NUM_SCALABILITY_TYPES; type++ )
    1023994  {
    … …  
    10421013    {     
    10431014      WRITE_CODE( pcVPS->getLayerIdInNuh( i ), 6,          "layer_id_in_nuh[i]");
    1044   }
     1015    }
    10451016    else
    10461017    {
    10471018      assert( pcVPS->getLayerIdInNuh( i ) == i );
    1048   }
     1019    }
    10491020
    10501021    assert(  pcVPS->getLayerIdInVps( pcVPS->getLayerIdInNuh( i ) ) == i );
    … …  
    10641035
    10651036
    1066     WRITE_CODE( pcVPS->getViewIdLen( ), 4, "view_id_len" );
    1067    
    1068     if ( pcVPS->getViewIdLen( ) > 0 )
    1069     {   
    1070       for( Int i = 0; i < pcVPS->getNumViews(); i++ )
    1071       {
    1072         WRITE_CODE( pcVPS->getViewIdVal( i ), pcVPS->getViewIdLen( ), "view_id_val[i]" );
    1073       }
    1074     }
    1075     else
    1076     {
    1077       for( Int i = 0; i < pcVPS->getNumViews(); i++ )
    1078       {
    1079         assert( pcVPS->getViewIdVal( i ) == 0 );
    1080       }
    1081     }
     1037  WRITE_CODE( pcVPS->getViewIdLen( ), 4, "view_id_len" );
     1038
     1039  if ( pcVPS->getViewIdLen( ) > 0 )
     1040  {   
     1041    for( Int i = 0; i < pcVPS->getNumViews(); i++ )
     1042    {
     1043      WRITE_CODE( pcVPS->getViewIdVal( i ), pcVPS->getViewIdLen( ), "view_id_val[i]" );
     1044    }
     1045  }
     1046  else
     1047  {
     1048    for( Int i = 0; i < pcVPS->getNumViews(); i++ )
     1049    {
     1050      assert( pcVPS->getViewIdVal( i ) == 0 );
     1051    }
     1052  }
    10821053
    10831054
    … …  
    11221093
    11231094  WRITE_FLAG( pcVPS->getAllRefLayersActiveFlag( ) ? 1 : 0 , "all_ref_layers_active_flag" );
    1124 #if !H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    1125   WRITE_CODE( pcVPS->getVpsNumberLayerSetsMinus1( )    , 10,    "vps_number_layer_sets_minus1"      );
    1126 #endif
    1127 
    1128 #if !H_MV_HLS_7_VPS_P0306_22
    1129   WRITE_CODE( pcVPS->getVpsNumProfileTierLevelMinus1( ), 6,     "vps_num_profile_tier_level_minus1" );
    1130 #else
    11311095  WRITE_UVLC( pcVPS->getVpsNumProfileTierLevelMinus1( ), "vps_num_profile_tier_level_minus1" );
    1132 #endif
    11331096
    11341097  for( Int i = 1; i <= pcVPS->getVpsNumProfileTierLevelMinus1(); i++ )
    11351098  {
    11361099    WRITE_FLAG( pcVPS->getVpsProfilePresentFlag( i ) ? 1 : 0, "vps_profile_present_flag[i]" );
    1137 #if !H_MV_HLS_7_VPS_P0048_14
    1138     if( !pcVPS->getVpsProfilePresentFlag( i ) )
    1139     {   
    1140       WRITE_CODE( pcVPS->getProfileRefMinus1( i ), 6, "profile_ref_minus1[i]" );
    1141       pcVPS->checkProfileRefMinus1( i );     
    1142     }
    1143 #endif
    11441100    codePTL( pcVPS->getPTL( i ), pcVPS->getVpsProfilePresentFlag( i ), pcVPS->getMaxTLayers() - 1 );
    11451101  }
    11461102
    1147 
    1148 
    1149 
    1150 
    1151 
    1152 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    11531103  WRITE_UVLC( pcVPS->getNumAddOutputLayerSets( ), "num_add_output_layer_sets" );
    11541104
    … …  
    11571107    WRITE_CODE( pcVPS->getDefaultTargetOutputLayerIdc( ), 2, "default_target_output_layer_idc" );
    11581108  } 
    1159 #else
    1160   Int numOutputLayerSets = pcVPS->getVpsNumberLayerSetsMinus1( ) + 1;
    1161 
    1162   WRITE_FLAG( pcVPS->getMoreOutputLayerSetsThanDefaultFlag( ) ? 1 : 0, "more_output_layer_sets_than_default_flag" );
    1163 
    1164   if ( pcVPS->getMoreOutputLayerSetsThanDefaultFlag( ) )
    1165   {
    1166     WRITE_CODE( pcVPS->getNumAddOutputLayerSetsMinus1( )    , 10,    "num_add_output_layer_sets_minus1"      );
    1167     numOutputLayerSets += ( pcVPS->getNumAddOutputLayerSetsMinus1( ) + 1 );
    1168   }
    1169 
    1170   if( numOutputLayerSets > 1)
    1171   {
    1172     WRITE_CODE( pcVPS->getDefaultOneTargetOutputLayerIdc( ), 2, "default_one_target_output_layer_idc" );
    1173     pcVPS->checkDefaultOneTargetOutputLayerIdc();
    1174   } 
    1175 #endif
     1109
    11761110
    11771111  assert( pcVPS->getOutputLayerFlag(0, 0) == pcVPS->inferOutputLayerFlag( 0, 0 ));
    11781112  assert( pcVPS->getOutputLayerSetIdxMinus1( 0 ) == -1 );
    11791113
    1180 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    1181 
    11821114  for( Int i = 1; i < pcVPS->getNumOutputLayerSets( ); i++ )
    11831115  {
    11841116    if( i > pcVPS->getVpsNumLayerSetsMinus1( ) )   
    1185 #else
    1186   for( Int i = 1; i < numOutputLayerSets; i++ )
    1187   {
    1188     if( i > pcVPS->getVpsNumberLayerSetsMinus1( ) )
    1189 #endif
    11901117    {     
    11911118      WRITE_UVLC( pcVPS->getOutputLayerSetIdxMinus1( i ),      "output_layer_set_idx_minus1[i]" );
    1192 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    11931119    }
    11941120
    … …  
    12081134    }       
    12091135
    1210 #else
    1211       for( Int j = 0; j < pcVPS->getNumLayersInIdList( j ) - 1 ; j++ )
    1212       {
    1213         WRITE_FLAG( pcVPS->getOutputLayerFlag( i, j) ? 1 : 0, "output_layer_flag" );
    1214       }     
    1215     }
    1216     else
    1217     { // These inference rules would also be helpful in spec text
    1218       assert( pcVPS->getOutputLayerSetIdxMinus1(i ) ==  i - 1 );
    1219       for( Int j = 0; j < pcVPS->getNumLayersInIdList( j ) - 1; j++ )
    1220       {             
    1221         assert( pcVPS->getOutputLayerFlag( i , j ) == pcVPS->inferOutputLayerFlag( i, j ));
    1222       }
    1223     }
    1224 #endif
    12251136    if ( pcVPS->getProfileLevelTierIdxLen()  > 0 )
    12261137    {     
    12271138      WRITE_CODE( pcVPS->getProfileLevelTierIdx( i ), pcVPS->getProfileLevelTierIdxLen() ,"profile_level_tier_idx[ i ]" );   
    12281139    }
    1229 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    12301140    if( pcVPS->getNumOutputLayersInOutputLayerSet( i ) == 1 && pcVPS->getNumDirectRefLayers( pcVPS->getOlsHighestOutputLayerId( i ) ) > 0 )
    12311141    {
    … …  
    12331143    }
    12341144  }
    1235 #else
    1236   }
    1237 
    1238   if( pcVPS->getMaxLayersMinus1() > 0 )
    1239   {
    1240     WRITE_FLAG( pcVPS->getAltOutputLayerFlag( ) ? 1 : 0 , "alt_output_layer_flag" );
    1241   }
    1242 #endif
    1243 
    1244 
    1245 
    1246 
    12471145
    12481146  WRITE_FLAG( pcVPS->getRepFormatIdxPresentFlag( ) ? 1 : 0 , "rep_format_idx_present_flag" );
    12491147  if ( pcVPS->getRepFormatIdxPresentFlag() )
    12501148  {
    1251 #if H_MV_HLS_7_VPS_P0306_22
    12521149    WRITE_UVLC( pcVPS->getVpsNumRepFormatsMinus1( ), "vps_num_rep_formats_minus1" );
    1253 #else
    1254     WRITE_CODE( pcVPS->getVpsNumRepFormatsMinus1( ), 4, "vps_num_rep_formats_minus1" );
    1255 #endif
    12561150  }
    12571151
    … …  
    12691163      if( pcVPS->getVpsNumRepFormatsMinus1() > 0 )
    12701164      {
    1271 #if H_MV_HLS_7_VPS_P0306_22
    12721165        WRITE_CODE( pcVPS->getVpsRepFormatIdx(i), pcVPS->getVpsRepFormatIdxLen(), "vps_rep_format_idx[i]" );
    1273 #else
    1274         WRITE_CODE( pcVPS->getVpsRepFormatIdx( i ), 8, "vps_rep_format_idx" );
    1275 #endif
    12761166      }
    12771167    }
    … …  
    12891179    }
    12901180  }
    1291 #if H_MV_HLS_7_RESERVED_FLAGS
    12921181  WRITE_FLAG( 0, "vps_reserved_zero_flag" );
    1293 #endif
    12941182  codeDpbSize( pcVPS );
    12951183
    … …  
    13211209    }
    13221210  } 
    1323 #if H_MV_HLS_7_VPS_P0307_23
    13241211  WRITE_UVLC( 0, "vps_non_vui_extension_length" );
    13251212  WRITE_FLAG( pcVPS->getVpsVuiPresentFlag() ? 1 : 0 , "vps_vui_present_flag" );
    1326 #endif
    1327 #if !H_MV_HLS_7_RESERVED_FLAGS 
    1328     WRITE_FLAG ( 0,                                      "vps_shvc_reserved_zero_flag" );
    1329 #endif
    1330     if( pcVPS->getVpsVuiPresentFlag() )
    1331     {
    1332       m_pcBitIf->writeAlignOne();  // vps_vui_alignment_bit_equal_to_one
    1333       codeVPSVUI( pcVPS );
    1334     }     
    1335 #if H_MV_HLS_7_FIX_INFER_CROSS_LAYER_IRAP_ALIGNED_FLAG
    1336     {
    1337       TComVPSVUI* pcVPSVUI = pcVPS->getVPSVUI( );
    1338       assert( pcVPSVUI );
    1339       pcVPSVUI->inferVpsVui( true );
    1340     }
    1341 #endif
    1342 }
     1213  if( pcVPS->getVpsVuiPresentFlag() )
     1214  {
     1215    m_pcBitIf->writeAlignOne();  // vps_vui_alignment_bit_equal_to_one
     1216    codeVPSVUI( pcVPS );
     1217  }     
     1218  {
     1219    TComVPSVUI* pcVPSVUI = pcVPS->getVPSVUI( );
     1220    assert( pcVPSVUI );
     1221    pcVPSVUI->inferVpsVui( true );
     1222  }
     1223}
     1224
    13431225Void TEncCavlc::codeVideoSignalInfo( TComVideoSignalInfo* pcVideoSignalInfo )
    13441226{
    … …  
    13591241  { 
    13601242    WRITE_FLAG( dpbSize->getSubLayerFlagInfoPresentFlag( i ) ? 1 : 0 , "sub_layer_flag_info_present_flag" );
    1361 #if H_MV_HLS_7_HRD_P0156_7
    13621243    for( Int j = 0; j  <=  vps->getMaxSubLayersInLayerSetMinus1( i ); j++ )
    1363 #else
    1364     for( Int j = 0; j  <=  vps->getMaxTLayers() - 1 ; j++ )
    1365 #endif
    13661244    { 
    13671245      if( j > 0  &&  dpbSize->getSubLayerDpbInfoPresentFlag( i, j )  ) 
    … …  
    13711249      if( dpbSize->getSubLayerDpbInfoPresentFlag( i, j ) )
    13721250      { 
    1373 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    13741251        for( Int k = 0; k < vps->getNumSubDpbs( vps->getLayerSetIdxForOutputLayerSet( i )); k++ )   
    1375 #else
    1376         for( Int k = 0; k < vps->getNumSubDpbs( vps->getOutputLayerSetIdxMinus1( i ) + 1 ); k++ )   // Preliminary fix does not match with spec
    1377 #endif
    13781252        {
    13791253          WRITE_UVLC( dpbSize->getMaxVpsDecPicBufferingMinus1( i, k, j ), "max_vps_dec_pic_buffering_minus1" );
    … …  
    13951269        if ( j > 0 )
    13961270        {
    1397 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    13981271          for( Int k = 0; k < vps->getNumSubDpbs( vps->getLayerSetIdxForOutputLayerSet( i ) ); k++ )   
    1399 #else
    1400           for( Int k = 0; k < vps->getNumSubDpbs( vps->getOutputLayerSetIdxMinus1( i ) + 1 ); k++ )   
    1401 #endif
    14021272          {
    14031273            assert( dpbSize->getMaxVpsDecPicBufferingMinus1( i, k, j ) == dpbSize->getMaxVpsDecPicBufferingMinus1( i,k, j - 1 ) );
    … …  
    14511321    WRITE_FLAG( pcVPSVUI->getCrossLayerIrapAlignedFlag( ) ? 1 : 0 , "cross_layer_irap_aligned_flag" );
    14521322  }
    1453 #if H_MV_HLS_7_MISC_P0068_21
    14541323  if( pcVPSVUI->getCrossLayerIrapAlignedFlag( ) )
    14551324  {
    14561325    WRITE_FLAG( pcVPSVUI->getAllLayersIdrAlignedFlag( ) ? 1 : 0 , "all_layers_idr_aligned_flag" );
    14571326  }
    1458 #endif
    14591327  WRITE_FLAG( pcVPSVUI->getBitRatePresentVpsFlag( ) ? 1 : 0 , "bit_rate_present_vps_flag" );
    14601328  WRITE_FLAG( pcVPSVUI->getPicRatePresentVpsFlag( ) ? 1 : 0 , "pic_rate_present_vps_flag" );
    14611329  if( pcVPSVUI->getBitRatePresentVpsFlag( )  ||  pcVPSVUI->getPicRatePresentVpsFlag( ) )
    14621330  {
    1463 #if H_MV_HLS_7_OUTPUT_LAYERS_5_10_22_27
    14641331    for( Int i = 0; i  <=  pcVPS->getVpsNumLayerSetsMinus1(); i++ )
    1465 #else
    1466     for( Int i = 0; i  <=  pcVPS->getVpsNumberLayerSetsMinus1(); i++ )
    1467 #endif
    14681332    {
    14691333      for( Int j = 0; j  <=  pcVPS->getMaxTLayers(); j++ )
    … …  
    14911355  }
    14921356
    1493 #if H_MV_HLS_7_VPS_P0076_15
    14941357  WRITE_FLAG( pcVPSVUI->getVideoSignalInfoIdxPresentFlag( ) ? 1 : 0 , "video_signal_info_idx_present_flag" );
    14951358  if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() )
    … …  
    15251388    }
    15261389  }
    1527 #endif
    15281390  WRITE_FLAG( pcVPSVUI->getTilesNotInUseFlag( ) ? 1 : 0 , "tiles_not_in_use_flag" );
    15291391  if( !pcVPSVUI->getTilesNotInUseFlag() )
    … …  
    15601422    }
    15611423  }
    1562 #if H_MV_HLS_7_RESERVED_FLAGS
    15631424  WRITE_CODE( 0, 3, "vps_vui_reserved_zero_3bits" );
    1564 #endif
    15651425  WRITE_FLAG( pcVPSVUI->getIlpRestrictedRefLayersFlag( ) ? 1 : 0 , "ilp_restricted_ref_layers_flag" );
    15661426
    … …  
    15841444  }
    15851445
    1586 #if !H_MV_HLS_7_VPS_P0076_15
    1587   WRITE_FLAG( pcVPSVUI->getVideoSignalInfoIdxPresentFlag( ) ? 1 : 0 , "video_signal_info_idx_present_flag" );
    1588   if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() )
    1589   {
    1590     WRITE_CODE( pcVPSVUI->getVpsNumVideoSignalInfoMinus1( ), 4, "vps_num_video_signal_info_minus1" );
    1591   }
    1592   else
    1593   {
    1594     pcVPSVUI->setVpsNumVideoSignalInfoMinus1( pcVPS->getMaxLayersMinus1() );
    1595   }
    1596 
    1597   for( Int i = 0; i <= pcVPSVUI->getVpsNumVideoSignalInfoMinus1(); i++ )
    1598   {
    1599     assert( pcVPSVUI->getVideoSignalInfo( i ) != NULL );
    1600     TComVideoSignalInfo* curVideoSignalInfo = pcVPSVUI->getVideoSignalInfo( i );
    1601     codeVideoSignalInfo( curVideoSignalInfo );     
    1602   }
    1603 
    1604   if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 )
    1605   {
    1606     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1607     {
    1608       WRITE_CODE( pcVPSVUI->getVpsVideoSignalInfoIdx( i ), 4, "vps_video_signal_info_idx" );
    1609       assert( pcVPSVUI->getVpsVideoSignalInfoIdx( i ) >= 0 && pcVPSVUI->getVpsVideoSignalInfoIdx( i ) <= pcVPSVUI->getVpsNumVideoSignalInfoMinus1() );
    1610     }
    1611 }
    1612   else
    1613   {
    1614     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1615     {
    1616       assert( pcVPSVUI->getVpsVideoSignalInfoIdx( i  ) == ( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() ? 0 : i ) );
    1617     }
    1618   }
    1619 #endif
     1446
    16201447  WRITE_FLAG( pcVPSVUI->getVpsVuiBspHrdPresentFlag( ) ? 1 : 0 , "vps_vui_bsp_hrd_present_flag" );
    16211448  if ( pcVPSVUI->getVpsVuiBspHrdPresentFlag( ) )
    … …  
    16231450    codeVpsVuiBspHrdParameters( pcVPS );
    16241451  }
    1625 #if H_MV_HLS_7_MISC_P0182_13
    16261452  for( Int i = 1; i  <=  pcVPS->getMaxLayersMinus1(); i++ )
    16271453  {
    … …  
    16301456      WRITE_FLAG( pcVPSVUI->getBaseLayerParameterSetCompatibilityFlag( i ) ? 1 : 0 , "base_layer_parameter_set_compatibility_flag" );
    16311457    }
    1632 }
    1633 #endif
     1458  }
    16341459}
    16351460
    … …  
    22252050#endif
    22262051
    2227 #if !H_MV_HLS_7_POC_P0041
    2228 #if PPS_FIX_DEPTH
    2229   if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag() || pcSlice->getIsDepth() )
    2230 #else
    2231   if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
    2232 #endif
    2233   {
    2234     WRITE_UVLC(0,"slice_header_extension_length");
    2235   }
    2236 #endif
    2237 
    2238 #if H_MV_HLS_7_POC_P0041
     2052
    22392053#if !H_MV
    22402054  if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
    … …  
    23442158  }
    23452159#endif
    2346 #endif
    23472160}
    23482161

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCfg.h

    r876 r882  
    347347
    348348  Bool      m_useStrongIntraSmoothing;                        ///< enable the use of strong intra smoothing (bi_linear interpolation) for 32x32 blocks when reference samples are flat.
    349 #if H_MV_HLS_7_SEI_P0204_26
     349#if H_MV
    350350  Bool              m_subBistreamPropSEIEnabled;
    351351  Int               m_numAdditionalSubStreams;
    … …  
    785785  Int   getScalableNestingSEIEnabled()                     { return m_scalableNestingSEIEnabled; }
    786786
    787 #if H_MV_HLS_7_SEI_P0204_26
     787#if H_MV
    788788  Bool   getSubBitstreamPropSEIEnabled()        { return m_subBistreamPropSEIEnabled;}
    789789  Void   setSubBitstreamPropSEIEnabled(Bool x)  { m_subBistreamPropSEIEnabled = x;}

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r881 r882  
    17941794    memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS_MEM*sizeof(Int) );
    17951795    rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to LCU level
    1796 #if !UPDATE_HM13
    1797     rpcTempCU->setCUTransquantBypassSubParts( m_pcEncCfg->getCUTransquantBypassFlagValue(), 0, uhDepth );
    1798 #endif
    17991796    rpcTempCU->setARPWSubParts( (UChar)nARPW , 0 , uhDepth );
    18001797#if H_3D_IC
    … …  
    20852082{
    20862083
    2087 #if UPDATE_HM13
    20882084#if H_3D
    20892085  const Bool bTransquantBypassFlag = rpcTempCU->getCUTransquantBypass(0);
    2090 #endif
    20912086#endif
    20922087#if  H_3D_FAST_TEXTURE_ENCODING
    … …  
    21092104    if( bFirstTime == false && rpcTempCU->getSlice()->getVPS()->getUseAdvRP( iLayerId ) )
    21102105    {
    2111 #if UPDATE_HM13
    21122106      rpcTempCU->initEstData( rpcTempCU->getDepth(0), rpcTempCU->getQP(0),bTransquantBypassFlag );     
    2113 #else
    2114       rpcTempCU->initEstData( rpcTempCU->getDepth(0), rpcTempCU->getQP(0) );
    2115 #endif
    21162107    }
    21172108#endif
    … …  
    22222213      {
    22232214        Int orgQP = rpcBestCU->getQP( 0 );
    2224 #if UPDATE_HM13
    22252215        rpcTempCU->initEstData( uhDepth, orgQP ,bTransquantBypassFlag );     
    2226 #else
    2227         rpcTempCU->initEstData( uhDepth, orgQP );
    2228 #endif
    22292216        rpcTempCU->copyPartFrom( rpcBestCU, 0, uhDepth );
    22302217      }

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r872 r882  
    296296}
    297297
    298 #if H_MV_HLS_7_SEI_P0204_26
     298#if H_MV
    299299SEISubBitstreamProperty *TEncGOP::xCreateSEISubBitstreamProperty( TComSPS *sps)
    300300{
    … …  
    365365    delete sei;
    366366  }
    367 #if H_MV_HLS_7_SEI_P0204_26
     367#if H_MV
    368368  if( m_pcCfg->getSubBitstreamPropSEIEnabled() )
    369369  {

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncGOP.h

    r872 r882  
    212212
    213213  SEIToneMappingInfo*     xCreateSEIToneMappingInfo();
    214 #if H_MV_HLS_7_SEI_P0204_26
     214#if H_MV
    215215  SEISubBitstreamProperty *xCreateSEISubBitstreamProperty( TComSPS *sps);
    216216#endif

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r881 r882  
    46014601        }
    46024602        else
    4603 #if H_3D_FIX_G0148_BRACE
    46044603          {
    4605 #endif
    46064604#endif
    46074605          pcCU->setInterDirSubParts  ( uiMRGInterDir, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
    46084606            pcCU->getCUMvField( REF_PIC_LIST_0 )->setAllMvField( cMRGMvField[0], ePartSize, uiPartAddr, 0, iPartIdx );
    46094607            pcCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMRGMvField[1], ePartSize, uiPartAddr, 0, iPartIdx );
    4610 #if H_3D_FIX_G0148_BRACE
     4608#if H_3D
    46114609          }
    46124610#endif

  • branches/HTM-10.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

    r872 r882  
    667667  m_cSPS.setSPSId( getLayerIdInVps() );
    668668  m_cSPS.setLayerId( getLayerId() );
    669 #endif
    670 #if H_MV_HLS_7_VPS_P0048_14
    671669 // Code below needs to be moved to VPS
    672670#endif
    … …  
    832830  m_cPPS.setSPSId( getLayerIdInVps() );
    833831
    834 #if H_MV_HLS_7_GEN_P0166_PPS_EXTENSION
    835 #if H_MV 
    836832  m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_MV ,true );
    837833#if H_3D
    838834  m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_3D ,true );
    839 #endif
    840 #endif
    841835#endif
    842836#endif
Note: See TracChangeset for help on using the changeset viewer.