Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3a60ec4b
Commit
3a60ec4b
authored
Nov 27, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_filter: dash: remove duplicate member
parent
e9a42b2d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
6 deletions
+19
-6
modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
...m_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
+1
-1
modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
...eam_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
+3
-1
modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
...filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
+0
-1
modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
...m_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
+0
-1
modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
...lter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
+5
-0
modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
...lter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
+10
-0
modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
..._filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
+0
-1
modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
...am_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
+0
-1
No files found.
modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
View file @
3a60ec4b
...
...
@@ -32,9 +32,9 @@ using namespace dash::xml;
using
namespace
dash
::
mpd
;
AbstractAdaptationLogic
::
AbstractAdaptationLogic
(
MPDManager
*
mpdManager
,
stream_t
*
stream
)
:
mpdManager
(
mpdManager
),
bpsAvg
(
0
),
bpsLastChunk
(
0
),
mpdManager
(
mpdManager
),
stream
(
stream
),
bufferedMicroSec
(
0
),
bufferedPercent
(
0
)
...
...
modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
View file @
3a60ec4b
...
...
@@ -53,10 +53,12 @@ namespace dash
uint64_t
getBpsLastChunk
()
const
;
int
getBufferPercent
()
const
;
protected:
dash
::
mpd
::
MPDManager
*
mpdManager
;
private:
int
bpsAvg
;
long
bpsLastChunk
;
dash
::
mpd
::
MPDManager
*
mpdManager
;
stream_t
*
stream
;
mtime_t
bufferedMicroSec
;
int
bufferedPercent
;
...
...
modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
View file @
3a60ec4b
...
...
@@ -35,7 +35,6 @@ using namespace dash::mpd;
AlwaysBestAdaptationLogic
::
AlwaysBestAdaptationLogic
(
MPDManager
*
mpdManager
,
stream_t
*
stream
)
:
AbstractAdaptationLogic
(
mpdManager
,
stream
)
{
this
->
mpdManager
=
mpdManager
;
this
->
count
=
0
;
this
->
initSchedule
();
}
...
...
modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
View file @
3a60ec4b
...
...
@@ -49,7 +49,6 @@ namespace dash
private:
std
::
vector
<
mpd
::
ISegment
*>
schedule
;
dash
::
mpd
::
MPDManager
*
mpdManager
;
size_t
count
;
dash
::
mpd
::
Representation
*
bestRepresentation
;
...
...
modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
0 → 100644
View file @
3a60ec4b
#include "AlwaysLowestAdaptationLogic.hpp"
AlwaysLowestAdaptationLogic
::
AlwaysLowestAdaptationLogic
()
{
}
modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
0 → 100644
View file @
3a60ec4b
#ifndef ALWAYSLOWESTADAPTATIONLOGIC_HPP
#define ALWAYSLOWESTADAPTATIONLOGIC_HPP
class
AlwaysLowestAdaptationLogic
{
public:
AlwaysLowestAdaptationLogic
();
};
#endif // ALWAYSLOWESTADAPTATIONLOGIC_HPP
modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
View file @
3a60ec4b
...
...
@@ -35,7 +35,6 @@ using namespace dash::mpd;
RateBasedAdaptationLogic
::
RateBasedAdaptationLogic
(
MPDManager
*
mpdManager
,
stream_t
*
stream
)
:
AbstractAdaptationLogic
(
mpdManager
,
stream
),
mpdManager
(
mpdManager
),
count
(
0
),
currentPeriod
(
mpdManager
->
getFirstPeriod
())
{
...
...
modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
View file @
3a60ec4b
...
...
@@ -48,7 +48,6 @@ namespace dash
const
dash
::
mpd
::
Representation
*
getCurrentRepresentation
()
const
;
private:
dash
::
mpd
::
MPDManager
*
mpdManager
;
size_t
count
;
dash
::
mpd
::
Period
*
currentPeriod
;
int
width
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment