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 5108B43ECB for ; Fri, 16 Sep 2022 07:43:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0931468BB34; Fri, 16 Sep 2022 10:43:36 +0300 (EEST) Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D2A868BAFA for ; Fri, 16 Sep 2022 10:43:30 +0300 (EEST) Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-3450990b0aeso249350017b3.12 for ; Fri, 16 Sep 2022 00:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date; bh=buC+CPnINtVsUff2zzPb9DFZmKqM+HPdN0oUBzaUe9I=; b=E1iMmFOMJfLCDUMTTIaWpiX31JOEG7DeEnrF2J6pMrokDJ8EPzufrh504W9It0bYeV Ie0fknfEqLPUJmI42zMVGlGv7+XChwu/nVtF75wv0hdXZj8j5nMrgT8Hmc5PhbrCgnbl W6E/lWs1CuGGWy1nAiZYVrqWN7UNwBIeDwIaL4mLJYDU3r3GMKv81kyIjkyPv10NWQ2l pMLiQCED1A2+z68/EemNPslDWGNHVn0i1a3FKc4vH1CIEswfaF+Qsfsp04md9+sEwEQi IgN4Il0AAhummsq7YE5L+/NyzGDk9dEcpDc5LsuKGstcZEYgLltalyIem2YHyHCkm3Ob l3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=buC+CPnINtVsUff2zzPb9DFZmKqM+HPdN0oUBzaUe9I=; b=icVWHBG49GC4nYIXbNyOLMRZCStGapGmOx1O6rHHFKoEe0hAm89IAZuspMx09i09SQ 5nFtKNWesIxPH9/X970NWR2bFo5EA/0IlySK8HRXwwO/lqDQEJCRyd7frPOSshQ9feKZ ou8lQvhQdU826lplDeByOxqjnRq730p5RHGbAj4RA5K/1q4do4mV3PPxOcONIggR8zr2 0nKQKjTQG7bBCC8lFtKvoJ2Z9LSE8TKGFzkatKqacMXw82TWpdKOzifyZECwqZny3Rz5 uLJymaXExPDbeEhpPUlPb8fsfqopdO3UmIostH8xCFJkZbeRkB2rOMvLvYnUpIfOJkfx VhiA== X-Gm-Message-State: ACrzQf1y6n1XHVUEwJxgrJFJkiUigh9qdNiwbkK5c31RlOjLY1ZJ5qOg Vgi3UWaYeiZ4AKbvTnzyrsjylAYSbjRwBVG0Gt+vcLSX X-Google-Smtp-Source: AMsMyM5eLLKjHSYIDJXZ8MizJ2w/NQcPMNx+17u/xt1d1RRK25xQjFn/7t5ZyX9u6YQJJ8UUcp8fITNgh5VhTiunmtg= X-Received: by 2002:a0d:ccc7:0:b0:345:5848:5feb with SMTP id o190-20020a0dccc7000000b0034558485febmr3268310ywd.302.1663314209009; Fri, 16 Sep 2022 00:43:29 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Fri, 16 Sep 2022 00:43:28 -0700 (PDT) In-Reply-To: References: From: Paul B Mahol Date: Fri, 16 Sep 2022 09:43:28 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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 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: On 9/16/22, Andreas Rheinhardt wrote: > Possible since 9325d88eba8038b3e2a4485e473a018410379e2d. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/adx.c | 52 ---------------------------------- > libavcodec/adxdec.c | 68 +++++++++++++++++++++++++++++++++++++++------ > 2 files changed, 60 insertions(+), 60 deletions(-) > LGTM > 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; > } > -- > 2.34.1 > > _______________________________________________ > 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". > _______________________________________________ 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".