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 2C7E842562 for ; Fri, 18 Mar 2022 15:03:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC80868B09B; Fri, 18 Mar 2022 17:03:48 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2036.outbound.protection.outlook.com [40.92.90.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22AD468AA68 for ; Fri, 18 Mar 2022 17:03:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTdiywLK3ZYnnsN8ff5XZfWPtBxKjbLrcMFvtshPxwc9gcyMKZD/W7I1wzyQ+KVAuBx26iXTf86r4a0TSnRupnDHdUUIdUO/5EDiXJIsycCf2mvLmb2ySvCzmoTfniknxPMc6en8dqG2LKPuw/5BY3je9oYlfXsLLxz5b+hkXTic9Y4BFl3gO/Tm/ASKhGLae6+Mqmq5XQKN4br6N9CkD1HzKHttLegPSOtei89EnnxAXCzZ9WFwUm9/1gDBWLn3qBFc8hsLyvWu+WeHrOikhIR+hEnfHmLdU1+axlcR56KPRf42yjdTqAYbckXzzmWETCCp54ABR/z+NiCh90BKTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h/jBlamTHBs6AdpXG77VMFGdLauKEJ7QDpbYmCebpZA=; b=BUzHOnMs/37Z1YlWZWIRUCSUg9d1dQhlkgSHZJe/mjRVR5YzK0d86gHsWOh7MFZGQ0U093ZpPGLWydBmFjmArAV01VxsdM928ETDw0dMy7G74wWH4W9aZJsAp3cpgcQZjoBWqhQ3ENzXPEuB+eztFM81nJrg0ITDsE0AbP0wGUJ7uCB1EoOgeyR3GC4EqbN41zvpwQH6YjP+uAHKJsKDyQE6d7hFdNC0CgIYRC0YwUT/LtAYVCPZToXlF6Zr31FJu/V0bCn54qKiU2fM2PNxgVtxrHq3z0xWnWdLEatCj+cKfsAmNrmYtlz562zAUHA96+S0eVJ1B8Fw3XICAMv0HA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h/jBlamTHBs6AdpXG77VMFGdLauKEJ7QDpbYmCebpZA=; b=sexIbw3VjwLeZl4j3WpHKuGP3bLyHD4hzqVME47lzNMz7n5Cgi+5rIB9mPi2IGKuaeVQMNBTOrpE64K3rLp1lYMZAnSaFHnR9munACiYOUSjMDU7+T1cdZOU/pmhoNATIb4h6DjTIRhyOJWwLxOqS46N4/IEsW2wlQ7fjzk7wqDRw4/1XgKJjXDPA6UZaFnGW17SVMflp5LdP/gGvJiKRRxeUH8kDqyZ9PiaiinckOy3H0VRDRBcRpRwGEouAC2ET6cikQvXYpRrKFLEXxkqEGQqEJ8SbkOn0UoGvAySIPY0xr1JBq+14no3J28Jdca+B7k1KV4dlnqzsmZjutK6hA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by VE1PR01MB5888.eurprd01.prod.exchangelabs.com (2603:10a6:803:111::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Fri, 18 Mar 2022 15:03:41 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Fri, 18 Mar 2022 15:03:41 +0000 Message-ID: Date: Fri, 18 Mar 2022 16:03:40 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220318130417.47935-1-onemda@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220318130417.47935-1-onemda@gmail.com> X-TMN: [NK8y6JkN7EApNkbSiz9lBpUzYGrezAKe] X-ClientProxiedBy: AS9PR06CA0215.eurprd06.prod.outlook.com (2603:10a6:20b:45e::22) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <17cdcd75-4305-893d-51c9-5e37e8ea32ee@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0fa98f1b-655d-4a3a-037a-08da08f07d50 X-MS-TrafficTypeDiagnostic: VE1PR01MB5888:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QcKU/PklzbxDFLQkTQFvqwTtHYkOerit5cgi/76YGDcIBVAt4iOlaAccsQW4ajtDmLeYzcxuiTRoQoBbRJqfeffNI9decsU4UH1nD7QlKfEywHxnJ/g65XWLxpIrPjgevkJFqDTCa7NzS2Ljo76D4rK+UBP/sw3vo6wAUw/oCnjnO7l4vXSgOkMs06Ond20LUIlxew6UysxDJ1NbYrQvvkp0sPkh/S1Ju46b8M0GnIq51wsB5CXpgEbiZ4+Y35+H9jl4OvKkcJb2TZcMtu6qLyxN0Xlzh7qkmabS3zKXL7UDE0zovBTZ9So0atwODxCGbDseeU8ZyILR4/mrTD5ggJbhazgRmlJ5o2ywf8oLHGqioU6MJSWri75yYIyiGStirJ9pc0PUd8hKgG8I0eSzxEZ6XCV2/GS8GpjnmO/K8ArxCN/cVfXhHkEGBCRXVmbHEkhI9z4Lu1RXKHfYWEb3CMaHj+C6b7xdCpdmcZT9Zq2AR/RNRGGfsTBdfgUyLxIAol+ZPT00nuMDHq99/Y+VaMZtov52aLi3AqIibMhXQ+SjRA5AEcO35d09/doTprgYekK7i1LezKBVyHaab9KhnA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TmFXK01qZjh2YUlnOXl3dkpzanRkMnVFTlVJYUl1cmhSd25OS015Z3VWeGxr?= =?utf-8?B?Y3UvLzJHQy8yTVVTWlFXS1prdXlvK3hUak1VbnZLOURteUNHTG5zSlM5SnND?= =?utf-8?B?VC9JUTREWS9mRVZKaVNDemNHNzV3K3ZBS2FQMUxtQUxlV3J3bUNDeXY4Nlh2?= =?utf-8?B?dnhvNnJ6Y1EydnMwTjdCN0ZkcC95SGJtWHZQZEgyMzQwbklPWGdYSUxrVDNZ?= =?utf-8?B?djE3MEl1aGZEUXk0cTdNbVdkcFhLSDU3cVBha1UydnNiTVRoMzloMFRJM0xH?= =?utf-8?B?YUNUUW1SSVUwaysvd05mL1RqYWowWWFZYnkyVEROcjRra3lQQkN1Z2pQMnR6?= =?utf-8?B?N1l5RGNXM1ZwRHBISlF6TS9Obi9SVjNSR1BkaDc2M1dZNnliWnRURkVUckxI?= =?utf-8?B?TCtUZGdZRy9KdzRqWXZYTDBFVHErMlhVcFREWXMxNFk2OUtycyt6SUR1T1hj?= =?utf-8?B?SFRjOFNzYXd0dUVkbWI5bngwR3Nyb1J1STRiN210VDhTT281SWJ2dG05OUht?= =?utf-8?B?OWZoMDFnNyt4SkJYdVlWZ2RpQitvcnVXNW5PS3p1RkhJd000UjFmVWpkaFVJ?= =?utf-8?B?UkxkSlM1VVJLWVNHY2k1bjJUT002NW9aa0c4cG1YcHljSGNHMVRrMStySkw0?= =?utf-8?B?RlNHc1N5VXp5M3NuL2JCN2xQbkR6RVR1K2JsUGdVWFVEWEprMVRZaFVuUzdl?= =?utf-8?B?MythQ0NBK3E4THYzOUFFM2o4Y2EzWVQ5ODBLZzE0T0pVRnZVMTM0bVYyVjdU?= =?utf-8?B?MFpQZXpZVzhmU29FWEUwVTJwTElhYjYrbzZBZldEazhzTVBFU000NnY4WGd2?= =?utf-8?B?MmF1NHY0NFdjTllEb2k5ZTBjRnhVaGxMaDgvNWFoMG9sQ3JFWHM2N3o5TTVD?= =?utf-8?B?ZEYvZkNlUUNDQmpXTTJUZnRUK2h6WG1KcFVEZUl4VGVHUVQ5R3l5WUw1emVw?= =?utf-8?B?Ty95ZGJFbjIxKy9HTFBkb3N0Zks4QmtZd1VTaGJLS0xjNGFhM2dCYTdldHlT?= =?utf-8?B?aEpkWXJ0Zm0rVlFoYUxSQ2h6OWMvYXlBeU8yRmRIbC9idkJWcERlQmF1R3c0?= =?utf-8?B?cXZWQW85eWVEdWJ0TFdKeTllRDgvYmxCVkVVajNKMk1lWVFJbERJRmc3RjJj?= =?utf-8?B?MUt5cHEzbCttakUzUzNpUjdYeWkzM1RzWVNnYmRPYUMwZHlQV1NuV21RU01Y?= =?utf-8?B?KzJiVkZsVkRJNGh4N1BQeGtmQ0I5dmpXTUNla0hqUzZYWFU4ZjIwRmFud2xO?= =?utf-8?B?YWxOWC9aTjYzc1JsTXpKTW41Wjcxa2lpWFpvVDZwelNtaHVkZ1lXdENycmhG?= =?utf-8?B?Y1dubTVYRG9NS21SMWt0NnZTc0kyYXYxdGpBY1hZVVlRcXBUdlM3OHRUemhW?= =?utf-8?B?YXlhZzNwVVBpcHdpTU5BKzg0cmR1ZkdsRDl2ZE1vdUdueGx5V0lheUJMejFs?= =?utf-8?B?ZXlaemQzRVhlU0VueEIvdCtMVE9SN2RYZkJYdVR0SThnZEcwMG11eTF1MXND?= =?utf-8?B?L2ttbkZ2MFNRSWdWc28zVWpwYllsUGphTythb2c4TG15M0F4eVI5V010WGRn?= =?utf-8?Q?IMPJTLk5SK2tFVVO0RRvOSELPU488IIpMFs5KbNGJNYdZQ?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fa98f1b-655d-4a3a-037a-08da08f07d50 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2022 15:03:41.6415 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR01MB5888 Subject: Re: [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: Paul B Mahol: > 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; If you allow up to six channels, then MAX_CHANNELS (i.e. two) needs to be renamed. > 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; > + } Is it really intended that the data for one multi-channel frame is divided into several input packets? > > - 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 = { _______________________________________________ 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".