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
06b981f8
Commit
06b981f8
authored
Apr 28, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: dash: move debug to playlist
parent
a98cee48
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
25 deletions
+28
-25
modules/demux/adaptative/playlist/AbstractPlaylist.hpp
modules/demux/adaptative/playlist/AbstractPlaylist.hpp
+1
-0
modules/demux/dash/mpd/IsoffMainParser.cpp
modules/demux/dash/mpd/IsoffMainParser.cpp
+2
-24
modules/demux/dash/mpd/IsoffMainParser.h
modules/demux/dash/mpd/IsoffMainParser.h
+0
-1
modules/demux/dash/mpd/MPD.cpp
modules/demux/dash/mpd/MPD.cpp
+24
-0
modules/demux/dash/mpd/MPD.h
modules/demux/dash/mpd/MPD.h
+1
-0
No files found.
modules/demux/adaptative/playlist/AbstractPlaylist.hpp
View file @
06b981f8
...
@@ -42,6 +42,7 @@ namespace adaptative
...
@@ -42,6 +42,7 @@ namespace adaptative
virtual
bool
isLive
()
const
=
0
;
virtual
bool
isLive
()
const
=
0
;
void
setType
(
const
std
::
string
&
);
void
setType
(
const
std
::
string
&
);
virtual
void
debug
()
=
0
;
void
addPeriod
(
BasePeriod
*
period
);
void
addPeriod
(
BasePeriod
*
period
);
void
addBaseUrl
(
BaseUrl
*
url
);
void
addBaseUrl
(
BaseUrl
*
url
);
...
...
modules/demux/dash/mpd/IsoffMainParser.cpp
View file @
06b981f8
...
@@ -64,7 +64,8 @@ bool IsoffMainParser::parse (Profile profile)
...
@@ -64,7 +64,8 @@ bool IsoffMainParser::parse (Profile profile)
setMPDBaseUrl
(
root
);
setMPDBaseUrl
(
root
);
parsePeriods
(
root
);
parsePeriods
(
root
);
print
();
if
(
mpd
)
mpd
->
debug
();
return
true
;
return
true
;
}
}
...
@@ -430,29 +431,6 @@ void IsoffMainParser::parseProgramInformation(Node * node, MPD *mpd)
...
@@ -430,29 +431,6 @@ void IsoffMainParser::parseProgramInformation(Node * node, MPD *mpd)
}
}
}
}
void
IsoffMainParser
::
print
()
{
if
(
mpd
)
{
msg_Dbg
(
p_stream
,
"MPD profile=%s mediaPresentationDuration=%ld minBufferTime=%ld"
,
static_cast
<
std
::
string
>
(
mpd
->
getProfile
()).
c_str
(),
mpd
->
duration
.
Get
(),
mpd
->
minBufferTime
.
Get
());
msg_Dbg
(
p_stream
,
"BaseUrl=%s"
,
mpd
->
getUrlSegment
().
toString
().
c_str
());
std
::
vector
<
BasePeriod
*>::
const_iterator
i
;
for
(
i
=
mpd
->
getPeriods
().
begin
();
i
!=
mpd
->
getPeriods
().
end
();
i
++
)
{
std
::
vector
<
std
::
string
>
debug
=
(
*
i
)
->
toString
();
std
::
vector
<
std
::
string
>::
const_iterator
l
;
for
(
l
=
debug
.
begin
();
l
<
debug
.
end
();
l
++
)
{
msg_Dbg
(
p_stream
,
"%s"
,
(
*
l
).
c_str
());
}
}
}
}
IsoTime
::
IsoTime
(
const
std
::
string
&
str
)
IsoTime
::
IsoTime
(
const
std
::
string
&
str
)
{
{
time
=
str_duration
(
str
.
c_str
());
time
=
str_duration
(
str
.
c_str
());
...
...
modules/demux/dash/mpd/IsoffMainParser.h
View file @
06b981f8
...
@@ -61,7 +61,6 @@ namespace dash
...
@@ -61,7 +61,6 @@ namespace dash
virtual
~
IsoffMainParser
();
virtual
~
IsoffMainParser
();
bool
parse
(
Profile
profile
);
bool
parse
(
Profile
profile
);
void
print
();
private:
private:
void
setMPDAttributes
();
void
setMPDAttributes
();
...
...
modules/demux/dash/mpd/MPD.cpp
View file @
06b981f8
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
#include "MPD.h"
#include "MPD.h"
#include "ProgramInformation.h"
#include "ProgramInformation.h"
#include "Period.h"
#include <vlc_common.h>
#include <vlc_stream.h>
using
namespace
dash
::
mpd
;
using
namespace
dash
::
mpd
;
...
@@ -57,3 +61,23 @@ Profile MPD::getProfile() const
...
@@ -57,3 +61,23 @@ Profile MPD::getProfile() const
{
{
return
profile
;
return
profile
;
}
}
void
MPD
::
debug
()
{
msg_Dbg
(
stream
,
"MPD profile=%s mediaPresentationDuration=%ld minBufferTime=%ld"
,
static_cast
<
std
::
string
>
(
getProfile
()).
c_str
(),
duration
.
Get
(),
minBufferTime
.
Get
());
msg_Dbg
(
stream
,
"BaseUrl=%s"
,
getUrlSegment
().
toString
().
c_str
());
std
::
vector
<
BasePeriod
*>::
const_iterator
i
;
for
(
i
=
getPeriods
().
begin
();
i
!=
getPeriods
().
end
();
i
++
)
{
std
::
vector
<
std
::
string
>
debug
=
(
*
i
)
->
toString
();
std
::
vector
<
std
::
string
>::
const_iterator
l
;
for
(
l
=
debug
.
begin
();
l
<
debug
.
end
();
l
++
)
{
msg_Dbg
(
stream
,
"%s"
,
(
*
l
).
c_str
());
}
}
}
modules/demux/dash/mpd/MPD.h
View file @
06b981f8
...
@@ -44,6 +44,7 @@ namespace dash
...
@@ -44,6 +44,7 @@ namespace dash
Profile
getProfile
()
const
;
Profile
getProfile
()
const
;
virtual
bool
isLive
()
const
;
virtual
bool
isLive
()
const
;
virtual
void
debug
();
Property
<
ProgramInformation
*>
programInfo
;
Property
<
ProgramInformation
*>
programInfo
;
...
...
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