From patchwork Sat Feb 18 12:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 40441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp529657pzk; Sat, 18 Feb 2023 04:20:20 -0800 (PST) X-Google-Smtp-Source: AK7set80wh13zDkX18xOzt945FXnrbo8Yvd3BoWt4o032eqdtoiYzvU4KdqxV1O+GaDf7TzGVjeI X-Received: by 2002:a17:906:90ce:b0:889:7781:f62e with SMTP id v14-20020a17090690ce00b008897781f62emr1096242ejw.22.1676722819580; Sat, 18 Feb 2023 04:20:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676722819; cv=none; d=google.com; s=arc-20160816; b=HbIdFzowcN7/G5wnxMKCXg6sdzU6P+Jnbnw97xqw85j6p3/giHi7yj7bARwMNRXhp+ yBgXZirtj2cW9cDyRVNetODRHPeEmKnDLujMUO6Yf8BmIrpjWM8XzpIM6y4sYxt1z+KC q7XdbcJmwZNWXUlweijD5bak1E9+NEWKPZpoHuXeO1Xn2jf5t3YuMW3Vspuvm1b2xMxk JP5I3aSFbKRBPXNmARyIz4R+m+RQL7SvWYkQLaQH59/n2XtCVBoiVN3c6sMgXA4LTah8 /4Rif9Cj1BtaOm8gZzOqYdDbcROMrWWocnU3cpPZ2GscZZe9ChYLTw7cAqsQjulLAtS8 LsSA== 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=zq7sY1mGUwWaTzCHpEzJZsrtLURWU9x+rb35TtKyJJc=; b=fF9QWhh/Bf5UyxSGkkRQkaIKYIOsv0RiJxDWV7cukV+nXPUCbCvcEH2iKQQ/aVFuvl ur2yNOpkZoqKDzvUGLItyPbCOmHKJVe/XxOQQZn76/zkRozD7i+TFCMC21eXgnvu41Wx AZKe0RJFgEkZw8lLr+qWF5hxutnPnj1cipkwpGnel1zeHSHQTYnKVvesXpuOzBYoke2h 8rhyEsFmkPRBIDbQdN40yGdmsWU9tLyzK2+Utm5OS5qvGzVis74+5vF0ew4EjLhZvLfu B1K8/SCWQjO2mDJDABTSLlfabKFmdTgZEl2FzzKTOfqcihn4aHFl1On4Lu9kSewkYVqH LUOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=PTyan9ef; 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 mr23-20020a170907829700b008b12cda2b2bsi9454722ejc.79.2023.02.18.04.20.18; Sat, 18 Feb 2023 04:20:19 -0800 (PST) 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=PTyan9ef; 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 A12B468BDEF; Sat, 18 Feb 2023 14:20:15 +0200 (EET) 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 BC8C468BB0D for ; Sat, 18 Feb 2023 14:20:09 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 5F1171060158 for ; Sat, 18 Feb 2023 12:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1676722809; 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=GftvI6Rk16VeDh4sUMjzFWBRsPgs0stUCuiu6D3Fdrk=; b=PTyan9efmWBFPBsQIx0DD+2kWD3pc+UoGko/nNuhJIwpwUCaqmcZrQz470u4Ks9U up+2n4bN8imcHI+bOp7wbna6HVfYwIa94/KtR8Ma3TOHOcnVzuRdAjmvFoW3n2GjuNN Ms4EuVzRhCoC9+Atwg5oYd/C+DKLjgE0hmpzk4Ggv9CrDaSunsWx6yUS9FDAjRMXqsS 3e5/IyH2wI3AH4Nosaj0CoAuyrbmT311QOgOaxyjXOkt6TfLYf/K1Mxuaeol9g61O3O zHVwuHT9ZPaDQ0K8l4b/mdsQHpGKFvSDYgNpo2wdMz91AjJB6e0IABn11ihLdWaqT+n BvBbJL00zA== Date: Sat, 18 Feb 2023 13:20:09 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: Hhkrpz44RN9v This ports the last user of the avfft/avdct/avrdft API. Patch attached. From 85dd7ac926d298217f3d57cd389351993a6ef39c Mon Sep 17 00:00:00 2001 From: Lynne Date: Sat, 18 Feb 2023 13:14:31 +0100 Subject: [PATCH] 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 d6479aef5f..234c09e074 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" #if CONFIG_AVFILTER @@ -264,9 +264,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; @@ -1133,6 +1135,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; @@ -1140,31 +1143,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. */ @@ -1173,8 +1184,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); @@ -1210,7 +1221,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.39.2