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
4c3edf27
Commit
4c3edf27
authored
Feb 04, 2015
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: Fix MSVC build
parent
1ae37b27
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
14 deletions
+18
-14
modules/demux/dash/DASHManager.cpp
modules/demux/dash/DASHManager.cpp
+2
-0
modules/demux/dash/Streams.cpp
modules/demux/dash/Streams.cpp
+3
-3
modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
.../demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
+1
-1
modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
...emux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
+2
-2
modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
...s/demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
+3
-3
modules/demux/dash/adaptationlogic/Representationselectors.cpp
...es/demux/dash/adaptationlogic/Representationselectors.cpp
+3
-3
modules/demux/dash/mpd/Period.cpp
modules/demux/dash/mpd/Period.cpp
+2
-2
modules/demux/dash/mpd/SegmentTimeline.cpp
modules/demux/dash/mpd/SegmentTimeline.cpp
+2
-0
No files found.
modules/demux/dash/DASHManager.cpp
View file @
4c3edf27
...
...
@@ -42,6 +42,8 @@
#include "SegmentTracker.hpp"
#include <vlc_stream.h>
#include <algorithm>
using
namespace
dash
;
using
namespace
dash
::
http
;
using
namespace
dash
::
logic
;
...
...
modules/demux/dash/Streams.cpp
View file @
4c3edf27
...
...
@@ -87,14 +87,14 @@ Format Stream::mimeToFormat(const std::string &mime)
return
format
;
}
void
Stream
::
create
(
demux_t
*
demux
,
AbstractAdaptationLogic
*
logic
,
SegmentTracker
*
tracker
)
void
Stream
::
create
(
demux_t
*
demux
,
AbstractAdaptationLogic
*
logic
,
dash
::
SegmentTracker
*
tracker
)
{
switch
(
format
)
{
case
Streams
:
:
MP4
:
case
dash
:
:
Streams
::
MP4
:
output
=
new
MP4StreamOutput
(
demux
);
break
;
case
Streams
:
:
MPEG2TS
:
case
dash
:
:
Streams
::
MPEG2TS
:
output
=
new
MPEG2TSStreamOutput
(
demux
);
break
;
default:
...
...
modules/demux/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
View file @
4c3edf27
...
...
@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPD *mpd) :
{
}
Representation
*
AlwaysBestAdaptationLogic
::
getCurrentRepresentation
(
Streams
::
Type
type
,
mpd
::
Period
*
period
)
const
Representation
*
AlwaysBestAdaptationLogic
::
getCurrentRepresentation
(
dash
::
Streams
::
Type
type
,
Period
*
period
)
const
{
RepresentationSelector
selector
;
return
selector
.
select
(
period
,
type
);
...
...
modules/demux/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
View file @
4c3edf27
...
...
@@ -23,12 +23,12 @@
using
namespace
dash
::
logic
;
using
namespace
dash
::
mpd
;
AlwaysLowestAdaptationLogic
::
AlwaysLowestAdaptationLogic
(
mpd
::
MPD
*
mpd
)
:
AlwaysLowestAdaptationLogic
::
AlwaysLowestAdaptationLogic
(
MPD
*
mpd
)
:
AbstractAdaptationLogic
(
mpd
)
{
}
Representation
*
AlwaysLowestAdaptationLogic
::
getCurrentRepresentation
(
Streams
::
Type
type
,
mpd
::
Period
*
period
)
const
Representation
*
AlwaysLowestAdaptationLogic
::
getCurrentRepresentation
(
dash
::
Streams
::
Type
type
,
Period
*
period
)
const
{
RepresentationSelector
selector
;
return
selector
.
select
(
period
,
type
,
0
);
...
...
modules/demux/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
View file @
4c3edf27
...
...
@@ -44,7 +44,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPD *mpd) :
height
=
var_InheritInteger
(
mpd
->
getVLCObject
(),
"dash-prefheight"
);
}
Representation
*
RateBasedAdaptationLogic
::
getCurrentRepresentation
(
Streams
::
Type
type
,
mpd
::
Period
*
period
)
const
Representation
*
RateBasedAdaptationLogic
::
getCurrentRepresentation
(
dash
::
Streams
::
Type
type
,
Period
*
period
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
@@ -78,13 +78,13 @@ void RateBasedAdaptationLogic::updateDownloadRate(size_t size, mtime_t time)
currentBps
=
bpsAvg
;
}
FixedRateAdaptationLogic
::
FixedRateAdaptationLogic
(
mpd
::
MPD
*
mpd
)
:
FixedRateAdaptationLogic
::
FixedRateAdaptationLogic
(
MPD
*
mpd
)
:
AbstractAdaptationLogic
(
mpd
)
{
currentBps
=
var_InheritInteger
(
mpd
->
getVLCObject
(),
"dash-prefbw"
)
*
8192
;
}
Representation
*
FixedRateAdaptationLogic
::
getCurrentRepresentation
(
Streams
::
Type
type
,
mpd
::
Period
*
period
)
const
Representation
*
FixedRateAdaptationLogic
::
getCurrentRepresentation
(
dash
::
Streams
::
Type
type
,
Period
*
period
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
modules/demux/dash/adaptationlogic/Representationselectors.cpp
View file @
4c3edf27
...
...
@@ -26,11 +26,11 @@ RepresentationSelector::RepresentationSelector()
{
}
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
Streams
::
Type
type
)
const
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
dash
::
Streams
::
Type
type
)
const
{
return
select
(
period
,
type
,
std
::
numeric_limits
<
uint64_t
>::
max
());
}
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
Streams
::
Type
type
,
uint64_t
bitrate
)
const
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
dash
::
Streams
::
Type
type
,
uint64_t
bitrate
)
const
{
if
(
period
==
NULL
)
return
NULL
;
...
...
@@ -53,7 +53,7 @@ Representation * RepresentationSelector::select(Period *period, Streams::Type ty
return
best
;
}
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
Streams
::
Type
type
,
uint64_t
bitrate
,
Representation
*
RepresentationSelector
::
select
(
Period
*
period
,
dash
::
Streams
::
Type
type
,
uint64_t
bitrate
,
int
width
,
int
height
)
const
{
if
(
period
==
NULL
)
...
...
modules/demux/dash/mpd/Period.cpp
View file @
4c3edf27
...
...
@@ -54,7 +54,7 @@ const std::vector<AdaptationSet*>& Period::getAdaptationSets() const
return
this
->
adaptationSets
;
}
const
std
::
vector
<
AdaptationSet
*>
Period
::
getAdaptationSets
(
Streams
::
Type
type
)
const
const
std
::
vector
<
AdaptationSet
*>
Period
::
getAdaptationSets
(
dash
::
Streams
::
Type
type
)
const
{
std
::
vector
<
AdaptationSet
*>
list
;
std
::
vector
<
AdaptationSet
*>::
const_iterator
it
;
...
...
@@ -75,7 +75,7 @@ void Period::addAdaptationSet(AdaptationSet *adap
}
}
AdaptationSet
*
Period
::
getAdaptationSet
(
Streams
::
Type
type
)
const
AdaptationSet
*
Period
::
getAdaptationSet
(
dash
::
Streams
::
Type
type
)
const
{
std
::
vector
<
AdaptationSet
*>::
const_iterator
it
;
for
(
it
=
adaptationSets
.
begin
();
it
!=
adaptationSets
.
end
();
it
++
)
...
...
modules/demux/dash/mpd/SegmentTimeline.cpp
View file @
4c3edf27
...
...
@@ -28,6 +28,8 @@
#include "SegmentTimeline.h"
#include <algorithm>
using
namespace
dash
::
mpd
;
SegmentTimeline
::
SegmentTimeline
(
TimescaleAble
*
parent
)
...
...
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