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
dfd6aafe
Commit
dfd6aafe
authored
Feb 14, 2012
by
Christopher Mueller
Committed by
Hugo Beauzée-Luyssen
Feb 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dash: added buffer size to prefs
Signed-off-by:
Hugo Beauzée-Luyssen
<
beauze.h@gmail.com
>
parent
acbdfcb0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
modules/stream_filter/dash/buffer/BlockBuffer.cpp
modules/stream_filter/dash/buffer/BlockBuffer.cpp
+1
-1
modules/stream_filter/dash/dash.cpp
modules/stream_filter/dash/dash.cpp
+8
-3
No files found.
modules/stream_filter/dash/buffer/BlockBuffer.cpp
View file @
dfd6aafe
...
@@ -36,7 +36,7 @@ BlockBuffer::BlockBuffer (stream_t *stream) :
...
@@ -36,7 +36,7 @@ BlockBuffer::BlockBuffer (stream_t *stream) :
isEOF
(
false
)
isEOF
(
false
)
{
{
this
->
capacityMicroSec
=
var_InheritInteger
(
stream
,
"dash-buffer
S
ize"
)
*
1000000
;
this
->
capacityMicroSec
=
var_InheritInteger
(
stream
,
"dash-buffer
s
ize"
)
*
1000000
;
if
(
this
->
capacityMicroSec
<=
0
)
if
(
this
->
capacityMicroSec
<=
0
)
this
->
capacityMicroSec
=
DEFAULTBUFFERLENGTH
;
this
->
capacityMicroSec
=
DEFAULTBUFFERLENGTH
;
...
...
modules/stream_filter/dash/dash.cpp
View file @
dfd6aafe
...
@@ -54,6 +54,9 @@ static void Close (vlc_object_t *);
...
@@ -54,6 +54,9 @@ static void Close (vlc_object_t *);
#define DASH_HEIGHT_TEXT N_("Preferred Height")
#define DASH_HEIGHT_TEXT N_("Preferred Height")
#define DASH_HEIGHT_LONGTEXT N_("Preferred Height")
#define DASH_HEIGHT_LONGTEXT N_("Preferred Height")
#define DASH_BUFFER_TEXT N_("Buffer Size (Seconds)")
#define DASH_BUFFER_LONGTEXT N_("Buffer size in seconds")
vlc_module_begin
()
vlc_module_begin
()
set_shortname
(
N_
(
"DASH"
))
set_shortname
(
N_
(
"DASH"
))
set_description
(
N_
(
"Dynamic Adaptive Streaming over HTTP"
)
)
set_description
(
N_
(
"Dynamic Adaptive Streaming over HTTP"
)
)
...
@@ -62,6 +65,7 @@ vlc_module_begin ()
...
@@ -62,6 +65,7 @@ vlc_module_begin ()
set_subcategory
(
SUBCAT_INPUT_STREAM_FILTER
)
set_subcategory
(
SUBCAT_INPUT_STREAM_FILTER
)
add_integer
(
"dash-prefwidth"
,
480
,
DASH_WIDTH_TEXT
,
DASH_WIDTH_LONGTEXT
,
true
)
add_integer
(
"dash-prefwidth"
,
480
,
DASH_WIDTH_TEXT
,
DASH_WIDTH_LONGTEXT
,
true
)
add_integer
(
"dash-prefheight"
,
360
,
DASH_HEIGHT_TEXT
,
DASH_HEIGHT_LONGTEXT
,
true
)
add_integer
(
"dash-prefheight"
,
360
,
DASH_HEIGHT_TEXT
,
DASH_HEIGHT_LONGTEXT
,
true
)
add_integer
(
"dash-buffersize"
,
30
,
DASH_BUFFER_TEXT
,
DASH_BUFFER_LONGTEXT
,
true
)
set_callbacks
(
Open
,
Close
)
set_callbacks
(
Open
,
Close
)
vlc_module_end
()
vlc_module_end
()
...
@@ -118,7 +122,8 @@ static int Open(vlc_object_t *p_obj)
...
@@ -118,7 +122,8 @@ static int Open(vlc_object_t *p_obj)
if
(
p_dashManager
->
getMpdManager
()
==
NULL
||
if
(
p_dashManager
->
getMpdManager
()
==
NULL
||
p_dashManager
->
getMpdManager
()
->
getMPD
()
==
NULL
||
p_dashManager
->
getMpdManager
()
->
getMPD
()
==
NULL
||
p_dashManager
->
getAdaptionLogic
()
==
NULL
)
p_dashManager
->
getAdaptionLogic
()
==
NULL
||
p_dashManager
->
start
()
==
false
)
{
{
delete
p_conManager
;
delete
p_conManager
;
delete
p_dashManager
;
delete
p_dashManager
;
...
...
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