Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/decode: Check for more invalid channel counts
Date: Thu, 15 Sep 2022 22:16:06 -0300
Message-ID: <6d0a8d6e-48aa-3afd-78e3-1721d0f49a6d@gmail.com> (raw)
In-Reply-To: <GV1P250MB07376D82B1F1C02E332FBBA38F489@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>

On 9/15/2022 10:10 PM, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> Maybe use av_channel_layout_check?
> 
>   libavcodec/decode.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/decode.c b/libavcodec/decode.c
> index 2961705c9d..e24005cc44 100644
> --- a/libavcodec/decode.c
> +++ b/libavcodec/decode.c
> @@ -1595,7 +1595,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
>   FF_ENABLE_DEPRECATION_WARNINGS
>   #endif
>   
> -    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 &&
> +    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels <= 0 &&
>           !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) {
>           av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n");
>           return AVERROR(EINVAL);

This is a AV_CODEC_CAP_CHANNEL_CONF specific check to see if a channel 
count is set. A general sanity check like < 0 should be in 
avcodec_open2() before the ff_decode_preinit() call, next to (or as part 
of) the similar FF_SANE_NB_CHANNELS check, IMO.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2022-09-16  1:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-16  1:10 Andreas Rheinhardt
2022-09-16  1:11 ` [FFmpeg-devel] [PATCH 2/5] avcodec/dfpwmdec: Remove always-false check Andreas Rheinhardt
2022-09-16  1:11 ` [FFmpeg-devel] [PATCH 3/5] avformat/dfpwmdec: Inline raw_codec_id Andreas Rheinhardt
2022-09-16  1:11 ` [FFmpeg-devel] [PATCH 4/5] avformat/dfpwmdec: Remove unnecessary headers Andreas Rheinhardt
2022-09-16  1:11 ` [FFmpeg-devel] [PATCH 5/5] fate/lavf-audio: Add dfpwm test Andreas Rheinhardt
2022-09-16  1:16 ` James Almer [this message]
2022-09-16 15:02   ` [FFmpeg-devel] [PATCH 1/5] avcodec/decode: Check for more invalid channel counts James Almer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6d0a8d6e-48aa-3afd-78e3-1721d0f49a6d@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git