From patchwork Mon Jul 24 21:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2207192pzb; Mon, 24 Jul 2023 14:58:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFtbZIr9653L2s0SV/I5ogwtOkNe9nnHy/cjZUDY9kxg3tLxFbFwg27TTQNuG0F4GBmJZhK X-Received: by 2002:a17:907:2c78:b0:992:7462:a22c with SMTP id ib24-20020a1709072c7800b009927462a22cmr10565392ejc.36.1690235921410; Mon, 24 Jul 2023 14:58:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690235921; cv=none; d=google.com; s=arc-20160816; b=UFiox/59MWGFu0OI1NVyQMulSM9VyPGzNCB+FS7GVRiCk8eWtQ5K5aVmM4lYWTP7BW e2llQGgxUt5n+VS2sUaQpylpUvRQl3cP/KSTTouzwH7QliSLQXr3q88k13vOra0t6XEO Gm7Cs5kn4Q6t9M8SN+n3j8gKrn+fePOpPqe2HV+cWuPRwWiEKTu98vg81V08KMqm1563 R4QjqLO5dpWZLjlelVCqj/PwM7xpSSHlnhlRUkWe4levvDh/6r9dQuJEpdrSmFzzVSl2 G85D8GR+EYWE4Fx513gxQktI429dm75wd7OQQEHjl6LdhtSCb+LvPJ3IpvDa3jQnaLn7 IkRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=7lBHG1toOFrLDjV2RDBV0QdgyG+B1Td5ZBTAwRfCkPk=; fh=NIkoTDpgqwsBDY3Ej4pG8uwJcqBS6rd7Vc7bU5x+v0U=; b=NYPl0FooaPvCHkDe/PkAqB+jBe/VLCrxp1ATyoT9RPfc+V4QzKCtgSriid4+OFhYQU QC9EgC/iMxTi+oLgDMBAo/X8S12c9+1TqaU8o6f/EARHv7jCJM6Dd4sDRbqxyNuhWVwu Qd6O+GKzZBwfmbmgrHsEeecUUkWOGWgiwtnQP2K3z02NLrRqoRnFopkQMmBZwy5+SGLW HVXu2rDpOiFl4L/VdUmkwodJ0uTIUiu3pk0b6Sx9YO4xZFFHoMADO1MkDM7PnfmKmqq2 kIAb0x1bDakybpDaveGN0b3xk1WWmLkZ2jKGb4XTaB5wA8x+emgIv4bLfL9kkewz5jr5 umvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=mkMTfwOq; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bn15-20020a170906c0cf00b009936735fecdsi6556170ejb.901.2023.07.24.14.58.41; Mon, 24 Jul 2023 14:58:41 -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=@lynne.ee header.s=s1 header.b=mkMTfwOq; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D951F68C7DC; Tue, 25 Jul 2023 00:58:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 606A268C787 for ; Tue, 25 Jul 2023 00:58:31 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 80FBC10600E3 for ; Mon, 24 Jul 2023 21:58:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690235910; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=IyWrHlAPIqPUrOAzhbeKcf4pa7ZVTdZUj3mfbzB7dec=; b=mkMTfwOqdt4LaWZ4jmi6AcZQWbVc7fMsV1j6Irxl6RFxcN5p7sVljsfBVnzY5SwD J7k36QOqv3Maj10EnE/3/8+RZMlMOcxywCaGYb5fVC36p+aal53rGrRkVkmIpsuCHvg wZXTFQpBLBlRI5bOB8R4dBY85ikSZjfPtQgKmchDlynXXIPEv9SNGpAn/tiOT493hra dI6zyvY33foDwen7Dokzvmw6FmZYup2K2YMRbNRwKHGAkqdMSJ4Egnu39bZC1JIkc5z F6Qb6bgNzvgcyH4J6tv5ed+LIg3gl8/QQrGkUpSFt6tVv3vFGvKgy0/g21tS5TAS3YP LA4wt0UnyQ== Date: Mon, 24 Jul 2023 23:58:30 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] ffplay: port to lavu/tx 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rImKlGonQHJn Patch attached. From a3e8ab975d21b3240a63f3f09fe486e05083ab7d Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 18 Feb 2023 13:14:31 +0100 Subject: [PATCH 1/2] ffplay: port to lavu/tx --- fftools/ffplay.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 5212ad053e..006da7ab57 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -47,7 +47,7 @@ #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libavutil/opt.h" -#include "libavcodec/avfft.h" +#include "libavutil/tx.h" #include "libswresample/swresample.h" #include "libavfilter/avfilter.h" @@ -262,9 +262,11 @@ typedef struct VideoState { int16_t sample_array[SAMPLE_ARRAY_SIZE]; int sample_array_index; int last_i_start; - RDFTContext *rdft; + AVTXContext *rdft; + av_tx_fn rdft_fn; int rdft_bits; - FFTSample *rdft_data; + float *real_data; + AVComplexFloat *rdft_data; int xpos; double last_vis_time; SDL_Texture *vis_texture; @@ -1120,6 +1122,7 @@ static void video_audio_display(VideoState *s) fill_rectangle(s->xleft, y, s->width, 1); } } else { + int err = 0; if (realloc_texture(&s->vis_texture, SDL_PIXELFORMAT_ARGB8888, s->width, s->height, SDL_BLENDMODE_NONE, 1) < 0) return; @@ -1127,31 +1130,39 @@ static void video_audio_display(VideoState *s) s->xpos = 0; nb_display_channels= FFMIN(nb_display_channels, 2); if (rdft_bits != s->rdft_bits) { - av_rdft_end(s->rdft); - av_free(s->rdft_data); - s->rdft = av_rdft_init(rdft_bits, DFT_R2C); + const float rdft_scale = 1.0; + av_tx_uninit(&s->rdft); + av_freep(&s->real_data); + av_freep(&s->rdft_data); s->rdft_bits = rdft_bits; - s->rdft_data = av_malloc_array(nb_freq, 4 *sizeof(*s->rdft_data)); + s->real_data = av_malloc_array(nb_freq, 4 *sizeof(*s->real_data)); + s->rdft_data = av_malloc_array(nb_freq + 1, 2 *sizeof(*s->rdft_data)); + err = av_tx_init(&s->rdft, &s->rdft_fn, AV_TX_FLOAT_RDFT, + 0, 1 << rdft_bits, &rdft_scale, 0); } - if (!s->rdft || !s->rdft_data){ + if (err < 0 || !s->rdft_data) { av_log(NULL, AV_LOG_ERROR, "Failed to allocate buffers for RDFT, switching to waves display\n"); s->show_mode = SHOW_MODE_WAVES; } else { - FFTSample *data[2]; + float *data_in[2]; + AVComplexFloat *data[2]; SDL_Rect rect = {.x = s->xpos, .y = 0, .w = 1, .h = s->height}; uint32_t *pixels; int pitch; for (ch = 0; ch < nb_display_channels; ch++) { - data[ch] = s->rdft_data + 2 * nb_freq * ch; + data_in[ch] = s->real_data + 2 * nb_freq * ch; + data[ch] = s->rdft_data + nb_freq * ch; i = i_start + ch; for (x = 0; x < 2 * nb_freq; x++) { double w = (x-nb_freq) * (1.0 / nb_freq); - data[ch][x] = s->sample_array[i] * (1.0 - w * w); + data_in[ch][x] = s->sample_array[i] * (1.0 - w * w); i += channels; if (i >= SAMPLE_ARRAY_SIZE) i -= SAMPLE_ARRAY_SIZE; } - av_rdft_calc(s->rdft, data[ch]); + s->rdft_fn(s->rdft, data[ch], data_in[ch], sizeof(float)); + data[ch][0].im = data[ch][nb_freq].re; + data[ch][nb_freq].re = 0; } /* Least efficient way to do this, we should of course * directly access it but it is more than fast enough. */ @@ -1160,8 +1171,8 @@ static void video_audio_display(VideoState *s) pixels += pitch * s->height; for (y = 0; y < s->height; y++) { double w = 1 / sqrt(nb_freq); - int a = sqrt(w * sqrt(data[0][2 * y + 0] * data[0][2 * y + 0] + data[0][2 * y + 1] * data[0][2 * y + 1])); - int b = (nb_display_channels == 2 ) ? sqrt(w * hypot(data[1][2 * y + 0], data[1][2 * y + 1])) + int a = sqrt(w * sqrt(data[0][y].re * data[0][y].re + data[0][y].im * data[0][y].im)); + int b = (nb_display_channels == 2 ) ? sqrt(w * hypot(data[1][y].re, data[1][y].im)) : a; a = FFMIN(a, 255); b = FFMIN(b, 255); @@ -1197,7 +1208,8 @@ static void stream_component_close(VideoState *is, int stream_index) is->audio_buf = NULL; if (is->rdft) { - av_rdft_end(is->rdft); + av_tx_uninit(&is->rdft); + av_freep(&is->real_data); av_freep(&is->rdft_data); is->rdft = NULL; is->rdft_bits = 0; -- 2.40.1 From patchwork Mon Jul 24 22:00:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 42957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2208223pzb; Mon, 24 Jul 2023 15:00:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRbyVQWv7ivh4WGlcaLod5Pm0ilVlsgsQz2VJZ9TYOvg0U7HaTaBiPfV6x+TQPIeJXFRdV X-Received: by 2002:a17:907:2cf3:b0:988:6491:98e1 with SMTP id hz19-20020a1709072cf300b00988649198e1mr11822667ejc.42.1690236054438; Mon, 24 Jul 2023 15:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690236054; cv=none; d=google.com; s=arc-20160816; b=Tx2oka+V+lTlj2mZYGv+GsXwJHARLCcG0tCubNdUUBmd2ChRlqOFvfuBbDj7mbSBVI J3ow8Q9a7RNx1sYkUs9Qb8of32ExkGAmnzjW2O881vrMvVOc2ZQkcevjxCw6UUnrQDaV siLi6oNxEHfNcUDGOYRyi9+g6+JQ1FQKCwJDaJaoLLAA3jO2RYUCDBlPTIIhLgerD11h 2f94XXk7PXQnFkEz7YfRpaqGcCpkIfl6ZQqSmTUGCV2scTSlV7DrFHUiexsGo9wgK4bX tJJZnXRoHlwdGKxcG8LjvTDmvmUoeM52gQOs8S2s3n87DMqSUfWxfAwdt2Q6Dc7Bzk4j PGiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=2aW0DFm+zDqwP/2BuflYwpe/uiAGD1iR/r5fU4sd+hk=; fh=awftJPkKIDcYG+GZSKK7EGrS2s4rqD3QuLTgwd5DXmc=; b=iASB1HAHmOLswp+B1ZfhwcyfKR50WGhf+TC8sLbrT3O3BJIiv88MXiqUE/aox5VNZE YosnMpPAP1Mo8MkkEmQ0EH5RPs+HOT++3y6xnNMG56X6tAcOHV1dYZ9kCQjBoV1+s7ls vqntQQwmXb2aSSxvH/Jp85R6A3Hi8/s5dH8R11cZ8rWkWf7Ww1DDBJr/LPgE4iHQyqH6 3OuF4g9KY1yIyipWoWvuZdtHuNgDbP/vI0TsZU6W2U2yRXYK7/I1vsbTW7QFE4iGAP2m FQpltW6mu0CLgbIQ3MBtU9/xH8KX9I0IC2UhmdblopY5qA0R9+VD6elSQbtKN6sKbePa 3rtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=jUdbnuSw; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gl21-20020a170906e0d500b00997e71d037csi7162791ejb.618.2023.07.24.15.00.52; Mon, 24 Jul 2023 15:00:54 -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=@lynne.ee header.s=s1 header.b=jUdbnuSw; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51EBD68C7EA; Tue, 25 Jul 2023 01:00:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00E7E68C7CF for ; Tue, 25 Jul 2023 01:00:43 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 43C9F106015E for ; Mon, 24 Jul 2023 22:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1690236043; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=xvnhuVtwyeT2v6frkVqdnJj+nzwZwOI9gk327jbiQnY=; b=jUdbnuSwD05v6mTJ5W/N+6kOBO8X5ScDYKbslZLFhGLQbEUMty+mBDFUBDc2x2N1 gqYfNDtSDsaNkzqs9y1ft7N7ANCiq7eqQZWZjphULoH+2ivufZKWWmk/qXu8NZ8EBvu DxS77cRkVKTw9KpiJilLZVktxAXfmJsluSaeadtR9wqL90LjqMnAVL6uJUdBbU4w6Cy uG+Ct5PKnBdTSyD8aNzBkkzm0rwUZZxkjZ2rXkar1b/Bm8WyW4cKiP77gBqz4aBZcbZ 9TF7PYXQNE4mMSiQEIeLXfbxPygtSG5GtWpSnD5NHqkLyynyqp3LZEDxKhtHZXVYwP1 8N6xcRW0OQ== Date: Tue, 25 Jul 2023 00:00:43 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/avfft: deprecate the API 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4GrVn9JF9+rU This deprecates the currently unused API. Patch attached. From 8cf7041345ebef47e710b65395095190ea88dd4a Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 24 Jul 2023 23:55:55 +0200 Subject: [PATCH 2/2] lavc/avfft: deprecate the API This deprecates the currently unused API. --- doc/APIchanges | 4 ++++ libavcodec/avfft.h | 25 +++++++++++++++++++++++++ libavcodec/tests/fft.c | 4 ++++ libavcodec/version.h | 2 +- libavcodec/version_major.h | 2 ++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5afe8bcb75..38fc0b1459 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-07-xx - xxxxxxxxxx - lavc 60.23.100 - avfft.h + Deprecate av_dct, av_rdft, av_fft and av_mdct. + Replaced by libavutil/tx.h + 2023-07-xx - xxxxxxxxxx - lavc 60 - avcodec.h Deprecate AV_CODEC_FLAG_DROPCHANGED without replacement. diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h index 0c0f9b8d8d..6401833089 100644 --- a/libavcodec/avfft.h +++ b/libavcodec/avfft.h @@ -19,6 +19,10 @@ #ifndef AVCODEC_AVFFT_H #define AVCODEC_AVFFT_H +#include "libavutil/attributes.h" +#include "version_major.h" +#if FF_API_AVFFT + /** * @file * @ingroup lavc_fft @@ -44,26 +48,38 @@ typedef struct FFTContext FFTContext; * Set up a complex FFT. * @param nbits log2 of the length of the input array * @param inverse if 0 perform the forward transform, if 1 perform the inverse + * @deprecated use AVTXContext from libavutil/tx.h */ +attribute_deprecated FFTContext *av_fft_init(int nbits, int inverse); /** * Do the permutation needed BEFORE calling ff_fft_calc(). + * @deprecated use AVTXContext from libavutil/tx.h */ +attribute_deprecated void av_fft_permute(FFTContext *s, FFTComplex *z); /** * Do a complex FFT with the parameters defined in av_fft_init(). The * input data must be permuted before. No 1.0/sqrt(n) normalization is done. + * @deprecated use AVTXContext from libavutil/tx.h */ +attribute_deprecated void av_fft_calc(FFTContext *s, FFTComplex *z); +attribute_deprecated void av_fft_end(FFTContext *s); +attribute_deprecated FFTContext *av_mdct_init(int nbits, int inverse, double scale); +attribute_deprecated void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); +attribute_deprecated void av_mdct_end(FFTContext *s); /* Real Discrete Fourier Transform */ @@ -81,9 +97,13 @@ typedef struct RDFTContext RDFTContext; * Set up a real FFT. * @param nbits log2 of the length of the input array * @param trans the type of transform + * @deprecated use AVTXContext from libavutil/tx.h */ +attribute_deprecated RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); +attribute_deprecated void av_rdft_calc(RDFTContext *s, FFTSample *data); +attribute_deprecated void av_rdft_end(RDFTContext *s); /* Discrete Cosine Transform */ @@ -106,13 +126,18 @@ enum DCTTransformType { * @param type the type of transform * * @note the first element of the input of DST-I is ignored + * @deprecated use AVTXContext from libavutil/tx.h */ +attribute_deprecated DCTContext *av_dct_init(int nbits, enum DCTTransformType type); +attribute_deprecated void av_dct_calc(DCTContext *s, FFTSample *data); +attribute_deprecated void av_dct_end (DCTContext *s); /** * @} */ +#endif /* FF_API_AVFFT */ #endif /* AVCODEC_AVFFT_H */ diff --git a/libavcodec/tests/fft.c b/libavcodec/tests/fft.c index 163f3e89c4..a9ea457bc9 100644 --- a/libavcodec/tests/fft.c +++ b/libavcodec/tests/fft.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +FF_DISABLE_DEPRECATION_WARNINGS + /** * @file * FFT and MDCT tests. @@ -675,3 +677,5 @@ cleanup: return !!err; } + +FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/version.h b/libavcodec/version.h index 9411511e04..728ab8839d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 95c5aec0c5..cfd0b5023e 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -50,6 +50,8 @@ #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61) +#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62) + // reminder to remove CrystalHD decoders on next major bump #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.40.1