Commit fa2603dc authored by François Cartegnie's avatar François Cartegnie 🤞
Browse files

demux: dash: remove unused SegmentInfoDefault

parent 6b5ea562
......@@ -293,8 +293,6 @@ libdash_plugin_la_SOURCES = \
demux/dash/mpd/SegmentInfo.h \
demux/dash/mpd/SegmentInfoCommon.cpp \
demux/dash/mpd/SegmentInfoCommon.h \
demux/dash/mpd/SegmentInfoDefault.cpp \
demux/dash/mpd/SegmentInfoDefault.h \
demux/dash/mpd/SegmentInformation.cpp \
demux/dash/mpd/SegmentInformation.hpp \
demux/dash/mpd/SegmentList.cpp \
......
......@@ -32,7 +32,6 @@
#include <vlc_arrays.h>
#include "SegmentTemplate.h"
#include "SegmentInfoDefault.h"
#include "Period.h"
using namespace dash::mpd;
......@@ -40,14 +39,12 @@ using namespace dash::mpd;
AdaptationSet::AdaptationSet(Period *period) :
SegmentInformation( period ),
subsegmentAlignmentFlag( false ),
segmentInfoDefault( NULL ),
isBitstreamSwitching( false )
{
}
AdaptationSet::~AdaptationSet ()
{
delete this->segmentInfoDefault;
vlc_delete_all( this->representations );
}
......@@ -88,17 +85,6 @@ const Representation *AdaptationSet::getRepresentationById(const std::string &id
return NULL;
}
const SegmentInfoDefault *AdaptationSet::getSegmentInfoDefault() const
{
return this->segmentInfoDefault;
}
void AdaptationSet::setSegmentInfoDefault(const SegmentInfoDefault *seg)
{
if ( seg != NULL )
this->segmentInfoDefault = seg;
}
void AdaptationSet::addRepresentation (Representation *rep)
{
this->representations.push_back(rep);
......
......@@ -37,7 +37,6 @@ namespace dash
{
namespace mpd
{
class SegmentInfoDefault;
class Period;
class SegmentTemplate;
......@@ -53,8 +52,6 @@ namespace dash
void setSubsegmentAlignmentFlag( bool alignment );
std::vector<Representation *>& getRepresentations ();
const Representation* getRepresentationById ( const std::string &id ) const;
const SegmentInfoDefault* getSegmentInfoDefault() const;
void setSegmentInfoDefault( const SegmentInfoDefault* seg );
void setBitstreamSwitching(bool value);
bool getBitstreamSwitching() const;
void addRepresentation( Representation *rep );
......@@ -64,7 +61,6 @@ namespace dash
private:
bool subsegmentAlignmentFlag;
std::vector<Representation *> representations;
const SegmentInfoDefault* segmentInfoDefault;
bool isBitstreamSwitching;
};
}
......
......@@ -28,7 +28,6 @@
#include "IsoffMainParser.h"
#include "SegmentTemplate.h"
#include "SegmentInfoDefault.h"
#include "ProgramInformation.h"
#include "xml/DOMHelper.h"
#include <vlc_strings.h>
......
/*****************************************************************************
* SegmentInfoDefault.cpp: Implement the SegmentInfoDefault element.
*****************************************************************************
* Copyright (C) 1998-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "SegmentInfoDefault.h"
using namespace dash::mpd;
SegmentInfoDefault::SegmentInfoDefault()
{
}
const std::string& SegmentInfoDefault::getSourceURLTemplatePeriod() const
{
return this->sourceURLTemplatePeriod;
}
void SegmentInfoDefault::setSourceURLTemplatePediod( const std::string &url )
{
if ( url.empty() == false )
this->sourceURLTemplatePeriod = url;
}
int SegmentInfoDefault::getIndexTemplate() const
{
return this->indexTemplate;
}
void SegmentInfoDefault::setIndexTemplate( int indexTpl )
{
if ( indexTpl >= 0 )
this->indexTemplate = indexTpl;
}
/*****************************************************************************
* SegmentInfoDefault.cpp: Implement the SegmentInfoDefault element.
*****************************************************************************
* Copyright (C) 1998-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef SEGMENTINFODEFAULT_H
#define SEGMENTINFODEFAULT_H
#include "mpd/SegmentInfoCommon.h"
#include <string>
namespace dash
{
namespace mpd
{
class SegmentInfoDefault : public SegmentInfoCommon
{
public:
SegmentInfoDefault();
const std::string& getSourceURLTemplatePeriod() const;
void setSourceURLTemplatePediod( const std::string &url );
int getIndexTemplate() const;
void setIndexTemplate( int indexTpl );
private:
std::string sourceURLTemplatePeriod;
int indexTemplate;
};
}
}
#endif // SEGMENTINFODEFAULT_H
......@@ -28,7 +28,6 @@
#include "SegmentTimeline.h"
#include "Representation.h"
#include "AdaptationSet.h"
#include "SegmentInfoDefault.h"
using namespace dash::mpd;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment