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
6b984f72
Commit
6b984f72
authored
Jan 25, 2012
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: Fixing STREAM_GET_SIZE control query.
parent
e7a13d6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
modules/stream_filter/dash/DASHManager.cpp
modules/stream_filter/dash/DASHManager.cpp
+5
-0
modules/stream_filter/dash/DASHManager.h
modules/stream_filter/dash/DASHManager.h
+1
-0
modules/stream_filter/dash/dash.cpp
modules/stream_filter/dash/dash.cpp
+12
-1
modules/stream_filter/dash/mpd/SegmentTemplate.h
modules/stream_filter/dash/mpd/SegmentTemplate.h
+0
-1
No files found.
modules/stream_filter/dash/DASHManager.cpp
View file @
6b984f72
...
...
@@ -109,3 +109,8 @@ const logic::IAdaptationLogic* DASHManager::getAdaptionLogic() const
{
return
this
->
adaptationLogic
;
}
const
Chunk
*
DASHManager
::
getCurrentChunk
()
const
{
return
this
->
currentChunk
;
}
modules/stream_filter/dash/DASHManager.h
View file @
6b984f72
...
...
@@ -47,6 +47,7 @@ namespace dash
int
peek
(
const
uint8_t
**
pp_peek
,
size_t
i_peek
);
const
mpd
::
IMPDManager
*
getMpdManager
()
const
;
const
logic
::
IAdaptationLogic
*
getAdaptionLogic
()
const
;
const
http
::
Chunk
*
getCurrentChunk
()
const
;
private:
http
::
HTTPConnectionManager
*
conManager
;
...
...
modules/stream_filter/dash/dash.cpp
View file @
6b984f72
...
...
@@ -199,9 +199,20 @@ static int Control (stream_t *p_stream, int i_query, va_list args)
case
STREAM_SET_POSITION
:
return
VLC_EGENERIC
;
case
STREAM_GET_SIZE
:
{
uint64_t
*
res
=
(
va_arg
(
args
,
uint64_t
*
));
if
(
p_sys
->
isLive
)
*
(
va_arg
(
args
,
uint64_t
*
))
=
0
;
*
res
=
0
;
else
{
const
dash
::
mpd
::
Representation
*
rep
=
p_sys
->
p_dashManager
->
getAdaptionLogic
()
->
getCurrentRepresentation
();
if
(
rep
==
NULL
)
*
res
=
0
;
else
*
res
=
p_sys
->
p_mpd
->
getDuration
()
*
rep
->
getBandwidth
();
}
break
;
}
default:
return
VLC_EGENERIC
;
}
...
...
modules/stream_filter/dash/mpd/SegmentTemplate.h
View file @
6b984f72
...
...
@@ -42,7 +42,6 @@ namespace dash
virtual
void
done
();
private:
bool
containRuntimeIdentifier
;
Representation
*
representation
;
size_t
beginTime
;
size_t
beginIndex
;
int
currentSegmentIndex
;
...
...
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