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
9ac96f62
Commit
9ac96f62
authored
Jul 23, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hds: remove suspicious peek callback
parent
2c2d5073
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
48 deletions
+3
-48
modules/stream_filter/hds/hds.c
modules/stream_filter/hds/hds.c
+3
-48
No files found.
modules/stream_filter/hds/hds.c
View file @
9ac96f62
...
@@ -217,7 +217,6 @@ vlc_module_begin()
...
@@ -217,7 +217,6 @@ vlc_module_begin()
vlc_module_end
()
vlc_module_end
()
static
int
Read
(
stream_t
*
,
void
*
,
unsigned
);
static
int
Read
(
stream_t
*
,
void
*
,
unsigned
);
static
int
Peek
(
stream_t
*
,
const
uint8_t
**
,
unsigned
);
static
int
Control
(
stream_t
*
,
int
,
va_list
);
static
int
Control
(
stream_t
*
,
int
,
va_list
);
static
inline
bool
isFQUrl
(
const
char
*
url
)
static
inline
bool
isFQUrl
(
const
char
*
url
)
...
@@ -1665,7 +1664,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -1665,7 +1664,6 @@ static int Open( vlc_object_t *p_this )
}
}
s
->
pf_read
=
Read
;
s
->
pf_read
=
Read
;
s
->
pf_peek
=
Peek
;
s
->
pf_control
=
Control
;
s
->
pf_control
=
Control
;
if
(
vlc_clone
(
&
p_sys
->
dl_thread
,
download_thread
,
s
,
VLC_THREAD_PRIORITY_INPUT
)
)
if
(
vlc_clone
(
&
p_sys
->
dl_thread
,
download_thread
,
s
,
VLC_THREAD_PRIORITY_INPUT
)
)
...
@@ -1715,7 +1713,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -1715,7 +1713,7 @@ static void Close( vlc_object_t *p_this )
}
}
static
int
send_flv_header
(
hds_stream_t
*
stream
,
stream_sys_t
*
p_sys
,
static
int
send_flv_header
(
hds_stream_t
*
stream
,
stream_sys_t
*
p_sys
,
void
*
buffer
,
unsigned
i_read
,
bool
peek
)
void
*
buffer
,
unsigned
i_read
)
{
{
if
(
!
p_sys
->
flv_header
)
if
(
!
p_sys
->
flv_header
)
{
{
...
@@ -1731,10 +1729,7 @@ static int send_flv_header( hds_stream_t *stream, stream_sys_t* p_sys,
...
@@ -1731,10 +1729,7 @@ static int send_flv_header( hds_stream_t *stream, stream_sys_t* p_sys,
memcpy
(
buffer
,
p_sys
->
flv_header
+
p_sys
->
flv_header_bytes_sent
,
to_be_read
);
memcpy
(
buffer
,
p_sys
->
flv_header
+
p_sys
->
flv_header_bytes_sent
,
to_be_read
);
if
(
!
peek
)
p_sys
->
flv_header_bytes_sent
+=
to_be_read
;
{
p_sys
->
flv_header_bytes_sent
+=
to_be_read
;
}
return
to_be_read
;
return
to_be_read
;
}
}
...
@@ -1861,7 +1856,7 @@ static int Read( stream_t *s, void *buffer, unsigned i_read )
...
@@ -1861,7 +1856,7 @@ static int Read( stream_t *s, void *buffer, unsigned i_read )
if
(
header_unfinished
(
p_sys
)
)
if
(
header_unfinished
(
p_sys
)
)
{
{
unsigned
hdr_bytes
=
send_flv_header
(
stream
,
p_sys
,
buffer
,
i_read
,
false
);
unsigned
hdr_bytes
=
send_flv_header
(
stream
,
p_sys
,
buffer
,
i_read
);
length
+=
hdr_bytes
;
length
+=
hdr_bytes
;
i_read
-=
hdr_bytes
;
i_read
-=
hdr_bytes
;
buffer_uint8
+=
hdr_bytes
;
buffer_uint8
+=
hdr_bytes
;
...
@@ -1880,46 +1875,6 @@ static int Read( stream_t *s, void *buffer, unsigned i_read )
...
@@ -1880,46 +1875,6 @@ static int Read( stream_t *s, void *buffer, unsigned i_read )
return
length
;
return
length
;
}
}
static
int
Peek
(
stream_t
*
s
,
const
uint8_t
**
pp_peek
,
unsigned
i_peek
)
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
if
(
vlc_array_count
(
p_sys
->
hds_streams
)
==
0
)
return
0
;
// TODO: change here for selectable stream
hds_stream_t
*
stream
=
p_sys
->
hds_streams
->
pp_elems
[
0
];
if
(
!
p_sys
->
flv_header
)
{
initialize_header_and_metadata
(
p_sys
,
stream
);
}
if
(
header_unfinished
(
p_sys
)
)
{
*
pp_peek
=
p_sys
->
flv_header
+
p_sys
->
flv_header_bytes_sent
;
return
p_sys
->
flv_header_len
-
p_sys
->
flv_header_bytes_sent
;
}
if
(
stream
->
chunks_head
&&
!
stream
->
chunks_head
->
failed
&&
stream
->
chunks_head
->
data
)
{
// TODO: change here for selectable stream
chunk_t
*
chunk
=
stream
->
chunks_head
;
*
pp_peek
=
chunk
->
mdat_data
+
chunk
->
mdat_pos
;
if
(
chunk
->
mdat_len
-
chunk
->
mdat_pos
<
i_peek
)
{
return
chunk
->
mdat_len
-
chunk
->
mdat_pos
;
}
else
{
return
i_peek
;
}
}
else
{
return
0
;
}
}
static
int
Control
(
stream_t
*
s
,
int
i_query
,
va_list
args
)
static
int
Control
(
stream_t
*
s
,
int
i_query
,
va_list
args
)
{
{
switch
(
i_query
)
switch
(
i_query
)
...
...
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