[vlc-commits] demux: dash: remove unused representation members
Francois Cartegnie
git at videolan.org
Mon Aug 6 22:27:24 CEST 2018
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 6 22:15:30 2018 +0200| [056a3021a8fc4d3e40681385040be75c000d0012] | committer: Francois Cartegnie
demux: dash: remove unused representation members
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=056a3021a8fc4d3e40681385040be75c000d0012
---
modules/demux/Makefile.am | 2 --
modules/demux/dash/mpd/Representation.cpp | 38 +------------------------
modules/demux/dash/mpd/Representation.h | 16 -----------
modules/demux/dash/mpd/TrickModeType.cpp | 46 -------------------------------
modules/demux/dash/mpd/TrickModeType.h | 45 ------------------------------
5 files changed, 1 insertion(+), 146 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 73df494df5..f5cd872fa3 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -405,8 +405,6 @@ libadaptive_dash_SOURCES = \
demux/dash/mpd/Representation.h \
demux/dash/mpd/TemplatedUri.cpp \
demux/dash/mpd/TemplatedUri.hpp \
- demux/dash/mpd/TrickModeType.cpp \
- demux/dash/mpd/TrickModeType.h \
demux/dash/mp4/IndexReader.cpp \
demux/dash/mp4/IndexReader.hpp \
demux/dash/DASHManager.cpp \
diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index baf8357241..3f0bdb9664 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -30,7 +30,6 @@
#include "Representation.h"
#include "AdaptationSet.h"
#include "MPD.h"
-#include "TrickModeType.h"
#include "../adaptive/playlist/SegmentTemplate.h"
#include "../adaptive/playlist/SegmentTimeline.h"
#include "TemplatedUri.hpp"
@@ -38,15 +37,12 @@
using namespace dash::mpd;
Representation::Representation ( AdaptationSet *set ) :
- BaseRepresentation( set ),
- qualityRanking ( -1 ),
- trickModeType ( NULL )
+ BaseRepresentation( set )
{
}
Representation::~Representation ()
{
- delete(this->trickModeType);
}
StreamFormat Representation::getStreamFormat() const
@@ -57,38 +53,6 @@ StreamFormat Representation::getStreamFormat() const
return StreamFormat(getMimeType());
}
-TrickModeType* Representation::getTrickModeType () const
-{
- return this->trickModeType;
-}
-
-void Representation::setTrickMode (TrickModeType *trickModeType)
-{
- this->trickModeType = trickModeType;
-}
-
-int Representation::getQualityRanking() const
-{
- return this->qualityRanking;
-}
-
-void Representation::setQualityRanking( int qualityRanking )
-{
- if ( qualityRanking > 0 )
- this->qualityRanking = qualityRanking;
-}
-
-const std::list<const Representation*>& Representation::getDependencies() const
-{
- return this->dependencies;
-}
-
-void Representation::addDependency(const Representation *dep)
-{
- if ( dep != NULL )
- this->dependencies.push_back( dep );
-}
-
std::string Representation::contextualize(size_t number, const std::string &component,
const BaseSegmentTemplate *basetempl) const
{
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index a1cbaf2199..e57770dcf6 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -34,7 +34,6 @@ namespace dash
namespace mpd
{
class AdaptationSet;
- class TrickModeType;
class MPD;
using namespace adaptive;
@@ -48,27 +47,12 @@ namespace dash
virtual ~Representation ();
virtual StreamFormat getStreamFormat() const; /* reimpl */
- int getQualityRanking () const;
- void setQualityRanking ( int qualityRanking );
- const std::list<const Representation*>& getDependencies() const;
- void addDependency ( const Representation* dep );
- /**
- * @return This SegmentInfo for this Representation.
- * It cannot be NULL, or without any Segments in it.
- * It can however have a NULL InitSegment
- */
- TrickModeType* getTrickModeType () const;
-
- void setTrickMode( TrickModeType *trickModeType );
/* for segment templates */
virtual std::string contextualize(size_t, const std::string &,
const BaseSegmentTemplate *) const; // reimpl
private:
- int qualityRanking;
- std::list<const Representation*> dependencies;
- TrickModeType *trickModeType;
/* for contextualize() */
vlc_tick_t getScaledTimeBySegmentNumber(uint64_t, const MediaSegmentTemplate *) const;
diff --git a/modules/demux/dash/mpd/TrickModeType.cpp b/modules/demux/dash/mpd/TrickModeType.cpp
deleted file mode 100644
index f40ea50db7..0000000000
--- a/modules/demux/dash/mpd/TrickModeType.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * TrickModeType.cpp
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller at itec.uni-klu.ac.at>
- * Christian Timmerer <christian.timmerer at itec.uni-klu.ac.at>
- *
- * 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 "TrickModeType.h"
-
-using namespace dash::mpd;
-
-TrickModeType::TrickModeType() :
- alternatePlayoutRate( 1 )
-{
-}
-
-int TrickModeType::getAlternatePlayoutRate() const
-{
- return this->alternatePlayoutRate;
-}
-
-void TrickModeType::setAlternatePlayoutRate(int playoutRate)
-{
- this->alternatePlayoutRate = playoutRate;
-}
-
diff --git a/modules/demux/dash/mpd/TrickModeType.h b/modules/demux/dash/mpd/TrickModeType.h
deleted file mode 100644
index 68b48949b0..0000000000
--- a/modules/demux/dash/mpd/TrickModeType.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * TrickModeType.h
- *****************************************************************************
- * Copyright (C) 2010 - 2011 Klagenfurt University
- *
- * Created on: Aug 10, 2010
- * Authors: Christopher Mueller <christopher.mueller at itec.uni-klu.ac.at>
- * Christian Timmerer <christian.timmerer at itec.uni-klu.ac.at>
- *
- * 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 TRICKMODETYPE_H_
-#define TRICKMODETYPE_H_
-
-namespace dash
-{
- namespace mpd
- {
- class TrickModeType
- {
- public:
- TrickModeType ();
-
- int getAlternatePlayoutRate() const;
- void setAlternatePlayoutRate( int playoutRate );
-
- private:
- int alternatePlayoutRate;
- };
- }
-}
-#endif /* TRICKMODETYPE_H_ */
More information about the vlc-commits
mailing list