From patchwork Fri Sep 16 07:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp790865pzh; Fri, 16 Sep 2022 00:17:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4JcbwHOuEoWoZyjJHFyAlCAoS0rRWZTSy5mw2SCrHpT2k5IbWGFehdDqtNWMsBI1QN59yE X-Received: by 2002:aa7:da51:0:b0:451:e316:31d with SMTP id w17-20020aa7da51000000b00451e316031dmr2721303eds.389.1663312639020; Fri, 16 Sep 2022 00:17:19 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt14-20020a170907728e00b007804b5a2c48si3275860ejc.521.2022.09.16.00.17.18; Fri, 16 Sep 2022 00:17:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ncJoXMO3; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B791C68BBDE; Fri, 16 Sep 2022 10:17:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074055.outbound.protection.outlook.com [40.92.74.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63F7F68BAFE for ; Fri, 16 Sep 2022 10:17:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P4NDIWeOgUu1pywqjtc0YuRNKOfvAp1SwhqF2qBj1w2baAh+oSXspbJbaF/hfcwMbLyF3vbBhzQsW5Ycdl6JRK19/3GXP+qjO37+84dRpDOvEsxfGACz14FCNNgzHlI2I/+F7xv8MibyEYtLV5TleSD9ZmGry23ovoZqdGRpBrpaaUHg3UCoY5RepoZejfRf+Kq5Y3kfCI6RiirFqoUPYE0LOjjffCLqyj2OBkJA521gkkKIkMrsl8R4p1tBWSn2oWhdpdsPZigUik6/k9sx+xt+P8cind7mt88T9meA7zCTFb74Mo8wGDJRp+jtsNAgw+XJBpmKnoc4TaFIgzxksg== 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=VRJI8BiMx3R74ncSj4y/I+J4xpFLDJ2RDrQxxrEgmGI=; b=lGbaDyAd5U3fA5fmqRqcAfOOpyBB5HVSFKBtfipOK24clJil1fwjfiZrbCaaW5BEe+ixxTewcGvv+eYsx7x6FbElv/XfScCRIMhxTUtP52wHJC46Sp/p7DGIIes1N97PcIV9RSq9jzjCRCmBIPOu3DF3FSexlkR3PAl0p8pocMfi2k6Zb7Iu/P6GDzQVSn0/XIQ1iArBeDEJBeSBkbsRY2BFEA3N04TNkKG2n5yCKw+Xu07C9lyUkbL0pFyLMcw/zM3NENf+8dgSfO9P9STt4+fr5q06wOpOpiaA3Uh77nre0g0+YXPKbKgjvmvE16vwtxUy6NxR4xwXutscIWGtbw== 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=VRJI8BiMx3R74ncSj4y/I+J4xpFLDJ2RDrQxxrEgmGI=; b=ncJoXMO3/tJh1Nbw5+4W9PTYhdd1uaxEu4qyFPQ7+XGNYGx92xnbm8DOOCq7hN2LvhqOLrF7DJXf8tix29MTR8ALRoDL6HgT3xACWwPreWyV5WdCVc/KoEb4N282Atj6tG7LkOEJg1A+MeoY/aS3WzR2BM2f+2eh34Pd7+rIZicnWPjjt98xecu0noYgDyqzM4XaIvxBAKpZb8F8IRP8WlOXiu415kD7MCjdNW3JoKV6+7dhLlfRkXQzV6X9Fg87O1LoXBTik8zebdJ8mUOYrnbZuN8ZYSZmXXL5HOfKMG6GTJbJr9mbYoVkJp8fc/FAslt0iUN41KkSGbAm/RwUwA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0298.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.15; Fri, 16 Sep 2022 07:17:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::2c84:e72a:48a9:ff90]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::2c84:e72a:48a9:ff90%6]) with mapi id 15.20.5632.014; Fri, 16 Sep 2022 07:17:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 09:17:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3LiHGJlpvjePI9MwbguUfdCbqxOHxQn1ZKTc9gsfYfU=] X-ClientProxiedBy: ZR0P278CA0080.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220916071703.3147764-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0298:EE_ X-MS-Office365-Filtering-Correlation-Id: b9037d0b-f0d7-4aa2-5ede-08da97b3760f X-MS-Exchange-SLBlob-MailProps: 4VtScROZs23fsg+olMtfb1zdFQ8jDQc+TqEU1RTSgVkgjIiJsrPGmvQeqsDIZSM45GybxYi4M8RqsKNL94d49IH0yRXp5QRiQiVd2XucdB7v36ANv4YY0EzovSeQgFFNXYY9M6E2eFUjurG+nxyxLWFIuLNqHAnNtmUOk3qt0r3vGrtBhhdrno/4MGLfxDPDWj50tL6PWh/MeeYEtXDUf+FKjtlN4Z6c0cpqSs4aJWy5GwJLCPE0TpstuU2z4UH+GodC0Zt64IM4tZ/XEYaxYOXz/W5MvTinwQCmD8hEEwMVKWqzRjxbYEEH9S6RpRpP6psetlgoscUUWuJcPm4+O5/5DkeuAtc8TWuN65NT2MCt4/MPN41SE7DhcqFixuuRwBYoUWpo74mfOhIHOD4PSBkU2W1gWQ3sDFlj2auMmdvLUfqkJVivRql5gQHdCuC0ppO2LEssSN65nLYm4fKWNnvmzRgp5GyS4ht1BnGMU4t/50jRNMTH+OzebnD2FdHF/EIdsXHMCgCmUvcMsyr4v1rWy606t651XdInlZHChEF/G8gA3ht66CYMzcPkMnupriFve9D0kiYhTPcY8cnQv3OwgtMLt0eypQKDrRHvPGmcekCxGBKJK8x0D10/kvNKwxnpXBfJ8j0NPvQcmfs9SU8cf4+tb5cSPmbgmiXAyCpP8IK8APxNRw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FFhUE6FuH1vYsh2k24QlCvKDzgojOANKCnZV1mpBC7fTxiMdzxv93sniYYCkI4su1cmElsBrpWbxC1RcfhPw+BJihqhm5EgA9Z8KdniNels1xSduntXNbqZSAq8gpW0jez89z6Im3o5a0ZvKZQ3IIW0m4tOI2AS6JmbLU7H9qEUnr4GNg1zqhwesgbW7ldtMIA1f/YphCcNl0zmuobS/93OrmQ/si/dulab6QLbim/lpEBlW/4GJc/jg4iMMnjo+SduQ9ToxIHnGwmYU1sIMy0gkt4a52MsuSJW1Ck5/OZ7xFpZ9K4V/GuLRyFv35ZRxfdzPwSzAtlT8JbPAuyWd+GK/dQrw2TWhLtdWTYxXHaeSvewrRbZHR/tBpq4BC7pu4m75N1GH3Xi5j8RLh1abGbTEXT4HOnWWJbB4Brjt6/TpbWLBacfeL/4+CtcZK/eArrq9ll2yckOJLrT218vVmlXglYkwkO5Ss6IVjU8/3Wjmp+LyuhVJpAVpJLAbjd28nJ5U6PJFFisOrg2yKdJzxKKfdBq8K3aUhRZh7R/UZIMzW4IhGe4YWBvvT4yr8a7qgywNmKP/KhezAGBNKR75XdGtysDrl5+iJdQ0ULiyEjsBzw1Hg+1zl06mn/VX+a7e X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sYjtsq3D4Lro3lRX5gZ78mjs0urdIi9Z8axFd7XKc5u7vh/Y2zVEMSqqsX71mTrJjuy7dArfmi7Xej3D20WOKnSC3NgxtsT8YHu27k97LPgWn70H3Bw5/rKbcnBtuGKiGA0XATUJiuodTIdYQ014tfIX+cv9i4fGDvqDVmoDVL1x+qU+qy6UHobTYOX54xH37CzuQ32ju98OHgotzT8eKCEyPrgFD0KFnRgWlSDFk6aiXpsXpZW5yThSgiWMTwRiis+0ikkC/PFq27fRtpGM91+f5cBcHFodwnHlPw9F0mAXWcNpHNCT+Dd7bmy1IAuGqrhHf2nRQriG/dyqo8geNZbg9UhyST8kKAI2Uk37HAv6bnDMFWcLGPgk/C4V2aYajnIrI/42PdDSq3kyjP60jOm5LXsRXg/t/IrhJGJTd3pZon6Z256JH3QVu+oEBIv91yukiv23mN3DUCrBElg3acBOBokv/2CnXIB0BKSQWGb+lKbnKAgL7ir+3MHbsG1qB8nW8fEgZSqh01TvqX7433zaGauC13yw+LTmbsTHzVpg2AM5xGdszQPddSjUcoSMsPSL6FC5EKrileEisNpIP4HQM8WUC6EbtqvTiSFxH5k2HpFLHQCoQe4oFMu7kCs74d0G0ym7tj7Kqi07G6ALfxdgZGAmbmPlcIat0YAKQVgn5c8UyYyCQngFCiqmCVUh8Vg6gtCXln/Pm48vDdIzXcqM+c6QuTpa5BqvCldfjNThXo5JdqsAokYTr7NzRe/dVYk16z/whHn9B95GvQ+ND78zDhc0Lie4JuAcP/Db4LhKQGTHUaAYM5KwjpSlukiS4jb7g5OSZRU8oi7F3SXOFW0putOynPG4+sFWx4VDT7OBOyQ/wSCRZQM0b4ZW3H6xHR3tGh1BR88way4MBrHh8bIUmw5ndxaakBpTIuo3s5/p/M5uS6UPcaugsQB48XHOnmIAglBQFXVnqhhLIXYb47Jkq13/n/72gNoQt9v6K9wza2JKIcaJsVLiH0osejBXXJNhpjAKbM6AG6BgjmDZpHWKJZPrJFIWSQWDEYJH3dnBK6/0Fe2nrgzOb/h5Qp6GJ/6L2ySUUzNmNZLTTuJcvJmS+H9q4/WTvjZ8LNCveiOUFiDLjUvlYpKuc834+GIOLKMhJC9R9QvN09GnfdJLga8hnVIVpQU7DaWV9syKzaCeUDHa7d5vi6BxWzNph6+z2pAkBSaOFAqS8cMqwuOkE8w3rQyPK4LULmIU04G9Zx+llO0t5mY2478pj8KtxeCpNGH6WEJ8jVRUvVqbnTxosOkJOtxRZt5udmmHRDskre1v3spU9mj78N3TqmCZUXFR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9037d0b-f0d7-4aa2-5ede-08da97b3760f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 07:17:06.4986 (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: AS8P250MB0298 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/adx: Move ff_adx_decode_header() to adxdec.c 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9QvRp0/Hnu6W Possible since 9325d88eba8038b3e2a4485e473a018410379e2d. Signed-off-by: Andreas Rheinhardt --- libavcodec/adx.c | 52 ---------------------------------- libavcodec/adxdec.c | 68 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/libavcodec/adx.c b/libavcodec/adx.c index c60fabb40b..be96f67b43 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -34,55 +34,3 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff) coeff[0] = lrintf(c * 2.0 * (1 << bits)); coeff[1] = lrintf(-(c * c) * (1 << bits)); } - -int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, - int bufsize, int *header_size, int *coeff) -{ - int offset, cutoff, channels; - - if (bufsize < 24) - return AVERROR_INVALIDDATA; - - if (AV_RB16(buf) != 0x8000) - return AVERROR_INVALIDDATA; - offset = AV_RB16(buf + 2) + 4; - - /* if copyright string is within the provided data, validate it */ - if (bufsize >= offset && offset >= 6 && memcmp(buf + offset - 6, "(c)CRI", 6)) - return AVERROR_INVALIDDATA; - - /* check for encoding=3 block_size=18, sample_size=4 */ - if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) { - avpriv_request_sample(avctx, "Support for this ADX format"); - return AVERROR_PATCHWELCOME; - } - - /* channels */ - channels = buf[7]; - if (channels <= 0 || channels > 2) - return AVERROR_INVALIDDATA; - - if (avctx->ch_layout.nb_channels != channels) { - av_channel_layout_uninit(&avctx->ch_layout); - avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - avctx->ch_layout.nb_channels = channels; - } - - /* sample rate */ - avctx->sample_rate = AV_RB32(buf + 8); - if (avctx->sample_rate < 1 || - avctx->sample_rate > INT_MAX / (channels * BLOCK_SIZE * 8)) - return AVERROR_INVALIDDATA; - - /* bit rate */ - avctx->bit_rate = avctx->sample_rate * channels * BLOCK_SIZE * 8 / BLOCK_SAMPLES; - - /* LPC coefficients */ - if (coeff) { - cutoff = AV_RB16(buf + 16); - ff_adx_calculate_coeffs(cutoff, avctx->sample_rate, COEFF_BITS, coeff); - } - - *header_size = offset; - return 0; -} diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index a2701608ff..1d0d0582c4 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -35,15 +35,67 @@ * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/ */ +static int adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, + int bufsize, int *header_size, int *coeff) +{ + int offset, cutoff, channels; + + if (bufsize < 24) + return AVERROR_INVALIDDATA; + + if (AV_RB16(buf) != 0x8000) + return AVERROR_INVALIDDATA; + offset = AV_RB16(buf + 2) + 4; + + /* if copyright string is within the provided data, validate it */ + if (bufsize >= offset && offset >= 6 && memcmp(buf + offset - 6, "(c)CRI", 6)) + return AVERROR_INVALIDDATA; + + /* check for encoding=3 block_size=18, sample_size=4 */ + if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) { + avpriv_request_sample(avctx, "Support for this ADX format"); + return AVERROR_PATCHWELCOME; + } + + /* channels */ + channels = buf[7]; + if (channels <= 0 || channels > 2) + return AVERROR_INVALIDDATA; + + if (avctx->ch_layout.nb_channels != channels) { + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = channels; + } + + /* sample rate */ + avctx->sample_rate = AV_RB32(buf + 8); + if (avctx->sample_rate < 1 || + avctx->sample_rate > INT_MAX / (channels * BLOCK_SIZE * 8)) + return AVERROR_INVALIDDATA; + + /* bit rate */ + avctx->bit_rate = avctx->sample_rate * channels * BLOCK_SIZE * 8 / BLOCK_SAMPLES; + + /* LPC coefficients */ + if (coeff) { + cutoff = AV_RB16(buf + 16); + ff_adx_calculate_coeffs(cutoff, avctx->sample_rate, COEFF_BITS, coeff); + } + + *header_size = offset; + return 0; +} + static av_cold int adx_decode_init(AVCodecContext *avctx) { ADXContext *c = avctx->priv_data; int ret, header_size; if (avctx->extradata_size >= 24) { - if ((ret = ff_adx_decode_header(avctx, avctx->extradata, - avctx->extradata_size, &header_size, - c->coeff)) < 0) { + if ((ret = adx_decode_header(avctx, avctx->extradata, + avctx->extradata_size, &header_size, + c->coeff)) < 0) { av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; } @@ -110,9 +162,9 @@ static int adx_decode_frame(AVCodecContext *avctx, AVFrame *frame, &new_extradata_size); if (new_extradata && new_extradata_size > 0) { int header_size; - if ((ret = ff_adx_decode_header(avctx, new_extradata, - new_extradata_size, &header_size, - c->coeff)) < 0) { + if ((ret = adx_decode_header(avctx, new_extradata, + new_extradata_size, &header_size, + c->coeff)) < 0) { av_log(avctx, AV_LOG_ERROR, "error parsing new ADX extradata\n"); return AVERROR_INVALIDDATA; } @@ -127,8 +179,8 @@ static int adx_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (!c->header_parsed && buf_size >= 2 && AV_RB16(buf) == 0x8000) { int header_size; - if ((ret = ff_adx_decode_header(avctx, buf, buf_size, &header_size, - c->coeff)) < 0) { + if ((ret = adx_decode_header(avctx, buf, buf_size, &header_size, + c->coeff)) < 0) { av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; }