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
11969bc5
Commit
11969bc5
authored
Sep 16, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: adaptative: always fallback on representation format
parent
c8be3492
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
+4
-1
modules/demux/dash/mpd/AdaptationSet.cpp
modules/demux/dash/mpd/AdaptationSet.cpp
+1
-9
No files found.
modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
View file @
11969bc5
...
@@ -54,7 +54,10 @@ BaseAdaptationSet::~BaseAdaptationSet ()
...
@@ -54,7 +54,10 @@ BaseAdaptationSet::~BaseAdaptationSet ()
StreamFormat
BaseAdaptationSet
::
getStreamFormat
()
const
StreamFormat
BaseAdaptationSet
::
getStreamFormat
()
const
{
{
return
StreamFormat
();
if
(
!
representations
.
empty
())
return
representations
.
front
()
->
getStreamFormat
();
else
return
StreamFormat
();
}
}
std
::
vector
<
BaseRepresentation
*>&
BaseAdaptationSet
::
getRepresentations
()
std
::
vector
<
BaseRepresentation
*>&
BaseAdaptationSet
::
getRepresentations
()
...
...
modules/demux/dash/mpd/AdaptationSet.cpp
View file @
11969bc5
...
@@ -43,17 +43,9 @@ AdaptationSet::~AdaptationSet()
...
@@ -43,17 +43,9 @@ AdaptationSet::~AdaptationSet()
StreamFormat
AdaptationSet
::
getStreamFormat
()
const
StreamFormat
AdaptationSet
::
getStreamFormat
()
const
{
{
if
(
!
getMimeType
().
empty
())
if
(
!
getMimeType
().
empty
())
{
return
DASHStreamFormat
::
mimeToFormat
(
getMimeType
());
return
DASHStreamFormat
::
mimeToFormat
(
getMimeType
());
}
else
if
(
!
representations
.
empty
())
{
return
representations
.
front
()
->
getStreamFormat
();
}
else
else
{
return
BaseAdaptationSet
::
getStreamFormat
();
return
StreamFormat
();
}
}
}
bool
AdaptationSet
::
getSubsegmentAlignmentFlag
()
const
bool
AdaptationSet
::
getSubsegmentAlignmentFlag
()
const
...
...
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