[vlc-devel] [PATCH] demux/mpeg/ts: decrease diagnostic verbosity

Filip Roséen filip at atch.se
Thu May 18 13:44:19 CEST 2017


The commit subject of the patch which this email is a reply to
inaccurately includes just "ts", where the patch actually affects more
types than just that.

For a future potential merger, could you fix the subject to simply
state "demux/mpeg"?

Best Regards,\
Filip

On 2017-05-18 12:59, Filip Roséen wrote:

> The relevant functions are only called during module probing, as such
> the diagnostics are not worthy of being an "error" if invocation of
> vlc_stream_Peek fails.
> 
> These changes simply decreases the verbosity of the diagnostics from
> error to debug.
> ---
>  modules/demux/mpeg/es.c   | 2 +-
>  modules/demux/mpeg/mpgv.c | 2 +-
>  modules/demux/mpeg/ps.c   | 2 +-
>  modules/demux/mpeg/ts.c   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
> index 84a58c6d15..3fa6b8cfc8 100644
> --- a/modules/demux/mpeg/es.c
> +++ b/modules/demux/mpeg/es.c
> @@ -1062,7 +1062,7 @@ static int AacProbe( demux_t *p_demux, int64_t *pi_offset )
>      /* peek the begining (10 is for adts header) */
>      if( vlc_stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
>      {
> -        msg_Err( p_demux, "cannot peek" );
> +        msg_Dbg( p_demux, "cannot peek" );
>          return VLC_EGENERIC;
>      }
>      if( !strncmp( (char *)p_peek, "ADIF", 4 ) )
> diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
> index 9773d902b5..6a44f27dea 100644
> --- a/modules/demux/mpeg/mpgv.c
> +++ b/modules/demux/mpeg/mpgv.c
> @@ -93,7 +93,7 @@ static int Open( vlc_object_t * p_this )
>  
>      if( vlc_stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
>      {
> -        msg_Err( p_demux, "cannot peek" );
> +        msg_Dbg( p_demux, "cannot peek" );
>          return VLC_EGENERIC;
>      }
>  
> diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
> index c6d564f07b..35cc91b7ba 100644
> --- a/modules/demux/mpeg/ps.c
> +++ b/modules/demux/mpeg/ps.c
> @@ -138,7 +138,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force )
>      i_peek = vlc_stream_Peek( p_demux->s, &p_peek, 16 );
>      if( i_peek < 16 )
>      {
> -        msg_Err( p_demux, "cannot peek" );
> +        msg_Dbg( p_demux, "cannot peek" );
>          return VLC_EGENERIC;
>      }
>  
> diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
> index 10ffda4074..1b100e6dc0 100644
> --- a/modules/demux/mpeg/ts.c
> +++ b/modules/demux/mpeg/ts.c
> @@ -208,7 +208,7 @@ static int DetectPacketSize( demux_t *p_demux, unsigned *pi_header_size, int i_o
>          int i_peek = i_offset + TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
>          if( ( vlc_stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek )
>          {
> -            msg_Err( p_demux, "cannot peek" );
> +            msg_Dbg( p_demux, "cannot peek" );
>              return -1;
>          }
>          if( p_peek[i_offset + i_sync + 1 * TS_PACKET_SIZE_188] == 0x47 &&
> -- 
> 2.12.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170518/932455bd/attachment.html>


More information about the vlc-devel mailing list