Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
c4851d5c
Commit
c4851d5c
authored
Jan 05, 2012
by
Hugo Beauzée-Luyssen
Committed by
Jean-Baptiste Kempf
Jan 06, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: Handle UrlTemplate in parser.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
2a6547a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
100 additions
and
12 deletions
+100
-12
modules/stream_filter/dash/mpd/BasicCMParser.cpp
modules/stream_filter/dash/mpd/BasicCMParser.cpp
+96
-10
modules/stream_filter/dash/mpd/BasicCMParser.h
modules/stream_filter/dash/mpd/BasicCMParser.h
+4
-2
No files found.
modules/stream_filter/dash/mpd/BasicCMParser.cpp
View file @
c4851d5c
...
@@ -28,10 +28,12 @@
...
@@ -28,10 +28,12 @@
#include "BasicCMParser.h"
#include "BasicCMParser.h"
#include "mpd/ContentDescription.h"
#include "mpd/ContentDescription.h"
#include "mpd/SegmentInfoDefault.h"
#include "mpd/SegmentInfoDefault.h"
#include "mpd/SegmentTemplate.h"
#include "mpd/SegmentTimeline.h"
#include "mpd/SegmentTimeline.h"
#include <cstdlib>
#include <cstdlib>
#include <sstream>
#include <sstream>
#include <sstream>
#include <vlc_common.h>
#include <vlc_common.h>
#include <vlc_stream.h>
#include <vlc_stream.h>
...
@@ -43,7 +45,8 @@ using namespace dash::xml;
...
@@ -43,7 +45,8 @@ using namespace dash::xml;
BasicCMParser
::
BasicCMParser
(
Node
*
root
,
stream_t
*
p_stream
)
:
BasicCMParser
::
BasicCMParser
(
Node
*
root
,
stream_t
*
p_stream
)
:
root
(
root
),
root
(
root
),
mpd
(
NULL
),
mpd
(
NULL
),
p_stream
(
p_stream
)
p_stream
(
p_stream
),
currentRepresentation
(
NULL
)
{
{
this
->
url
=
p_stream
->
psz_access
;
this
->
url
=
p_stream
->
psz_access
;
this
->
url
+=
"://"
;
this
->
url
+=
"://"
;
...
@@ -297,6 +300,7 @@ void BasicCMParser::setRepresentations (Node *root, Group *group)
...
@@ -297,6 +300,7 @@ void BasicCMParser::setRepresentations (Node *root, Group *group)
Representation
*
rep
=
new
Representation
;
Representation
*
rep
=
new
Representation
;
rep
->
setParentGroup
(
group
);
rep
->
setParentGroup
(
group
);
this
->
currentRepresentation
=
rep
;
if
(
this
->
parseCommonAttributesElements
(
representations
.
at
(
i
),
rep
,
group
)
==
false
)
if
(
this
->
parseCommonAttributesElements
(
representations
.
at
(
i
),
rep
,
group
)
==
false
)
{
{
delete
rep
;
delete
rep
;
...
@@ -374,21 +378,39 @@ bool BasicCMParser::setSegmentInfo (Node *root, Representation *rep)
...
@@ -374,21 +378,39 @@ bool BasicCMParser::setSegmentInfo (Node *root, Representation *rep)
return
false
;
return
false
;
}
}
bool
BasicCMParser
::
parseSegment
(
Segment
*
seg
,
const
std
::
map
<
std
::
string
,
std
::
string
>&
attr
)
Segment
*
BasicCMParser
::
parseSegment
(
Node
*
node
)
{
{
const
std
::
map
<
std
::
string
,
std
::
string
>
attr
=
node
->
getAttributes
();
std
::
map
<
std
::
string
,
std
::
string
>::
const_iterator
it
;
std
::
map
<
std
::
string
,
std
::
string
>::
const_iterator
it
;
bool
isTemplate
=
false
;
Segment
*
seg
=
NULL
;
if
(
node
->
getName
()
==
"UrlTemplate"
)
isTemplate
=
true
;
it
=
attr
.
find
(
"sourceURL"
);
it
=
attr
.
find
(
"sourceURL"
);
//FIXME: When not present, the sourceUrl attribute should be computed
//FIXME: When not present, the sourceUrl attribute should be computed
//using BaseURL and the range attribute.
//using BaseURL and the range attribute.
if
(
it
!=
attr
.
end
()
)
if
(
it
!=
attr
.
end
()
)
{
{
std
::
string
url
=
it
->
second
;
std
::
string
url
=
it
->
second
;
bool
runtimeToken
=
false
;
if
(
isTemplate
==
true
)
{
if
(
this
->
resolveUrlTemplates
(
url
,
runtimeToken
)
==
false
)
{
std
::
cerr
<<
"Failed to substitute URLTemplate identifier."
<<
std
::
endl
;
return
NULL
;
}
seg
=
new
SegmentTemplate
(
runtimeToken
,
this
->
currentRepresentation
);
}
else
seg
=
new
Segment
;
if
(
url
.
find
(
this
->
p_stream
->
psz_access
)
!=
0
)
//Relative url
if
(
url
.
find
(
this
->
p_stream
->
psz_access
)
!=
0
)
//Relative url
url
=
this
->
url
+
url
;
url
=
this
->
url
+
url
;
seg
->
setSourceUrl
(
url
);
seg
->
setSourceUrl
(
url
);
}
}
return
true
;
return
seg
;
}
}
ProgramInformation
*
BasicCMParser
::
parseProgramInformation
()
ProgramInformation
*
BasicCMParser
::
parseProgramInformation
()
...
@@ -423,28 +445,92 @@ void BasicCMParser::setInitSegment (Node *root, SegmentInfoCommon *info
...
@@ -423,28 +445,92 @@ void BasicCMParser::setInitSegment (Node *root, SegmentInfoCommon *info
" other InitialisationSegmentURL will be dropped."
<<
std
::
endl
;
" other InitialisationSegmentURL will be dropped."
<<
std
::
endl
;
if
(
initSeg
.
size
()
==
1
)
if
(
initSeg
.
size
()
==
1
)
{
{
Segment
*
seg
=
new
Segment
(
);
Segment
*
seg
=
parseSegment
(
initSeg
.
at
(
0
)
);
parseSegment
(
seg
,
initSeg
.
at
(
0
)
->
getAttributes
()
);
if
(
seg
!=
NULL
)
info
->
setInitialisationSegment
(
seg
);
info
->
setInitialisationSegment
(
seg
);
}
}
}
}
bool
BasicCMParser
::
setSegments
(
Node
*
root
,
SegmentInfo
*
info
)
bool
BasicCMParser
::
setSegments
(
Node
*
root
,
SegmentInfo
*
info
)
{
{
std
::
vector
<
Node
*>
segments
=
DOMHelper
::
getElementByTagName
(
root
,
"Url"
,
false
);
std
::
vector
<
Node
*>
segments
=
DOMHelper
::
getElementByTagName
(
root
,
"Url"
,
false
);
std
::
vector
<
Node
*>
segmentsTemplates
=
DOMHelper
::
getElementByTagName
(
root
,
"UrlTemplate"
,
false
);
if
(
segments
.
size
()
==
0
)
if
(
segments
.
size
()
==
0
&&
segmentsTemplates
.
size
()
==
0
)
return
false
;
return
false
;
segments
.
insert
(
segments
.
end
(),
segmentsTemplates
.
begin
(),
segmentsTemplates
.
end
()
);
for
(
size_t
i
=
0
;
i
<
segments
.
size
();
i
++
)
for
(
size_t
i
=
0
;
i
<
segments
.
size
();
i
++
)
{
{
Segment
*
seg
=
new
Segment
();
Segment
*
seg
=
parseSegment
(
segments
.
at
(
i
)
);
parseSegment
(
seg
,
segments
.
at
(
i
)
->
getAttributes
()
);
if
(
seg
==
NULL
)
continue
;
if
(
seg
->
getSourceUrl
().
empty
()
==
false
)
if
(
seg
->
getSourceUrl
().
empty
()
==
false
)
info
->
addSegment
(
seg
);
info
->
addSegment
(
seg
);
}
}
return
true
;
return
true
;
}
}
bool
BasicCMParser
::
resolveUrlTemplates
(
std
::
string
&
url
,
bool
&
containRuntimeToken
)
{
size_t
it
=
url
.
find
(
'$'
);
containRuntimeToken
=
false
;
while
(
it
!=
std
::
string
::
npos
)
{
size_t
closing
=
url
.
find
(
'$'
,
it
+
1
);
if
(
closing
==
std
::
string
::
npos
)
{
std
::
cerr
<<
"Unmatched '$' in url template: "
<<
url
<<
std
::
endl
;
return
false
;
}
std
::
string
token
=
std
::
string
(
url
,
it
,
closing
-
it
+
1
);
if
(
token
==
"$$"
)
{
url
.
replace
(
it
,
token
.
length
(),
"$"
);
it
=
closing
+
1
;
}
else
if
(
token
==
"$RepresentationID$"
)
{
if
(
this
->
currentRepresentation
->
getId
().
empty
()
==
false
)
{
std
::
cerr
<<
"Representation doesn't have an ID. Can't substitute"
" identifier $RepresentationID$"
<<
std
::
endl
;
return
false
;
}
url
.
replace
(
it
,
token
.
length
(),
this
->
currentRepresentation
->
getId
()
);
it
=
it
+
this
->
currentRepresentation
->
getId
().
length
();
}
else
if
(
token
==
"$Bandwidth$"
)
{
if
(
this
->
currentRepresentation
->
getBandwidth
()
<
0
)
{
std
::
cerr
<<
"Representation doesn't have a valid bandwidth. "
"Can't substitute tag $Bandwidth$"
<<
std
::
endl
;
return
false
;
}
std
::
ostringstream
oss
;
oss
<<
this
->
currentRepresentation
->
getBandwidth
();
url
.
replace
(
it
,
token
.
length
(),
oss
.
str
()
);
it
=
it
+
oss
.
str
().
length
();
}
else
{
if
(
token
==
"$Index$"
||
token
==
"$Time$"
)
{
containRuntimeToken
=
true
;
it
=
it
+
token
.
length
();
}
else
{
std
::
cout
<<
"Unhandled token "
<<
token
<<
std
::
endl
;
return
false
;
}
}
it
=
url
.
find
(
'$'
,
it
);
}
return
true
;
}
MPD
*
BasicCMParser
::
getMPD
()
MPD
*
BasicCMParser
::
getMPD
()
{
{
return
this
->
mpd
;
return
this
->
mpd
;
...
...
modules/stream_filter/dash/mpd/BasicCMParser.h
View file @
c4851d5c
...
@@ -65,7 +65,8 @@ namespace dash
...
@@ -65,7 +65,8 @@ namespace dash
void
setRepresentations
(
dash
::
xml
::
Node
*
root
,
Group
*
group
);
void
setRepresentations
(
dash
::
xml
::
Node
*
root
,
Group
*
group
);
bool
setSegmentInfo
(
dash
::
xml
::
Node
*
root
,
Representation
*
rep
);
bool
setSegmentInfo
(
dash
::
xml
::
Node
*
root
,
Representation
*
rep
);
void
setInitSegment
(
dash
::
xml
::
Node
*
root
,
SegmentInfoCommon
*
info
);
void
setInitSegment
(
dash
::
xml
::
Node
*
root
,
SegmentInfoCommon
*
info
);
bool
setSegments
(
dash
::
xml
::
Node
*
root
,
SegmentInfo
*
info
);
bool
setSegments
(
dash
::
xml
::
Node
*
root
,
SegmentInfo
*
info
);
bool
resolveUrlTemplates
(
std
::
string
&
url
,
bool
&
containRuntimeToken
);
void
setMPDBaseUrl
(
dash
::
xml
::
Node
*
root
);
void
setMPDBaseUrl
(
dash
::
xml
::
Node
*
root
);
void
parseContentDescriptor
(
xml
::
Node
*
node
,
const
std
::
string
&
name
,
void
parseContentDescriptor
(
xml
::
Node
*
node
,
const
std
::
string
&
name
,
void
(
CommonAttributesElements
::*
addPtr
)(
ContentDescription
*
),
void
(
CommonAttributesElements
::*
addPtr
)(
ContentDescription
*
),
...
@@ -73,7 +74,7 @@ namespace dash
...
@@ -73,7 +74,7 @@ namespace dash
bool
parseCommonAttributesElements
(
dash
::
xml
::
Node
*
node
,
bool
parseCommonAttributesElements
(
dash
::
xml
::
Node
*
node
,
CommonAttributesElements
*
common
,
CommonAttributesElements
*
common
,
CommonAttributesElements
*
parent
)
const
;
CommonAttributesElements
*
parent
)
const
;
bool
parseSegment
(
Segment
*
seg
,
const
std
::
map
<
std
::
string
,
std
::
string
>
&
attr
);
Segment
*
parseSegment
(
xml
::
Node
*
node
);
ProgramInformation
*
parseProgramInformation
();
ProgramInformation
*
parseProgramInformation
();
private:
private:
...
@@ -81,6 +82,7 @@ namespace dash
...
@@ -81,6 +82,7 @@ namespace dash
MPD
*
mpd
;
MPD
*
mpd
;
std
::
string
url
;
std
::
string
url
;
stream_t
*
p_stream
;
stream_t
*
p_stream
;
Representation
*
currentRepresentation
;
};
};
}
}
}
}
...
...
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