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
5cc04d06
Commit
5cc04d06
authored
Nov 28, 2011
by
Hugo Beauzée-Luyssen
Committed by
Jean-Baptiste Kempf
Dec 08, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: Don't hardcode the isLive information.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
0a120d11
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
10 deletions
+22
-10
modules/stream_filter/dash/dash.cpp
modules/stream_filter/dash/dash.cpp
+1
-1
modules/stream_filter/dash/mpd/BasicCMManager.cpp
modules/stream_filter/dash/mpd/BasicCMManager.cpp
+5
-0
modules/stream_filter/dash/mpd/BasicCMManager.h
modules/stream_filter/dash/mpd/BasicCMManager.h
+1
-0
modules/stream_filter/dash/mpd/IMPDManager.h
modules/stream_filter/dash/mpd/IMPDManager.h
+3
-0
modules/stream_filter/dash/mpd/MPD.cpp
modules/stream_filter/dash/mpd/MPD.cpp
+11
-8
modules/stream_filter/dash/mpd/MPD.h
modules/stream_filter/dash/mpd/MPD.h
+1
-1
No files found.
modules/stream_filter/dash/dash.cpp
View file @
5cc04d06
...
...
@@ -106,7 +106,7 @@ static int Open(vlc_object_t *p_obj)
p_sys
->
p_node
=
p_node
;
p_sys
->
p_conManager
=
p_conManager
;
p_sys
->
position
=
0
;
p_sys
->
isLive
=
true
;
p_sys
->
isLive
=
p_dashManager
->
getMpdManager
()
->
getMPD
()
->
isLive
()
;
p_stream
->
p_sys
=
p_sys
;
p_stream
->
pf_read
=
Read
;
p_stream
->
pf_peek
=
Peek
;
...
...
modules/stream_filter/dash/mpd/BasicCMManager.cpp
View file @
5cc04d06
...
...
@@ -158,3 +158,8 @@ Period* BasicCMManager::getNextPeriod (Period *period)
return
NULL
;
}
const
MPD
*
BasicCMManager
::
getMPD
()
const
{
return
this
->
mpd
;
}
modules/stream_filter/dash/mpd/BasicCMManager.h
View file @
5cc04d06
...
...
@@ -57,6 +57,7 @@ namespace dash
Representation
*
getBestRepresentation
(
Period
*
period
);
std
::
vector
<
ISegment
*>
getSegments
(
Representation
*
rep
);
Representation
*
getRepresentation
(
Period
*
period
,
long
bitrate
);
const
MPD
*
getMPD
()
const
;
private:
MPD
*
mpd
;
...
...
modules/stream_filter/dash/mpd/IMPDManager.h
View file @
5cc04d06
...
...
@@ -16,6 +16,8 @@ namespace dash
{
namespace
mpd
{
class
MPD
;
enum
Profile
{
NotValid
,
...
...
@@ -32,6 +34,7 @@ namespace dash
virtual
Representation
*
getBestRepresentation
(
Period
*
period
)
=
0
;
virtual
std
::
vector
<
ISegment
*>
getSegments
(
Representation
*
rep
)
=
0
;
virtual
Representation
*
getRepresentation
(
Period
*
period
,
long
bitrate
)
=
0
;
virtual
const
MPD
*
getMPD
()
const
=
0
;
virtual
~
IMPDManager
(){}
};
}
...
...
modules/stream_filter/dash/mpd/MPD.cpp
View file @
5cc04d06
...
...
@@ -65,14 +65,6 @@ const std::string& MPD::getMinBufferTime () const throw(Attrib
return
it
->
second
;
}
const
std
::
string
&
MPD
::
getType
()
const
throw
(
AttributeNotPresentException
)
{
AttributesMap
::
const_iterator
it
=
this
->
attributes
.
find
(
"type"
);
if
(
it
==
this
->
attributes
.
end
()
)
throw
AttributeNotPresentException
();
return
it
->
second
;
}
const
std
::
string
&
MPD
::
getDuration
()
const
throw
(
AttributeNotPresentException
)
{
AttributesMap
::
const_iterator
it
=
this
->
attributes
.
find
(
"mediaPresentationDuration"
);
...
...
@@ -101,3 +93,14 @@ void MPD::setProgramInformation (ProgramInformation *progInf
{
this
->
programInfo
=
progInfo
;
}
bool
MPD
::
isLive
()
const
{
AttributesMap
::
const_iterator
it
=
this
->
attributes
.
find
(
"mediaPresentationDuration"
);
/*
Standard specifies a default of "On-Demand",
so anything that is not "Live" is "On-Demand"
*/
return
(
it
!=
this
->
attributes
.
end
()
&&
it
->
second
==
"Live"
);
}
modules/stream_filter/dash/mpd/MPD.h
View file @
5cc04d06
...
...
@@ -47,7 +47,7 @@ namespace dash
MPD
(
const
AttributesMap
&
attributes
);
virtual
~
MPD
();
const
std
::
string
&
getType
()
const
throw
(
dash
::
exception
::
AttributeNotPresentException
)
;
bool
isLive
()
const
;
const
std
::
string
&
getDuration
()
const
throw
(
dash
::
exception
::
AttributeNotPresentException
);
const
std
::
string
&
getMinBufferTime
()
const
throw
(
dash
::
exception
::
AttributeNotPresentException
);
const
std
::
vector
<
BaseUrl
*>&
getBaseUrls
()
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