From: Paul B Mahol <onemda@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH] avcodec/ac3dec: downmix for 7.1 eac3
Date: Tue, 20 Sep 2022 17:06:11 +0200
Message-ID: <CAPYw7P67zJAqPeoPX4DLPu65kE-KjBkY7UA3eONjgrzkyGur_Q@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 16 bytes --]
Patch attached.
[-- Attachment #2: 0001-avcodec-ac3dec-add-downmix-support-for-mono-and-ster.patch --]
[-- Type: text/x-patch, Size: 4211 bytes --]
From 3f33e226b36a0a186e070d743d2c5686c5995a0e Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Tue, 20 Sep 2022 17:07:15 +0200
Subject: [PATCH] avcodec/ac3dec: add downmix support for mono and stereo for
eac3 7.1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavcodec/ac3dec.c | 55 ++++++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 23 deletions(-)
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 5d0add40fe..f628eae33c 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -183,6 +183,33 @@ static av_cold void ac3_tables_init(void)
#endif
}
+static void ac3_downmix(AVCodecContext *avctx)
+{
+ AC3DecodeContext *s = avctx->priv_data;
+ const AVChannelLayout mono = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
+ const AVChannelLayout stereo = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
+
+ /* allow downmixing to stereo or mono */
+#if FF_API_OLD_CHANNEL_LAYOUT
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (avctx->request_channel_layout) {
+ av_channel_layout_uninit(&s->downmix_layout);
+ av_channel_layout_from_mask(&s->downmix_layout, avctx->request_channel_layout);
+ }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ if (avctx->ch_layout.nb_channels > 1 &&
+ !av_channel_layout_compare(&s->downmix_layout, &mono)) {
+ av_channel_layout_uninit(&avctx->ch_layout);
+ avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
+ } else if (avctx->ch_layout.nb_channels > 2 &&
+ !av_channel_layout_compare(&s->downmix_layout, &stereo)) {
+ av_channel_layout_uninit(&avctx->ch_layout);
+ avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
+ }
+ s->downmixed = 1;
+}
+
/**
* AVCodec initialization
*/
@@ -190,8 +217,6 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
{
static AVOnce init_static_once = AV_ONCE_INIT;
AC3DecodeContext *s = avctx->priv_data;
- const AVChannelLayout mono = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
- const AVChannelLayout stereo = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
int i, ret;
s->avctx = avctx;
@@ -219,25 +244,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
else
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
- /* allow downmixing to stereo or mono */
-#if FF_API_OLD_CHANNEL_LAYOUT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (avctx->request_channel_layout) {
- av_channel_layout_uninit(&s->downmix_layout);
- av_channel_layout_from_mask(&s->downmix_layout, avctx->request_channel_layout);
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
- if (avctx->ch_layout.nb_channels > 1 &&
- !av_channel_layout_compare(&s->downmix_layout, &mono)) {
- av_channel_layout_uninit(&avctx->ch_layout);
- avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
- } else if (avctx->ch_layout.nb_channels > 2 &&
- !av_channel_layout_compare(&s->downmix_layout, &stereo)) {
- av_channel_layout_uninit(&avctx->ch_layout);
- avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
- }
- s->downmixed = 1;
+ ac3_downmix(avctx);
for (i = 0; i < AC3_MAX_CHANNELS; i++) {
s->xcfptr[i] = s->transform_coeffs[i];
@@ -1751,7 +1758,7 @@ skip:
if (index < 0)
return AVERROR_INVALIDDATA;
if (extend >= channel_map_size)
- return AVERROR_INVALIDDATA;
+ break;
extended_channel_map[index] = offset + channel_map[extend++];
} else {
@@ -1763,7 +1770,7 @@ skip:
if (index < 0)
return AVERROR_INVALIDDATA;
if (extend >= channel_map_size)
- return AVERROR_INVALIDDATA;
+ break;
extended_channel_map[index] = offset + channel_map[extend++];
}
@@ -1771,6 +1778,8 @@ skip:
}
}
}
+
+ ac3_downmix(avctx);
}
/* get output buffer */
--
2.37.2
[-- Attachment #3: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
reply other threads:[~2022-09-20 15:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=CAPYw7P67zJAqPeoPX4DLPu65kE-KjBkY7UA3eONjgrzkyGur_Q@mail.gmail.com \
--to=onemda@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