Commit 631a4861 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Make access_out independent of sout instance

parent 42051dfb
...@@ -100,7 +100,6 @@ struct sout_access_out_t ...@@ -100,7 +100,6 @@ struct sout_access_out_t
int (*pf_control)( sout_access_out_t *, int, va_list); int (*pf_control)( sout_access_out_t *, int, va_list);
config_chain_t *p_cfg; config_chain_t *p_cfg;
sout_instance_t *p_sout;
}; };
enum access_out_query_e enum access_out_query_e
......
...@@ -1727,7 +1727,6 @@ static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream ) ...@@ -1727,7 +1727,6 @@ static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream )
return NULL; return NULL;
p_grab->p_module = NULL; p_grab->p_module = NULL;
p_grab->p_sout = p_stream->p_sout;
p_grab->psz_access = strdup( "grab" ); p_grab->psz_access = strdup( "grab" );
p_grab->p_cfg = NULL; p_grab->p_cfg = NULL;
p_grab->psz_path = strdup( "" ); p_grab->psz_path = strdup( "" );
......
...@@ -307,7 +307,6 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout, ...@@ -307,7 +307,6 @@ sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
psz_access ); psz_access );
free( psz_next ); free( psz_next );
p_access->psz_path = strdup( psz_name ? psz_name : "" ); p_access->psz_path = strdup( psz_name ? psz_name : "" );
p_access->p_sout = p_sout;
p_access->p_sys = NULL; p_access->p_sys = NULL;
p_access->pf_seek = NULL; p_access->pf_seek = NULL;
p_access->pf_read = NULL; p_access->pf_read = NULL;
...@@ -375,6 +374,7 @@ ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) ...@@ -375,6 +374,7 @@ ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer )
*****************************************************************************/ *****************************************************************************/
ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
{ {
#if 0
const unsigned i_packets_gather = 30; const unsigned i_packets_gather = 30;
p_access->i_writes++; p_access->i_writes++;
p_access->i_sent_bytes += p_buffer->i_buffer; p_access->i_sent_bytes += p_buffer->i_buffer;
...@@ -384,6 +384,7 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) ...@@ -384,6 +384,7 @@ ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer )
sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes ); sout_UpdateStatistic( p_access->p_sout, SOUT_STATISTIC_SENT_BYTE, p_access->i_sent_bytes );
p_access->i_sent_bytes = 0; p_access->i_sent_bytes = 0;
} }
#endif
return p_access->pf_write( p_access, p_buffer ); return p_access->pf_write( p_access, p_buffer );
} }
......
Supports Markdown
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