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
2da28c96
Commit
2da28c96
authored
Nov 17, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_filter: dash: fix iteration on different lists
List was not returned by reference
parent
82a8e3f2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
modules/stream_filter/dash/mpd/AdaptationSet.cpp
modules/stream_filter/dash/mpd/AdaptationSet.cpp
+1
-1
modules/stream_filter/dash/mpd/AdaptationSet.h
modules/stream_filter/dash/mpd/AdaptationSet.h
+1
-1
modules/stream_filter/dash/mpd/IsoffMainParser.cpp
modules/stream_filter/dash/mpd/IsoffMainParser.cpp
+10
-5
No files found.
modules/stream_filter/dash/mpd/AdaptationSet.cpp
View file @
2da28c96
...
...
@@ -58,7 +58,7 @@ void AdaptationSet::setSubsegmentAlignmentFlag(bool alignment)
this
->
subsegmentAlignmentFlag
=
alignment
;
}
std
::
vector
<
Representation
*>
AdaptationSet
::
getRepresentations
()
std
::
vector
<
Representation
*>
&
AdaptationSet
::
getRepresentations
()
{
return
this
->
representations
;
}
...
...
modules/stream_filter/dash/mpd/AdaptationSet.h
View file @
2da28c96
...
...
@@ -46,7 +46,7 @@ namespace dash
bool
getSubsegmentAlignmentFlag
()
const
;
void
setSubsegmentAlignmentFlag
(
bool
alignment
);
std
::
vector
<
Representation
*>
getRepresentations
();
std
::
vector
<
Representation
*>
&
getRepresentations
();
const
Representation
*
getRepresentationById
(
const
std
::
string
&
id
)
const
;
const
SegmentInfoDefault
*
getSegmentInfoDefault
()
const
;
void
setSegmentInfoDefault
(
const
SegmentInfoDefault
*
seg
);
...
...
modules/stream_filter/dash/mpd/IsoffMainParser.cpp
View file @
2da28c96
...
...
@@ -192,13 +192,17 @@ void IsoffMainParser::print ()
{
msg_Dbg
(
p_stream
,
" AdaptationSet"
);
std
::
vector
<
Representation
*>::
const_iterator
k
;
for
(
k
=
(
*
j
)
->
getRepresentations
().
begin
();
k
!=
(
*
j
)
->
getRepresentations
().
begin
();
k
++
)
for
(
k
=
(
*
j
)
->
getRepresentations
().
begin
();
k
!=
(
*
j
)
->
getRepresentations
().
end
();
k
++
)
{
msg_Dbg
(
p_stream
,
" Representation"
);
msg_Dbg
(
p_stream
,
" InitSeg url=%s"
,
(
*
k
)
->
getSegmentBase
()
->
getInitSegment
()
->
getSourceUrl
().
c_str
());
const
SegmentList
*
segmentList
=
(
*
k
)
->
getSegmentList
();
if
(
segmentList
)
{
std
::
vector
<
Segment
*>::
const_iterator
l
;
for
(
l
=
(
*
k
)
->
getSegmentList
()
->
getSegments
().
begin
();
l
<
(
*
k
)
->
getSegmentList
()
->
getSegments
().
end
();
l
++
)
for
(
l
=
segmentList
->
getSegments
().
begin
();
l
<
segmentList
->
getSegments
().
end
();
l
++
)
{
msg_Dbg
(
p_stream
,
" Segment url=%s"
,
(
*
l
)
->
getSourceUrl
().
c_str
());
}
...
...
@@ -206,4 +210,5 @@ void IsoffMainParser::print ()
}
}
}
}
}
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