Commit 38f24cc8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

stream: re-use existing input pointer for statistics

parent 54526620
...@@ -1680,14 +1680,10 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) ...@@ -1680,14 +1680,10 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read )
{ {
stream_sys_t *p_sys = s->p_sys; stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access; access_t *p_access = p_sys->p_access;
input_thread_t *p_input = NULL; input_thread_t *p_input = s->p_input;
int i_read_orig = i_read; int i_read_orig = i_read;
int i_total = 0; int i_total = 0;
if( s->p_parent && s->p_parent->p_parent &&
vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT )
p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list ) if( !p_sys->i_list )
{ {
i_read = p_access->pf_read( p_access, p_read, i_read ); i_read = p_access->pf_read( p_access, p_read, i_read );
...@@ -1749,15 +1745,11 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) ...@@ -1749,15 +1745,11 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
{ {
stream_sys_t *p_sys = s->p_sys; stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access; access_t *p_access = p_sys->p_access;
input_thread_t *p_input = NULL; input_thread_t *p_input = s->p_input;
block_t *p_block; block_t *p_block;
bool b_eof; bool b_eof;
int i_total = 0; int i_total = 0;
if( s->p_parent && s->p_parent->p_parent &&
vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT )
p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list ) if( !p_sys->i_list )
{ {
p_block = p_access->pf_block( p_access ); p_block = p_access->pf_block( p_access );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment