Ignore:
Timestamp:
9 Nov 2015, 21:13:05 (8 years ago)
Author:
tech
Message:

Macro cleanups.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIwrite.cpp

    r1367 r1374  
    125125    break;
    126126#if NH_MV
    127 #if !NH_MV_SEI
    128    case SEI::SUB_BITSTREAM_PROPERTY:
    129    xWriteSEISubBitstreamProperty(*static_cast<const SEISubBitstreamProperty*>(&sei));
    130    break;
    131 #endif
    132 #endif
    133 #if NH_MV_SEI
    134 #if NH_MV_LAYERS_NOT_PRESENT_SEI
    135127   case SEI::LAYERS_NOT_PRESENT:
    136128       xWriteSEILayersNotPresent(*static_cast<const SEILayersNotPresent*>(&sei));
    137129     break;
    138 #endif
    139130   case SEI::INTER_LAYER_CONSTRAINED_TILE_SETS:
    140131     xWriteSEIInterLayerConstrainedTileSets(*static_cast<const SEIInterLayerConstrainedTileSets*>(&sei));
    … …  
    168159     xWriteSEIThreeDimensionalReferenceDisplaysInfo(*static_cast<const SEIThreeDimensionalReferenceDisplaysInfo*>(&sei));
    169160     break;
    170 #if SEI_DRI_F0169
    171161   case SEI::DEPTH_REPRESENTATION_INFO:
    172162       xWriteSEIDepthRepresentationInfo(*static_cast<const SEIDepthRepresentationInfo*>(&sei));
    173163       break;
    174 #endif
    175164   case SEI::MULTIVIEW_SCENE_INFO:
    176165     xWriteSEIMultiviewSceneInfo(*static_cast<const SEIMultiviewSceneInfo*>(&sei));
    … …  
    773762  }
    774763}
    775 #if NH_MV
    776 #if !NH_MV_SEI
    777 Void SEIWriter::xWriteSEISubBitstreamProperty(const SEISubBitstreamProperty &sei)
    778 {
    779   WRITE_CODE( sei.m_activeVpsId, 4, "active_vps_id" );
    780   assert( sei.m_numAdditionalSubStreams >= 1 );
    781   WRITE_UVLC( sei.m_numAdditionalSubStreams - 1, "num_additional_sub_streams_minus1" );
    782 
    783   for( Int i = 0; i < sei.m_numAdditionalSubStreams; i++ )
    784   {
    785     WRITE_CODE( sei.m_subBitstreamMode[i],       2, "sub_bitstream_mode[i]"           );
    786     WRITE_UVLC( sei.m_outputLayerSetIdxToVps[i],    "output_layer_set_idx_to_vps[i]"  );
    787     WRITE_CODE( sei.m_highestSublayerId[i],      3, "highest_sub_layer_id[i]"         );
    788     WRITE_CODE( sei.m_avgBitRate[i],            16, "avg_bit_rate[i]"                 );
    789     WRITE_CODE( sei.m_maxBitRate[i],            16, "max_bit_rate[i]"                 );
    790   }
    791   xWriteByteAlign();
    792 }
    793 #endif
    794 #endif
    795764
    796765Void SEIWriter::xWriteSEIKneeFunctionInfo(const SEIKneeFunctionInfo &sei)
    … …  
    903872
    904873#if NH_MV
    905 #if NH_MV_LAYERS_NOT_PRESENT_SEI
    906874Void SEIWriter::xWriteSEILayersNotPresent(const SEILayersNotPresent& sei)
    907875{
    … …  
    912880  }
    913881};
    914 #endif
    915 
    916 #if NH_MV
     882
    917883Void SEIWriter::xWriteSEIInterLayerConstrainedTileSets( const SEIInterLayerConstrainedTileSets& sei)
    918884{
    … …  
    948914  }
    949915};
    950 #endif
    951916
    952917#if NH_MV_SEI_TBD
    … …  
    11351100};
    11361101
    1137 #if SEI_DRI_F0169
    11381102Void SEIWriter::xWriteSEIDepthRepresentationInfo( const SEIDepthRepresentationInfo& sei)
    11391103{
    … …  
    12621226
    12631227};
    1264 #endif
     1228
    12651229Void SEIWriter::xWriteSEIMultiviewSceneInfo( const SEIMultiviewSceneInfo& sei)
    12661230{
    … …  
    13221286};
    13231287
    1324 
    1325 #if NH_MV_SEI
    13261288Void SEIWriter::xWriteSEIMultiviewViewPosition( const SEIMultiviewViewPosition& sei)
    13271289{
    … …  
    13321294  }
    13331295};
    1334 #endif
    13351296
    13361297#if NH_3D
Note: See TracChangeset for help on using the changeset viewer.