Re: [FFmpeg-devel] [PATCH 3/4] wavpack: check number of channels

2014-08-22 Thread Paul B Mahol
On 8/22/14, Christophe Gisquet  wrote:
> This means container and codec disagree. The codec is supposed to
> know better so this could be an error instead.
> ---
>  libavcodec/wavpack.c | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
> index 9f72ebe..1ad3901 100644
> --- a/libavcodec/wavpack.c
> +++ b/libavcodec/wavpack.c
> @@ -906,7 +906,10 @@ static int wavpack_decode_block(AVCodecContext *avctx,
> int block_no,
>  chmask = bytestream2_get_le32(&gb);
>  break;
>  case 5:
> -bytestream2_skip(&gb, 1);
> +size = bytestream2_get_byte(&gb);
> +if (avctx->channels != size)
> +av_log(avctx, AV_LOG_WARNING, "%i channels signalled"
> +   " instead of %i.\n", size, avctx->channels);
>  chan  |= (bytestream2_get_byte(&gb) & 0xF) << 8;
>  chmask = bytestream2_get_le16(&gb);
>  break;
> --
> 1.9.2.msysgit.0
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

lgtm
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH 3/4] wavpack: check number of channels

2014-08-22 Thread Christophe Gisquet
This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.
---
 libavcodec/wavpack.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 9f72ebe..1ad3901 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -906,7 +906,10 @@ static int wavpack_decode_block(AVCodecContext *avctx, int 
block_no,
 chmask = bytestream2_get_le32(&gb);
 break;
 case 5:
-bytestream2_skip(&gb, 1);
+size = bytestream2_get_byte(&gb);
+if (avctx->channels != size)
+av_log(avctx, AV_LOG_WARNING, "%i channels signalled"
+   " instead of %i.\n", size, avctx->channels);
 chan  |= (bytestream2_get_byte(&gb) & 0xF) << 8;
 chmask = bytestream2_get_le16(&gb);
 break;
-- 
1.9.2.msysgit.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel