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
4501129e
Commit
4501129e
authored
Jul 26, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adaptive: use demux path rather than stream filter
parent
74e5edbf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
modules/demux/adaptative/adaptative.cpp
modules/demux/adaptative/adaptative.cpp
+1
-1
modules/demux/dash/DASHManager.cpp
modules/demux/dash/DASHManager.cpp
+2
-2
modules/demux/hls/HLSManager.cpp
modules/demux/hls/HLSManager.cpp
+2
-2
No files found.
modules/demux/adaptative/adaptative.cpp
View file @
4501129e
...
@@ -162,7 +162,7 @@ static int Open(vlc_object_t *p_obj)
...
@@ -162,7 +162,7 @@ static int Open(vlc_object_t *p_obj)
p_demux
->
pf_demux
=
p_manager
->
demux_callback
;
p_demux
->
pf_demux
=
p_manager
->
demux_callback
;
p_demux
->
pf_control
=
p_manager
->
control_callback
;
p_demux
->
pf_control
=
p_manager
->
control_callback
;
msg_Dbg
(
p_obj
,
"opening playlist file (%s)"
,
p_demux
->
s
->
psz_path
);
msg_Dbg
(
p_obj
,
"opening playlist file (%s)"
,
p_demux
->
psz_location
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
modules/demux/dash/DASHManager.cpp
View file @
4501129e
...
@@ -85,9 +85,9 @@ bool DASHManager::updatePlaylist()
...
@@ -85,9 +85,9 @@ bool DASHManager::updatePlaylist()
/* do update */
/* do update */
if
(
nextPlaylistupdate
)
if
(
nextPlaylistupdate
)
{
{
std
::
string
url
(
p_demux
->
s
->
psz_access
);
std
::
string
url
(
p_demux
->
psz_access
);
url
.
append
(
"://"
);
url
.
append
(
"://"
);
url
.
append
(
p_demux
->
s
->
psz_path
);
url
.
append
(
p_demux
->
psz_location
);
uint8_t
*
p_data
=
NULL
;
uint8_t
*
p_data
=
NULL
;
size_t
i_data
=
Retrieve
::
HTTP
(
VLC_OBJECT
(
p_demux
->
s
),
url
,
(
void
**
)
&
p_data
);
size_t
i_data
=
Retrieve
::
HTTP
(
VLC_OBJECT
(
p_demux
->
s
),
url
,
(
void
**
)
&
p_data
);
...
...
modules/demux/hls/HLSManager.cpp
View file @
4501129e
...
@@ -137,9 +137,9 @@ bool HLSManager::updatePlaylist()
...
@@ -137,9 +137,9 @@ bool HLSManager::updatePlaylist()
/* do update */
/* do update */
if
(
nextPlaylistupdate
)
if
(
nextPlaylistupdate
)
{
{
std
::
string
url
(
p_demux
->
s
->
psz_access
);
std
::
string
url
(
p_demux
->
psz_access
);
url
.
append
(
"://"
);
url
.
append
(
"://"
);
url
.
append
(
p_demux
->
s
->
psz_path
);
url
.
append
(
p_demux
->
psz_location
);
uint8_t
*
p_data
=
NULL
;
uint8_t
*
p_data
=
NULL
;
size_t
i_data
=
Retrieve
::
HTTP
(
VLC_OBJECT
(
p_demux
->
s
),
url
,
(
void
**
)
&
p_data
);
size_t
i_data
=
Retrieve
::
HTTP
(
VLC_OBJECT
(
p_demux
->
s
),
url
,
(
void
**
)
&
p_data
);
...
...
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