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
08bf5c8d
Commit
08bf5c8d
authored
Jan 12, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: dash: add timescale inheritance to timeline
parent
8c6bf181
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
modules/demux/dash/mpd/IsoffMainParser.cpp
modules/demux/dash/mpd/IsoffMainParser.cpp
+3
-3
modules/demux/dash/mpd/IsoffMainParser.h
modules/demux/dash/mpd/IsoffMainParser.h
+1
-1
modules/demux/dash/mpd/SegmentTimeline.cpp
modules/demux/dash/mpd/SegmentTimeline.cpp
+4
-2
modules/demux/dash/mpd/SegmentTimeline.h
modules/demux/dash/mpd/SegmentTimeline.h
+3
-2
No files found.
modules/demux/dash/mpd/IsoffMainParser.cpp
View file @
08bf5c8d
...
...
@@ -353,12 +353,12 @@ void IsoffMainParser::parseInitSegment(Node *initNode, Initializable<Segment> *i
init
->
initialisationSegment
.
Set
(
seg
);
}
void
IsoffMainParser
::
parseTimeline
(
Node
*
node
,
Timelineable
*
timelineable
)
void
IsoffMainParser
::
parseTimeline
(
Node
*
node
,
MediaSegmentTemplate
*
templ
)
{
if
(
!
node
)
return
;
SegmentTimeline
*
timeline
=
new
(
std
::
nothrow
)
SegmentTimeline
();
SegmentTimeline
*
timeline
=
new
(
std
::
nothrow
)
SegmentTimeline
(
templ
);
if
(
timeline
)
{
std
::
vector
<
Node
*>
elements
=
DOMHelper
::
getElementByTagName
(
node
,
"S"
,
false
);
...
...
@@ -379,7 +379,7 @@ void IsoffMainParser::parseTimeline(Node *node, Timelineable *timelineable)
}
else
timeline
->
addElement
(
d
,
r
);
t
imelineable
->
segmentTimeline
.
Set
(
timeline
);
t
empl
->
segmentTimeline
.
Set
(
timeline
);
}
}
}
...
...
modules/demux/dash/mpd/IsoffMainParser.h
View file @
08bf5c8d
...
...
@@ -54,7 +54,7 @@ namespace dash
void
setAdaptationSets
(
dash
::
xml
::
Node
*
periodNode
,
Period
*
period
);
void
setRepresentations
(
dash
::
xml
::
Node
*
adaptationSetNode
,
AdaptationSet
*
adaptationSet
);
void
parseInitSegment
(
dash
::
xml
::
Node
*
,
Initializable
<
Segment
>
*
);
void
parseTimeline
(
dash
::
xml
::
Node
*
,
Timelineabl
e
*
);
void
parseTimeline
(
dash
::
xml
::
Node
*
,
MediaSegmentTemplat
e
*
);
void
parsePeriods
(
dash
::
xml
::
Node
*
);
size_t
parseSegmentInformation
(
dash
::
xml
::
Node
*
,
SegmentInformation
*
);
void
parseSegmentBase
(
dash
::
xml
::
Node
*
,
SegmentInformation
*
);
...
...
modules/demux/dash/mpd/SegmentTimeline.cpp
View file @
08bf5c8d
...
...
@@ -29,7 +29,8 @@
using
namespace
dash
::
mpd
;
SegmentTimeline
::
SegmentTimeline
()
SegmentTimeline
::
SegmentTimeline
(
TimescaleAble
*
parent
)
:
TimescaleAble
(
parent
)
{
pruned
=
0
;
}
...
...
@@ -108,8 +109,9 @@ mtime_t SegmentTimeline::getScaledPlaybackTimeByElementNumber(uint64_t number) c
return
totalscaledtime
;
}
size_t
SegmentTimeline
::
prune
(
mtime_t
scaled
)
size_t
SegmentTimeline
::
prune
(
mtime_t
time
)
{
mtime_t
scaled
=
time
*
inheritTimescale
()
/
CLOCK_FREQ
;
size_t
prunednow
=
0
;
while
(
elements
.
size
())
{
...
...
modules/demux/dash/mpd/SegmentTimeline.h
View file @
08bf5c8d
...
...
@@ -24,6 +24,7 @@
#ifndef SEGMENTTIMELINE_H
#define SEGMENTTIMELINE_H
#include "SegmentInfoCommon.h"
#include <vlc_common.h>
#include <list>
...
...
@@ -31,12 +32,12 @@ namespace dash
{
namespace
mpd
{
class
SegmentTimeline
class
SegmentTimeline
:
public
TimescaleAble
{
class
Element
;
public:
SegmentTimeline
();
SegmentTimeline
(
TimescaleAble
*
=
NULL
);
virtual
~
SegmentTimeline
();
void
addElement
(
mtime_t
d
,
uint64_t
r
=
0
,
mtime_t
t
=
0
);
uint64_t
getElementNumberByScaledPlaybackTime
(
time_t
)
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