Re: [FFmpeg-devel] [PATCH 1/2] avcodec/adx: Move ff_adx_decode_header() to adxdec.c

[Paul B Mahol <onemda@gmail.com>]

On 9/16/22, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote:
> Possible since 9325d88eba8038b3e2a4485e473a018410379e2d.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  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".