[vlc-devel] [PATCH 3/5] mux: remove dead GET_STREAM_ADD_WAIT code

[Steve Lhomme]

I don't fully understand what MUX_GET_ADD_STREAM_WAIT does but when returning true the log is
"muxer prefers to wait for all ES before starting to mux"

That's seems right for WAV and AVI at least.

> On March 1, 2020 12:22 PM Rémi Denis-Courmont <remi at remlab.net> wrote:
> 
>  
> This makes no sense in a muxer which does not support adding streams
> while muxing.
> ---
>  modules/demux/avformat/mux.c | 5 -----
>  modules/mux/avi.c            | 5 -----
>  modules/mux/wav.c            | 5 -----
>  3 files changed, 15 deletions(-)
> 
> diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
> index 161aeabb8c..9179daf592 100644
> --- a/modules/demux/avformat/mux.c
> +++ b/modules/demux/avformat/mux.c
> @@ -496,11 +496,6 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args )
>          *pb_bool = false;
>          return VLC_SUCCESS;
>  
> -    case MUX_GET_ADD_STREAM_WAIT:
> -        pb_bool = va_arg( args, bool * );
> -        *pb_bool = true;
> -        return VLC_SUCCESS;
> -
>      case MUX_GET_MIME:
>      {
>          char **ppsz = va_arg( args, char ** );
> diff --git a/modules/mux/avi.c b/modules/mux/avi.c
> index b545954aa1..844d983b42 100644
> --- a/modules/mux/avi.c
> +++ b/modules/mux/avi.c
> @@ -280,11 +280,6 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args )
>             *pb_bool = false;
>             return VLC_SUCCESS;
>  
> -       case MUX_GET_ADD_STREAM_WAIT:
> -           pb_bool = va_arg( args, bool * );
> -           *pb_bool = true;
> -           return VLC_SUCCESS;
> -
>         case MUX_GET_MIME:
>             ppsz = va_arg( args, char ** );
>             *ppsz = strdup( "video/avi" );
> diff --git a/modules/mux/wav.c b/modules/mux/wav.c
> index 8bacf9b9f0..a80e916e89 100644
> --- a/modules/mux/wav.c
> +++ b/modules/mux/wav.c
> @@ -138,11 +138,6 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args )
>              *pb_bool = false;
>              return VLC_SUCCESS;
>  
> -        case MUX_GET_ADD_STREAM_WAIT:
> -            pb_bool = va_arg( args, bool * );
> -            *pb_bool = true;
> -            return VLC_SUCCESS;
> -
>          case MUX_GET_MIME:
>              ppsz = va_arg( args, char ** );
>              *ppsz = strdup( "audio/wav" );
> -- 
> 2.20.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel