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 CDCF94382A for ; Wed, 31 Aug 2022 19:15:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F06EA68BB37; Wed, 31 Aug 2022 22:15:14 +0300 (EEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067044.outbound.protection.outlook.com [40.92.67.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3311868B984 for ; Wed, 31 Aug 2022 22:15:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=flAdPtEgzVRwD3TI0Jav5JOCUi6HzewG8i2Sqeq0R4n6mWLZ8DzfLItLhhgvS3cSSo15hMgynQhnnlHBpLn3qCacELm9ika3ncCpqLflAGic0tpW4ZN4iuvDLPmcI0LVmpGU6N4OqEpdgPiA88mO3D6LUnRMe67qUbe7GHc3tYRo6CbRMPZ9dxFCPUWR1Vm7ABceJWDsW27bW9E5CO1dyZxcS0bWt6so6ftfqvURxN6Gb187glPOYY3T0qM6770DToAhK4zDnnLwMMTKSfg/ZkqYFY0dsV3WtpOaoaWNOGuvFyNtcZ7u13eG58feSrDd6C4eoMeHWn2J3FMfmxRowQ== 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=GSqqPwa3z9/PWrr28QYglMfKCq+XVR9cZy+BbyN/mMw=; b=PST+ehKqexp/RkEZZRTnC8JufUBxW0g1xu8+kZeAhK0273AMbPHIfXuC0pMBsOcLHzimSQbOoa7RxM9LjZAyGHbA3RnwMszTZtyLcPjwd0RjOjjrJbLwy1LCMUXFlcNiEH/B98k9UcLvzmTC4jYZ+hvA72vANIvb24oGz/WzCawCx6BO+Pz7fvIkRbHBy3yCc2m0/OF8zc4LwNjb27ykO+sh+m2uNy6Nd3eUOzGhqOrXY6FT20Og0aEcNUine4ocULGtwzjKthJ7n4V92imS+pqUPln4gO76Js8b5NQ9xZOYrbzoaLFz+VRf8167IwQDxAMIBm1aBQHfb7ibFpVd5w== 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=GSqqPwa3z9/PWrr28QYglMfKCq+XVR9cZy+BbyN/mMw=; b=orzpJ4fbyma0f1cKmnQfKUem2INh7Da5iA+LPXE+4oIR5gSUzxpzVPPWOjlVHWu3SF6K/QWVzm6FWMfwQJyzcdSXZ6BgYs5/8NttUZQv9JQRtZAsEznKYdiF1MF2mDTHy3RfWwbiIPvv/eXcR/nCcGYPvcZGkXJvI/uxmeAsE8jUWj6N5SymlIV2joo0MhfI9I5AczspvpVNsu3rcyhV7VoObf/9vgXblss6SArXNlSuXoOZFJ2V0NlQG1XdbnlDY6glIpkxJwYph1jKPAu6bpJcVjnGqN5IJJN6gVnw0HL1mXIkZJYGMsUR7U3kqRTg9m7Um350XH4gL57kMzq/3A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Wed, 31 Aug 2022 19:15:06 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::90cc:8832:55f1:c7d6]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::90cc:8832:55f1:c7d6%7]) with mapi id 15.20.5588.010; Wed, 31 Aug 2022 19:15:06 +0000 Message-ID: Date: Wed, 31 Aug 2022 21:15:04 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [fZeV3tA6qlHuRpYeafIvY9il2iik9VK0] X-ClientProxiedBy: ZR0P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9a8fd40-663a-4ad8-0990-08da8b851d3d X-MS-TrafficTypeDiagnostic: PR3P250MB0022:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4y26kt4yDZj2/jiHwyUWEUXTyVenP+swdxv3Gm5y4/i3GUj5/AV5insfsOYSTcvJaoQ/xQZyVht0jBHL2SK+ugwARO/d+XvR9QhdClNBAbCe+5kQi13IFTLb9Qjbaw8iHvKHFVg1WZQuAyPcfvVWJnYR/nz0oO6xOfDwCsXWY3npxlGBM75MRaT1PYqZRnH9Q8l0XiFOGOyVSwZSAPA8vCRZYRruMaodiCIvpnYWmecIRhvLO9wH8kZ+fBUFGkwJGRemQWhOhNGeZpyaW/dW1MS4IUup7ASaSCmR1BXyxpEJ7VjsZW2jr3Sd8Ovyl+djxVNtx6LzOmZuHizC4xHHVRBcvqwIpJvdsqjRFYR3dJJEbjdnuELIDAq0a7d1R1Nj7uTGhn1S6AeOi5M2/MkZT9ksM2itMgkxZmoo4q3UlkleVBLkaitNSUEZ4AjrFNV8BbX//v6EbuxT24RU+rxbfBEQe8VtdFdKWsyEMCUv0nd/oxregIfaYvP3iV8F86Kn3jwACehttIRuNrV3WMWOJV0mzLawEEajJNKBDIUkfPmr9tISqEB9XUNgR1EzMbf1d2kdZ55slWZlczey6OxkmXwJTECyNxsQlysFNzPQbYcuTFy3iTEgRtNIhKMU5qoo7e0AW/Qi1CbaPNix4WzthFIosqoFWqKl+zAX09XGs3mIhvKrwg64dGu9vVIYD1Dx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dW5BSWpiblZmV3pGWkhMRUhteG9ZT0Jyazk0MHdIbEZiQ1JIMk5HenhnR1R5?= =?utf-8?B?bjlaWmsrRGJvRFZqVnpkRWZyaWVkbzFDSXc3TjE4THQxVWlINFhnd1FJZWJy?= =?utf-8?B?YUp4b3EvbDhtWnI4VDFEOG9Ma3NsMkg4Ty9EelhPbXl1R1JRWEt5MFlnaFI5?= =?utf-8?B?WVR4NFlkTm9vSlRSQnJvbVVuZ1RWRUt3anRrSUJvL2UzVGkvWHByekJXTUFt?= =?utf-8?B?cGVobTNualdIY0VLVkUrVFZkK0E1bDNjZ3dkZ1FmM0NvN25aU0VzSDdvREVI?= =?utf-8?B?VzN3T3p4QTUwTDZSdkg2MWY4VFRKTFFZMWx0elZnbzhIdVR2a3UvVk9veXdU?= =?utf-8?B?ZXVXWDZXS3o0b3ZBWjhjVkFnWkpxNnhwNDlSQktIRlJMcUdOSnh0Sjk3TkVu?= =?utf-8?B?VzA1K1EwVkExRTd6TGpBT3RKKy9MRDNIemtDSjFnOEQ3dlBCamx3TDMxQ0hp?= =?utf-8?B?Y2cyeWlJUzhzUFcvbFpEcUU4WUlVMkdTcXdJRW53a3NnZmZWYUNCd05JRUZO?= =?utf-8?B?TjdEZ205M1JWeExZR1pETitNWFpwSzYrUS8zaTd5MHNFQXFvQ0FJTWIvSjRP?= =?utf-8?B?QkFZZGlnQ0czUm1yemN4aGd4OFhHT2NseVZmaU9TS1ZaV3NrV3luMno5aEFO?= =?utf-8?B?eC90ZS9IbXE0SkRBalVWWGlSeWZZY0lTTlFxMnFOdVA3UzlkVTYwaWdqRWo5?= =?utf-8?B?U1lPaVVCZzZ5Rk9QNU0vZlArclA4UU1aZ2dGMHI0cm82Sk04RGxQd0lyUWhh?= =?utf-8?B?MktkajV3TTdpOE5OakRpTU9SS3B2K2pNK3FlY2ZuQVNKS1dBWjlWZGYyazg0?= =?utf-8?B?UFZhYzBoYVErV3dLaFkxQ3NITHZOVDgyWVdRTVhtNWdScTRLZlcrL3RKVWY5?= =?utf-8?B?S0x5NHpIcmFmVGxxcVlKQkNaY3AwTmF3QXFQUXFHRnNzNU1SMDUrUmJlNjA4?= =?utf-8?B?MmFmRk1raXV5UmREMi9iNGljWUVSNHFDeE0xdU11R2FCUmw0Zzg3b0tlZ3d4?= =?utf-8?B?NHViditjcmdhdkNiYjFWeFZ3UHlQcjdaaXhQdUgrT0hQeWI3YUpOdlVBVEJE?= =?utf-8?B?K2tJV2VzRVJTSlkxeVNhQXdYb3h5K3lUaC9XMFFjdXd0MXNHMnAwMy95OW5t?= =?utf-8?B?YkloaWJVWnFkbXBZeGFLcmRjdVhNYXM1UE9YMU1YQ0xKWGxnYnN4dkhsVzFI?= =?utf-8?B?OGtkYjNUbWFscThSc2JvUWhJT3pZVU00ekQ4SHB3VzNHRUpqOXVIRDN1ZTc4?= =?utf-8?B?RzFyeVU0NTJSZ3FyVWhiL1NxZE5WRmd5VlU1cXA4WmpPQy9NM1RnUzhjbHp0?= =?utf-8?B?SERLdzdNRmFVSGRNaUVFNUErcHc1c1p1bExUb2h5RGlCZzZSUGc4SFhsZjVW?= =?utf-8?B?RXNVdk8zVjAreno4dUZMVUxCODBrRGJ4QTRTZG85NG5WeHB2dUQ5MGg3dS9Y?= =?utf-8?B?eWxrclVFNXR3QXF0ZFdjTXNMYTRPZ2FNaXk3L0MrdTFqVjQ4bEt4UitCT281?= =?utf-8?B?S2Rab0dheTBwVGUxak9JV3BCNmp5b25OWUpSOHNFaUJrVzJPV3ErYVM5aTBQ?= =?utf-8?B?a1VVWmowbnJVdlFmeHQrUmFXdVlkb0VtS0ZGQkxyYkFkY05RcHpYcVdZOG9W?= =?utf-8?B?T0pVNTNqZ0x5cXdjVG9reDlISzFiT3JLZTl4U3ZFM1pzRnIvb0VGdU0zcXg5?= =?utf-8?B?NUVoanFnalViMExGTmd1b1c4cWhEcTlET2pXKzZXZGFPK050ZkowMkRzSDRj?= =?utf-8?Q?vbC8ZerfFCVMfpDAAU=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9a8fd40-663a-4ad8-0990-08da8b851d3d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2022 19:15:06.5828 (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: PR3P250MB0022 Subject: Re: [FFmpeg-devel] [PATCH] FTR decoder 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: > diff --git a/libavcodec/ftr.c b/libavcodec/ftr.c > new file mode 100644 > index 0000000000..03d490a0c9 > --- /dev/null > +++ b/libavcodec/ftr.c > @@ -0,0 +1,217 @@ > +/* > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#include "adts_header.h" > +#include "avcodec.h" > +#include "codec_internal.h" > +#include "get_bits.h" > +#include "internal.h" You seem to not have rebased your patch upon master: ff_get_buffer() is now in decode.h and this won't compile; including internal.h seems superfluous now. > + > +typedef struct FTRContext { > + AVCodecContext *aac_avctx[64]; // wrapper context for AAC > + int nb_context; > + AVPacket *packet; > +} FTRContext; > + > +static av_cold int ftr_init(AVCodecContext *avctx) > +{ > + FTRContext *s = avctx->priv_data; > + const AVCodec *codec; > + int ret; > + > + if (avctx->ch_layout.nb_channels > 64 || > + avctx->ch_layout.nb_channels <= 0) > + return AVERROR_BUG; I don't see what is supposed to limit nb_channels to 64. If it isn't checked somewhere else, you need to return something else then AVERROR_BUG. EINVAL, ENOSYS or ENOTSUP. > + > + s->packet = av_packet_alloc(); > + if (!s->packet) > + return AVERROR(ENOMEM); > + > + s->nb_context = avctx->ch_layout.nb_channels; > + > + codec = avcodec_find_decoder(AV_CODEC_ID_AAC); This may return the libfdk-aac decoder if the native ones are disabled. It uses AV_SAMPLE_FMT_S16, whereas the native ones use a planar format, namely AV_SAMPLE_FMT_FLTP or . The way you are forwarding the data only works with planar formats. IMO you should just add a configure dependency on the native decoder and force it by using ff_aac_decoder instead of avcodec_find_decoder(). Or maybe use ff_aac_fixed_decoder to make this codec easily testable? > + if (!codec) > + return AVERROR_BUG; > + > + for (int i = 0; i < s->nb_context; i++) { > + s->aac_avctx[i] = avcodec_alloc_context3(codec); > + if (!s->aac_avctx[i]) > + return AVERROR(ENOMEM); > + ret = avcodec_open2(s->aac_avctx[i], codec, NULL); > + if (ret < 0) > + return ret; > + } > + > + avctx->sample_fmt = s->aac_avctx[0]->sample_fmt; > + > + return 0; > +} > + > +static int ftr_decode_frame(AVCodecContext *avctx, AVFrame *frame, > + int *got_frame, AVPacket *avpkt) > +{ > + FTRContext *s = avctx->priv_data; > + GetBitContext gb; > + int ret, ch_offset = 0; > + > + ret = init_get_bits8(&gb, avpkt->data, avpkt->size); > + if (ret < 0) > + return ret; > + > + frame->nb_samples = 0; > + > + for (int i = 0; i < s->nb_context; i++) { > + AVCodecContext *codec_avctx = s->aac_avctx[i]; > + GetBitContext gb2 = gb; > + AACADTSHeaderInfo hdr_info; > + AVFrame *iframe = NULL; > + int size; > + > + if (get_bits_left(&gb) < 64) > + return AVERROR_INVALIDDATA; > + > + memset(&hdr_info, 0, sizeof(hdr_info)); > + > + size = ff_adts_header_parse(&gb2, &hdr_info); > + if (size <= 0 || size * 8 > get_bits_left(&gb)) > + return AVERROR_INVALIDDATA; > + > + if (size > s->packet->size) { > + if (s->packet->size == 0) { > + ret = av_new_packet(s->packet, size); > + } else { > + ret = av_grow_packet(s->packet, size - s->packet->size); > + } This branch seems superfluous: av_grow_packet() can handle blank packets just fine. > + if (ret < 0) > + return ret; > + } > + > + ret = av_packet_make_writable(s->packet); > + if (ret < 0) > + return ret; > + > + memcpy(s->packet->data, avpkt->data + (get_bits_count(&gb) >> 3), size); > + s->packet->size = size; > + > + if (size > 12) { > + uint8_t *buf = s->packet->data; > + > + if (buf[3] & 0x20) { Does this happen often? If not, then you can just reuse the given data (you just need to set pkt->data and size). > + int tmp = buf[8]; > + buf[ 9] = ~buf[9]; > + buf[11] = ~buf[11]; > + buf[12] = ~buf[12]; > + buf[ 8] = ~buf[10]; > + buf[10] = ~tmp; > + } > + } > + > + ret = avcodec_send_packet(codec_avctx, s->packet); > + if (ret < 0) { > + av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n"); > + return ret; > + } > + > + iframe = av_frame_alloc(); There is no reason to allocate this temp frame in a loop; it can be allocated during init just like the temp packet. > + if (!iframe) > + return AVERROR(ENOMEM); > + > + ret = avcodec_receive_frame(codec_avctx, iframe); > + if (ret < 0) { > + av_frame_free(&iframe); > + return ret; > + } > + > + if (!avctx->sample_rate) { > + avctx->sample_rate = codec_avctx->sample_rate; > + } else { > + if (avctx->sample_rate != codec_avctx->sample_rate) { > + av_frame_free(&iframe); > + return AVERROR_INVALIDDATA; > + } > + } > + > + if (!frame->nb_samples) { > + frame->nb_samples = iframe->nb_samples; > + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { > + av_frame_free(&iframe); > + return ret; > + } > + } else { > + if (frame->nb_samples != iframe->nb_samples) { > + av_frame_free(&iframe); > + return AVERROR_INVALIDDATA; > + } > + } > + > + skip_bits_long(&gb, size * 8); > + > + if (ch_offset + iframe->ch_layout.nb_channels > avctx->ch_layout.nb_channels) { > + av_frame_free(&iframe); > + return AVERROR_INVALIDDATA; > + } > + > + for (int ch = 0; ch < iframe->ch_layout.nb_channels; ch++) { > + memcpy(frame->extended_data[ch_offset + ch], iframe->extended_data[ch], sizeof(float) * iframe->nb_samples); One could ref the corresponding buffers; but this would cause problems with the DR1 flag. I wonder whether we can simply forward get_buffer2 to the child contexts and keep DR1. (This presumes that the used AAC decoder has the DR1 flag set, which is true for the native one.) > + } > + > + ch_offset += iframe->ch_layout.nb_channels; > + > + av_frame_free(&iframe); > + > + if (ch_offset >= avctx->ch_layout.nb_channels) > + break; > + } > + > + *got_frame = 1; > + > + return get_bits_count(&gb) >> 3; > +} > + > +static void ftr_flush(AVCodecContext *avctx) > +{ > + FTRContext *s = avctx->priv_data; > + > + for (int i = 0; i < s->nb_context; i++) > + avcodec_flush_buffers(s->aac_avctx[i]); > +} > + > +static av_cold int ftr_close(AVCodecContext *avctx) > +{ > + FTRContext *s = avctx->priv_data; > + > + for (int i = 0; i < s->nb_context; i++) > + avcodec_free_context(&s->aac_avctx[i]); > + av_packet_free(&s->packet); > + > + return 0; > +} > + > +const FFCodec ff_ftr_decoder = { > + .p.name = "ftr", > + .p.long_name = NULL_IF_CONFIG_SMALL("FTR Voice"), > + .p.type = AVMEDIA_TYPE_AUDIO, > + .p.id = AV_CODEC_ID_FTR, > + .init = ftr_init, > + FF_CODEC_DECODE_CB(ftr_decode_frame), > + .close = ftr_close, > + .flush = ftr_flush, > + .priv_data_size = sizeof(FTRContext), > + .p.capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1, > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > +}; _______________________________________________ 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".