[vlc-devel] [RFC PATCH 5/9] input: change InputDemuxNew arguments

[Rémi Denis-Courmont]

Le keskiviikkona 12. helmikuuta 2020, 16.43.23 EET Thomas Guillem a écrit :
> In order to be able to specify a es_out_t per input_source_t.

While I fully agree that this is required - and not only to disambiguate ES 
identifiers - I am very confused about the roles of es_out and es_out_ctx at 
this point in the patch series ??

> ---
>  src/input/input.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/input/input.c b/src/input/input.c
> index 7ba4f0d9f97..9aee8b09d8e 100644
> --- a/src/input/input.c
> +++ b/src/input/input.c
> @@ -2425,7 +2425,7 @@ InputStreamHandleAnchor( input_thread_t *p_input,
> input_source_t *source, return VLC_SUCCESS;
>  }
> 
> -static demux_t *InputDemuxNew( input_thread_t *p_input,
> +static demux_t *InputDemuxNew( input_thread_t *p_input, es_out_t *p_es_out,
> input_source_t *p_source, const char *url, const char *psz_demux, const
> char *psz_anchor ) {
> @@ -2433,7 +2433,7 @@ static demux_t *InputDemuxNew( input_thread_t
> *p_input, vlc_object_t *obj = VLC_OBJECT(p_input);
> 
>      /* create the underlying access stream */
> -    stream_t *p_stream = stream_AccessNew( obj, p_input, priv->p_es_out,
> +    stream_t *p_stream = stream_AccessNew( obj, p_input, p_es_out,
>                                             priv->b_preparsing, url );
>      if( p_stream == NULL )
>          return NULL;
> @@ -2467,7 +2467,7 @@ static demux_t *InputDemuxNew( input_thread_t
> *p_input,
> 
>      /* create a regular demux with the access stream created */
>      demux_t *demux = demux_NewAdvanced( obj, p_input, psz_demux, url,
> p_stream, -                                        priv->p_es_out,
> priv->b_preparsing ); +                                        p_es_out,
> priv->b_preparsing ); if( demux != NULL )
>          return demux;
> 
> @@ -2574,7 +2574,8 @@ static input_source_t *InputSourceNew( input_thread_t
> *p_input, char *url;
>      if( likely(asprintf( &url, "%s://%s", psz_access, psz_path ) >= 0) )
>      {
> -        in->p_demux = InputDemuxNew( p_input, in, url, psz_demux,
> psz_anchor ); +        in->p_demux = InputDemuxNew( p_input,
> priv->p_es_out, in, url, +                                     psz_demux,
> psz_anchor );
>          free( url );
>      }
>      else


-- 
Реми Дёни-Курмон
http://www.remlab.net/