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
a7c8fbc3
Commit
a7c8fbc3
authored
Jun 26, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Jun 26, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adaptive: fix StreamType namespace missing
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
a65d213b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
+1
-1
modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
...es/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
+1
-1
modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
+2
-2
modules/demux/adaptative/logic/Representationselectors.cpp
modules/demux/adaptative/logic/Representationselectors.cpp
+3
-3
modules/demux/adaptative/playlist/BasePeriod.cpp
modules/demux/adaptative/playlist/BasePeriod.cpp
+2
-2
No files found.
modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
View file @
a7c8fbc3
...
...
@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic () :
{
}
BaseRepresentation
*
AlwaysBestAdaptationLogic
::
getCurrentRepresentation
(
StreamType
type
,
BasePeriod
*
period
)
const
BaseRepresentation
*
AlwaysBestAdaptationLogic
::
getCurrentRepresentation
(
adaptative
::
StreamType
type
,
BasePeriod
*
period
)
const
{
RepresentationSelector
selector
;
return
selector
.
select
(
period
,
type
);
...
...
modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
View file @
a7c8fbc3
...
...
@@ -28,7 +28,7 @@ AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic():
{
}
BaseRepresentation
*
AlwaysLowestAdaptationLogic
::
getCurrentRepresentation
(
StreamType
type
,
BasePeriod
*
period
)
const
BaseRepresentation
*
AlwaysLowestAdaptationLogic
::
getCurrentRepresentation
(
adaptative
::
StreamType
type
,
BasePeriod
*
period
)
const
{
RepresentationSelector
selector
;
return
selector
.
select
(
period
,
type
,
0
);
...
...
modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
View file @
a7c8fbc3
...
...
@@ -47,7 +47,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (int w, int h) :
stabilizer
=
16
;
}
BaseRepresentation
*
RateBasedAdaptationLogic
::
getCurrentRepresentation
(
StreamType
type
,
BasePeriod
*
period
)
const
BaseRepresentation
*
RateBasedAdaptationLogic
::
getCurrentRepresentation
(
adaptative
::
StreamType
type
,
BasePeriod
*
period
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
@@ -98,7 +98,7 @@ FixedRateAdaptationLogic::FixedRateAdaptationLogic(size_t bps) :
currentBps
=
bps
;
}
BaseRepresentation
*
FixedRateAdaptationLogic
::
getCurrentRepresentation
(
StreamType
type
,
BasePeriod
*
period
)
const
BaseRepresentation
*
FixedRateAdaptationLogic
::
getCurrentRepresentation
(
adaptative
::
StreamType
type
,
BasePeriod
*
period
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
modules/demux/adaptative/logic/Representationselectors.cpp
View file @
a7c8fbc3
...
...
@@ -29,11 +29,11 @@ RepresentationSelector::RepresentationSelector()
{
}
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
StreamType
type
)
const
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
adaptative
::
StreamType
type
)
const
{
return
select
(
period
,
type
,
std
::
numeric_limits
<
uint64_t
>::
max
());
}
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
StreamType
type
,
uint64_t
bitrate
)
const
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
adaptative
::
StreamType
type
,
uint64_t
bitrate
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
@@ -56,7 +56,7 @@ BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamTy
return
best
;
}
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
StreamType
type
,
uint64_t
bitrate
,
BaseRepresentation
*
RepresentationSelector
::
select
(
BasePeriod
*
period
,
adaptative
::
StreamType
type
,
uint64_t
bitrate
,
int
width
,
int
height
)
const
{
if
(
period
==
NULL
)
...
...
modules/demux/adaptative/playlist/BasePeriod.cpp
View file @
a7c8fbc3
...
...
@@ -61,7 +61,7 @@ const std::vector<BaseAdaptationSet*>& BasePeriod::getAdaptationSets() const
return
adaptationSets
;
}
const
std
::
vector
<
BaseAdaptationSet
*>
BasePeriod
::
getAdaptationSets
(
StreamType
type
)
const
const
std
::
vector
<
BaseAdaptationSet
*>
BasePeriod
::
getAdaptationSets
(
adaptative
::
StreamType
type
)
const
{
std
::
vector
<
BaseAdaptationSet
*>
list
;
std
::
vector
<
BaseAdaptationSet
*>::
const_iterator
it
;
...
...
@@ -82,7 +82,7 @@ void BasePeriod::addAdaptationSet(BaseAdaptationSet *adaptationSet)
}
}
BaseAdaptationSet
*
BasePeriod
::
getAdaptationSet
(
StreamType
type
)
const
BaseAdaptationSet
*
BasePeriod
::
getAdaptationSet
(
adaptative
::
StreamType
type
)
const
{
std
::
vector
<
BaseAdaptationSet
*>::
const_iterator
it
;
for
(
it
=
adaptationSets
.
begin
();
it
!=
adaptationSets
.
end
();
++
it
)
...
...
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