Changeset 1344 in 3DVCSoftware for branches/HTM-15.1-dev0-Disney/source


Ignore:
Timestamp:
5 Oct 2015, 20:05:53 (10 years ago)
Author:
tech
Message:

Minor fixes to SEI messages.

Location:
branches/HTM-15.1-dev0-Disney/source/Lib
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.1-dev0-Disney/source/Lib/TAppCommon/program_options_lite.h

    r1339 r1344  
    488488    template<>
    489489    inline void
     490      Option< StringAry1d  >::parse(const std::string& arg, const std::vector<int>& idcs, ErrorReporter& err )
     491    {
     492
     493      opt_storage[ idcs[ 0 ] ] = arg;
     494    };
     495
     496    template<>
     497    inline void
     498      Option< StringAry2d  >::parse(const std::string& arg, const std::vector<int>& idcs, ErrorReporter& err )
     499    {
     500
     501      opt_storage[idcs[0]][idcs[1]] = arg;
     502    };
     503
     504
     505    template<>
     506    inline void
    490507      Option< std::vector< char*>  >::parse(const std::string& arg, const std::vector<int>& idcs, ErrorReporter& err )
    491508    {
    … …  
    643660        return *this;
    644661      }
     662
    645663      template<typename T>
    646664      OptionSpecific&

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.cpp

    r1343 r1344  
    371371  po::ErrorReporter err;
    372372  po::parseConfigFile( opts, cfgFile, err );
    373   m_lnpSeiMaxLayers = m_layerNotPresentFlag.size();
     373  m_lnpSeiMaxLayers = (UInt) m_layerNotPresentFlag.size();
    374374};
    375375
    … …  
    382382//  // TBD: Add constraints on presence of SEI here.
    383383    xCheckCfg     ( wrongConfig, m_lnpSeiActiveVpsId == vps->getVPSId(), "The value of lnp_sei_active_vps_id shall be equal to the value of vps_video_parameter_set_id of the active VPS for the VCL NAL units of the access unit containing the SEI message." );
     384    xCheckCfg     ( wrongConfig, m_lnpSeiMaxLayers == vps->getMaxLayersMinus1(), "The number of LayerNotPresent flags shall be equal to vpsMaxLayersMinus1." );
    384385
    385386
    … …  
    753754  {
    754755    sprintf(cstr, "LanguageTag%02d", i);
    755     m_overlayLanguage[i] = std::string(cstr);
     756    //m_overlayLanguage[i] = std::string(cstr);
    756757    sprintf(cstr, "Overlay%02dName", i);
    757     m_overlayName[i] = std::string(cstr);
     758    //m_overlayName[i] = std::string(cstr);
    758759
    759760    m_overlayElementName[i].resize(m_numOverlayElementsMax);
    … …  
    803804    ("OverlayElementLabelMin_%d"      , m_overlayElementLabelMin           , IntAry1d (256,0) ,16            , "OverlayElementLabelMin"           )
    804805    ("OverlayElementLabelMax_%d"      , m_overlayElementLabelMax           , IntAry1d (256,0) ,16            , "OverlayElementLabelMax"           )       
     806    ("OverlayLanguage_%d"             , m_overlayLanguage                  , std::string(""), 16             , "OverlayLanguage"                  )
     807    ("OverlayName_%d"                 , m_overlayName                      , std::string(""), 16             , "OverlayName"                      )
     808    ("OverlayElementName_%d_%d"       , m_overlayElementName               , std::string(""), 256 ,16        , "OverlayElementName"               )
    805809    ("OverlayInfoPersistenceFlag"     , m_overlayInfoPersistenceFlag       , false                           , "OverlayInfoPersistenceFlag"       )
    806810    ;
    … …  
    813817
    814818  // Initialize some values for syntax elements with declaration type st(v) (i.e. string type syntax elements)
    815   initStringElements();
     819  // initStringElements();
    816820};
    817821
    … …  
    14691473
    14701474
    1471 
     1475#if NH_3D
    14721476Void SEIAlternativeDepthInfo::setupFromCfgFile(const Char* cfgFile)
    14731477{
    … …  
    15491553  po::parseConfigFile( opts, cfgFile, err );
    15501554};
    1551 
    1552 
    15531555Bool SEIAlternativeDepthInfo::checkCfg( const TComSlice* slice )
    15541556{
    … …  
    16111613
    16121614};
    1613 
    1614 
    16151615#endif
     1616
     1617#endif

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.h

    r1343 r1344  
    835835  IntAry2d  m_overlayElementLabelMin;
    836836  IntAry2d  m_overlayElementLabelMax; 
    837   std::vector< std::string >  m_overlayLanguage;
    838   std::vector< std::string >  m_overlayName;
    839   std::vector< std::vector< std::string > >  m_overlayElementName;
     837  StringAry1d  m_overlayLanguage;
     838  StringAry1d  m_overlayName;
     839  StringAry2d  m_overlayElementName;
    840840  Bool      m_overlayInfoPersistenceFlag;
    841841};
    … …  
    981981
    982982        }
    983         int m_currLayerID;
     983        Int m_currLayerID;
    984984        BoolAry1d      m_zNearFlag;
    985985        BoolAry1d      m_zFarFlag;
    … …  
    992992        IntAry2d       m_disparityRefViewId;
    993993        IntAry2d       m_depthNonlinearRepresentationNumMinus1;
    994         IntAry2d m_depth_nonlinear_representation_model;
     994        IntAry2d       m_depth_nonlinear_representation_model;
    995995};
    996996#endif
    … …  
    11401140};
    11411141
    1142 
     1142#if NH_3D
    11431143class SEIAlternativeDepthInfo : public SEI
    11441144{
    … …  
    12071207};
    12081208
    1209 
     1209#endif
    12101210#endif
    12111211

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.cpp

    r1321 r1344  
    537537const Bool g_bEncDecTraceEnable  = true;
    538538const Bool g_bEncDecTraceDisable = false;
    539 Bool   g_HLSTraceEnable = false;
     539Bool   g_HLSTraceEnable = true;
    540540Bool   g_bJustDoIt = false;
    541541UInt64 g_nSymbolCounter = 0;
    … …  
    544544Bool g_tracePU = false;
    545545Bool g_traceTU = false;
    546 Bool g_disableNumbering = false;
     546Bool g_disableNumbering = true;
    547547Bool g_disableHLSTrace = false;
    548548UInt64 g_stopAtCounter       = 4660;

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.h

    r1321 r1344  
    153153// Change later
    154154#ifndef ENC_DEC_TRACE
    155 #define ENC_DEC_TRACE 0
     155#define ENC_DEC_TRACE 1
    156156#endif
    157157#endif

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TypeDef.h

    r1339 r1344  
    492492#endif
    493493#if NH_MV                         
     494typedef std::vector< std::string > StringAry1d;
     495typedef std::vector< StringAry1d > StringAry2d;
    494496typedef std::vector< Int >        IntAry1d;
    495497typedef std::vector< IntAry1d >   IntAry2d;

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibDecoder/SEIread.cpp

    r1343 r1344  
    387387      xParseSEIMultiviewViewPosition((SEIMultiviewViewPosition&) *sei, payloadSize, pDecodedMessageOutputStream );
    388388      break;
     389#if NH_3D
    389390    case SEI::ALTERNATIVE_DEPTH_INFO:
    390391      sei = new SEIAlternativeDepthInfo;
    391392      xParseSEIAlternativeDepthInfo((SEIAlternativeDepthInfo&) *sei, payloadSize, pDecodedMessageOutputStream );
    392393      break;
     394#endif
    393395#endif
    394396    default:
    … …  
    14231425    UChar* sval = new UChar[sei.m_numStringBytesMax];
    14241426    UInt slen;   
    1425     sei.m_overlayLanguage.resize( sei.m_numOverlaysMinus1 + 1 );   
    1426     sei.m_overlayName.resize( sei.m_numOverlaysMinus1 + 1 );   
     1427    sei.m_overlayLanguage   .resize( sei.m_numOverlaysMinus1 + 1 );   
     1428    sei.m_overlayName       .resize( sei.m_numOverlaysMinus1 + 1 );   
    14271429    sei.m_overlayElementName.resize( sei.m_numOverlaysMinus1 + 1 );   
    14281430    for( Int i = 0; i  <=  sei.m_numOverlaysMinus1; i++ )
    … …  
    16901692};
    16911693
    1692 
     1694#if NH_3D
    16931695Void SEIReader::xParseSEIAlternativeDepthInfo(SEIAlternativeDepthInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
    16941696{
    … …  
    17991801  }
    18001802};
    1801 
     1803#endif
    18021804
    18031805//! \}

  • branches/HTM-15.1-dev0-Disney/source/Lib/TLibDecoder/SEIread.h

    r1343 r1344  
    129129  Void xParseSEIMultiviewViewPosition         (SEIMultiviewViewPosition& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
    130130#endif
     131#if NH_3D
    131132  Void xParseSEIAlternativeDepthInfo          (SEIAlternativeDepthInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
     133#endif
    132134
    133135  Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const Char *pSymbolName);

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

    r1343 r1344  
    180180     xWriteSEIMultiviewViewPosition(*static_cast<const SEIMultiviewViewPosition*>(&sei));
    181181     break;
     182#if NH_3D
    182183   case SEI::ALTERNATIVE_DEPTH_INFO:
    183184     xWriteSEIAlternativeDepthInfo(*static_cast<const SEIAlternativeDepthInfo*>(&sei));
    184185     break;
     186#endif
    185187#endif
    186188
    … …  
    12011203                if (f<thr)
    12021204                    break;
    1203             }else
     1205            }
     1206            else
    12041207            {
    12051208                s_mantissa[i]=0;
    … …  
    12201223        }
    12211224
    1222     }else
     1225    }
     1226    else
    12231227    {
    12241228        x_mantissa=0;
    … …  
    13071311#endif
    13081312
    1309 
     1313#if NH_3D
    13101314Void SEIWriter::xWriteSEIAlternativeDepthInfo( const SEIAlternativeDepthInfo& sei)
    13111315{
    … …  
    14131417  }
    14141418};
    1415 
     1419#endif
    14161420
    14171421

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

    r1343 r1344  
    107107  Void xWriteSEIMultiviewAcquisitionInfo      ( const SEIMultiviewAcquisitionInfo& sei);
    108108  Void xWriteSEIMultiviewViewPosition         ( const SEIMultiviewViewPosition& sei);
     109#if NH_3D
    109110  Void xWriteSEIAlternativeDepthInfo          ( const SEIAlternativeDepthInfo& sei);
     111#endif
    110112  Void xWriteByteAlign();
    111113};
Note: See TracChangeset for help on using the changeset viewer.