From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 43857412CC for ; Fri, 18 Mar 2022 13:02:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE91B68B098; Fri, 18 Mar 2022 15:02:25 +0200 (EET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 815A868A5BE for ; Fri, 18 Mar 2022 15:02:19 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id u10so11641664wra.9 for ; Fri, 18 Mar 2022 06:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ED1g+Rhh1S1+dmnF2b6xIH+ycBo449N8S4H5CQQ6QCk=; b=jRWp3PTRMVQoq/0+5rzChzld8ayrwhO4KiX1wzBb7qN3QQR5STMOWa2TeokX1ZqTpf Nhj0WI/8LpKkcHMZ8O7P0SbPvUU/ZUIwuevj2Ms+kjQP1LBB5MD8bfH1OqFAeeD9EiBE CjfOJlZavCUASV9dlU8BUopAt/0mWHKWfq1LpApKa6czbw4Y4xi29vKKBHkYtt5nn+Zm 7WjGFqb62NkWR6iyUL82wDoHrp1FhNb/eTW/dLyK4cy2mqr/S9XNDAA1au2JWmR4wkn8 6VGy1o2hoLcp5448T83ABHoAFkEY43ZzIXGzJE+/T5fAnHmREGVoiJRScTXmFVbOOm8k K9Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ED1g+Rhh1S1+dmnF2b6xIH+ycBo449N8S4H5CQQ6QCk=; b=zjhh649eFinflwqEoPD3TpEIuz6kqRuON9Q3iYgw2ujg/6Ei3XR1TaVFHqvYMJnMDq FuNKZAwlm4w4FOrtuCnLfFhC5fKBmdtiNSewcrBLHEdDKmSEwh7aIiBzd0W1UOamuxHT ZNw+RW0/YVFuyq2G241iizZ9egne8/EwsmrkWbzR+9rp5M9lytloROsTcyvGdVCoPZ/L 9d90xSVU4seGprQGnBow3yfEIbiqXxQBhaXooctpaBj43kG8QioEnvf9z9pn2vaSOA80 0fb7/CZgv0Lzf0ETgvU/DJfjkAPMunOnhSnT6QhRokw3rg0IXRXMJCYha+pgUPno5fCF stNg== X-Gm-Message-State: AOAM531fNYGurNZSVHDUXN8zou7zmEVTwaoTSa9/BGzbOvifhvWoOk1F AJ5fwWlvPaaOjNIGX7+XBPm9+d+Q7iA= X-Google-Smtp-Source: ABdhPJzpu/NzdtOHypcVSDR+WmzGN+05OmGm/iGDIbPaSqD1Nt6POqaveMr5mI/DgYOVOV6dXg+pog== X-Received: by 2002:adf:ea0a:0:b0:203:f531:c367 with SMTP id q10-20020adfea0a000000b00203f531c367mr2876838wrm.255.1647608538706; Fri, 18 Mar 2022 06:02:18 -0700 (PDT) Received: from localhost.localdomain ([95.168.121.2]) by smtp.gmail.com with ESMTPSA id y7-20020a5d4ac7000000b00203e4c8bdf1sm4742464wrs.93.2022.03.18.06.02.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:02:18 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Mar 2022 14:04:17 +0100 Message-Id: <20220318130417.47935-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/binkaudio: add support for >2 channels dct codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: As presented in .binka files. Signed-off-by: Paul B Mahol --- libavcodec/binkaudio.c | 50 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index b4ff15beeb..54b7e22854 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -51,13 +51,14 @@ typedef struct BinkAudioContext { int version_b; ///< Bink version 'b' int first; int channels; + int ch_offset; int frame_len; ///< transform size (samples) int overlap_len; ///< overlap size (samples) int block_size; int num_bands; float root; unsigned int bands[26]; - float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block + float previous[6][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block float quant_table[96]; AVPacket *pkt; union { @@ -74,6 +75,7 @@ static av_cold int decode_init(AVCodecContext *avctx) int sample_rate_half; int i, ret; int frame_len_bits; + int max_channels = avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT ? MAX_CHANNELS : 6; int channels = avctx->ch_layout.nb_channels; /* determine frame length */ @@ -85,7 +87,7 @@ static av_cold int decode_init(AVCodecContext *avctx) frame_len_bits = 11; } - if (channels < 1 || channels > MAX_CHANNELS) { + if (channels < 1 || channels > max_channels) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n", channels); return AVERROR_INVALIDDATA; } @@ -110,7 +112,7 @@ static av_cold int decode_init(AVCodecContext *avctx) s->frame_len = 1 << frame_len_bits; s->overlap_len = s->frame_len / 16; - s->block_size = (s->frame_len - s->overlap_len) * s->channels; + s->block_size = (s->frame_len - s->overlap_len) * FFMIN(MAX_CHANNELS, s->channels); sample_rate_half = (sample_rate + 1LL) / 2; if (avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) s->root = 2.0 / (sqrt(s->frame_len) * 32768.0); @@ -166,7 +168,8 @@ static const uint8_t rle_length_tab[16] = { * @param[out] out Output buffer (must contain s->block_size elements) * @return 0 on success, negative error code on failure */ -static int decode_block(BinkAudioContext *s, float **out, int use_dct) +static int decode_block(BinkAudioContext *s, float **out, int use_dct, + int channels, int ch_offset) { int ch, i, j, k; float q, quant[25]; @@ -176,8 +179,8 @@ static int decode_block(BinkAudioContext *s, float **out, int use_dct) if (use_dct) skip_bits(gb, 2); - for (ch = 0; ch < s->channels; ch++) { - FFTSample *coeffs = out[ch]; + for (ch = 0; ch < channels; ch++) { + FFTSample *coeffs = out[ch + ch_offset]; if (s->version_b) { if (get_bits_left(gb) < 64) @@ -252,17 +255,17 @@ static int decode_block(BinkAudioContext *s, float **out, int use_dct) s->trans.rdft.rdft_calc(&s->trans.rdft, coeffs); } - for (ch = 0; ch < s->channels; ch++) { + for (ch = 0; ch < channels; ch++) { int j; - int count = s->overlap_len * s->channels; + int count = s->overlap_len * channels; if (!s->first) { j = ch; - for (i = 0; i < s->overlap_len; i++, j += s->channels) - out[ch][i] = (s->previous[ch][i] * (count - j) + - out[ch][i] * j) / count; + for (i = 0; i < s->overlap_len; i++, j += channels) + out[ch + ch_offset][i] = (s->previous[ch + ch_offset][i] * (count - j) + + out[ch + ch_offset][i] * j) / count; } - memcpy(s->previous[ch], &out[ch][s->frame_len - s->overlap_len], - s->overlap_len * sizeof(*s->previous[ch])); + memcpy(s->previous[ch + ch_offset], &out[ch + ch_offset][s->frame_len - s->overlap_len], + s->overlap_len * sizeof(*s->previous[ch + ch_offset])); } s->first = 0; @@ -293,6 +296,7 @@ static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame) GetBitContext *gb = &s->gb; int ret; +again: if (!s->pkt->data) { ret = ff_decode_get_packet(avctx, s->pkt); if (ret < 0) @@ -313,22 +317,31 @@ static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame) } /* get output buffer */ - frame->nb_samples = s->frame_len; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; + if (s->ch_offset == 0) { + frame->nb_samples = s->frame_len; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + } if (decode_block(s, (float **)frame->extended_data, - avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT)) { + avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT, + FFMIN(MAX_CHANNELS, s->channels), s->ch_offset)) { av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n"); return AVERROR_INVALIDDATA; } + s->ch_offset += MAX_CHANNELS; get_bits_align32(gb); if (!get_bits_left(gb)) { memset(gb, 0, sizeof(*gb)); av_packet_unref(s->pkt); } + if (s->ch_offset >= s->channels) { + s->ch_offset = 0; + } else { + goto again; + } - frame->nb_samples = s->block_size / avctx->ch_layout.nb_channels; + frame->nb_samples = s->block_size / FFMIN(avctx->ch_layout.nb_channels, MAX_CHANNELS); return 0; fail: @@ -343,6 +356,7 @@ static void decode_flush(AVCodecContext *avctx) /* s->pkt coincides with avctx->internal->in_pkt * and is unreferenced generically when flushing. */ s->first = 1; + s->ch_offset = 0; } const AVCodec ff_binkaudio_rdft_decoder = { -- 2.33.0 _______________________________________________ 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".