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 3813E4206E for ; Mon, 21 Feb 2022 22:36:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8185568AF62; Tue, 22 Feb 2022 00:36:27 +0200 (EET) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FDA268A2D7 for ; Tue, 22 Feb 2022 00:36:20 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id ay7so12480617oib.8 for ; Mon, 21 Feb 2022 14:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=hrvTvF1Elbzzt7BbnaphRGowqkrvL6vE0YKT0tylCKQ=; b=Q9YL5WvHbramBG9TLjvthXCtiJIRP7Vn/4V8Dw08CPYswwP30Raq2vTcvG7TrSJugf zOxd3M2i44v+pvCj0h6gCnPL7VvVxEAN6m3Lzm0HYeZ1U/xBBAU7AFGY9/16Qt6NWovF PDVeHGI7+I5KP4IUFbluWVv3293jVagn4S/niiEmsNQYlAwBzgV3LFnHZWbYcqOqjBZx kEnHroqP9eEqRpr949SeVB2wycNfP2K2Rnog5PW+m3LYP5VcdzWbpTIsU99eLy8GyrcS J80Wdh89JS4Fndy0UEFAa/CfwBZMKx1QV6xxMm2IjpECVDGIH/Tt48yiQPggJXeUdAIr spvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=hrvTvF1Elbzzt7BbnaphRGowqkrvL6vE0YKT0tylCKQ=; b=RqqyXhLxddCs4XzW+V55xYq7VRYhclMulr9wTW7kgWtMUH8TZB521XtvYC5DlBIeod fQ+kICZNoH6Z0ES7RLANz8wXC6OLD6zeNw0pI/AjMaFy3VpNJ/IU9Gv+Y41+JI4BKpWU ay9/70JEondi0SlAcp1sveQ1hjSePG4ZQUdeG5td/WRLhfTK1jqP5f+2ghByDr9apIbk /KYjW5x091kJW3WDUnXFLjfFOzAkC4y3/tBbc8+QePtU/MdsGZVc0pNmaOVD0wqbSziN 6GzEAoZgCf65IPzGaszvSl270E35zNPSq7c7P5MXXOLp4meLJyVLpfklN2/UHCdtIdKF s1Dg== X-Gm-Message-State: AOAM532VCeqqx0vuehs4LLbZw1rozKEAh45kb1iKQf/s3wDwvfK7swFQ yeHrzFDwvt9+aZ9yflsLCwmG8gPTi2+STg== X-Google-Smtp-Source: ABdhPJyEuJoXnw1X5kpH/gvlSMo8t+fTpkB3zl1TAJrLxmbMolAuaq/I9eKWYfYT4YdyngjdIJiL3w== X-Received: by 2002:a05:6808:308d:b0:2c8:feb5:9cc7 with SMTP id bl13-20020a056808308d00b002c8feb59cc7mr613406oib.139.1645482977451; Mon, 21 Feb 2022 14:36:17 -0800 (PST) Received: from [192.168.0.11] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id r30sm2670756otv.18.2022.02.21.14.36.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Feb 2022 14:36:16 -0800 (PST) Message-ID: <0cf9f212-8b16-df7b-f6e4-6a3613a36df1@gmail.com> Date: Mon, 21 Feb 2022 19:36:14 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220221122715.424475-1-onemda@gmail.com> <7e0b30ef-2d37-fba8-a5f7-9ef5dd678b69@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avfilter/framepool: fix alignment requirements for audio and video filters 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/21/2022 3:14 PM, Paul B Mahol wrote: > On Mon, Feb 21, 2022 at 6:57 PM James Almer wrote: > >> >> >> On 2/21/2022 9:27 AM, Paul B Mahol wrote: >>> Signed-off-by: Paul B Mahol >>> --- >>> libavfilter/audio.c | 11 +++++------ >>> libavfilter/framepool.c | 18 ++++++++---------- >>> libavfilter/video.c | 11 +++++------ >>> 3 files changed, 18 insertions(+), 22 deletions(-) >>> >>> diff --git a/libavfilter/audio.c b/libavfilter/audio.c >>> index cebc9709dd..a0408226a3 100644 >>> --- a/libavfilter/audio.c >>> +++ b/libavfilter/audio.c >>> @@ -22,15 +22,13 @@ >>> #include "libavutil/avassert.h" >>> #include "libavutil/channel_layout.h" >>> #include "libavutil/common.h" >>> +#include "libavutil/cpu.h" >>> >>> #include "audio.h" >>> #include "avfilter.h" >>> #include "framepool.h" >>> #include "internal.h" >>> >>> -#define BUFFER_ALIGN 0 >>> - >>> - >>> AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples) >>> { >>> return ff_get_audio_buffer(link->dst->outputs[0], nb_samples); >>> @@ -41,12 +39,13 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink >> *link, int nb_samples) >>> AVFrame *frame = NULL; >>> int channels = link->channels; >>> int channel_layout_nb_channels = >> av_get_channel_layout_nb_channels(link->channel_layout); >>> + int align = av_cpu_max_align(); >>> >>> av_assert0(channels == channel_layout_nb_channels || >> !channel_layout_nb_channels); >>> >>> if (!link->frame_pool) { >>> link->frame_pool = ff_frame_pool_audio_init(av_buffer_allocz, >> channels, >>> - nb_samples, >> link->format, BUFFER_ALIGN); >>> + nb_samples, >> link->format, align); >>> if (!link->frame_pool) >>> return NULL; >>> } else { >>> @@ -62,11 +61,11 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink >> *link, int nb_samples) >>> } >>> >>> if (pool_channels != channels || pool_nb_samples < nb_samples >> || >>> - pool_format != link->format || pool_align != BUFFER_ALIGN) { >>> + pool_format != link->format || pool_align != align) { >>> >>> ff_frame_pool_uninit((FFFramePool **)&link->frame_pool); >>> link->frame_pool = >> ff_frame_pool_audio_init(av_buffer_allocz, channels, >>> - nb_samples, >> link->format, BUFFER_ALIGN); >>> + nb_samples, >> link->format, align); >>> if (!link->frame_pool) >>> return NULL; >>> } >>> diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c >>> index 7c63807df3..5b510c9af9 100644 >>> --- a/libavfilter/framepool.c >>> +++ b/libavfilter/framepool.c >>> @@ -76,27 +76,25 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* >> (*alloc)(size_t size), >>> } >>> >>> if (!pool->linesize[0]) { >>> - for(i = 1; i <= align; i += i) { >>> - ret = av_image_fill_linesizes(pool->linesize, pool->format, >>> - FFALIGN(pool->width, i)); >>> - if (ret < 0) { >>> - goto fail; >>> - } >>> - if (!(pool->linesize[0] & (pool->align - 1))) >>> - break; >>> + ret = av_image_fill_linesizes(pool->linesize, pool->format, >>> + FFALIGN(pool->width, align)); >>> + if (ret < 0) { >>> + goto fail; >>> } >>> >>> for (i = 0; i < 4 && pool->linesize[i]; i++) { >>> pool->linesize[i] = FFALIGN(pool->linesize[i], >> pool->align); >>> + if ((pool->linesize[i] & (pool->align - 1))) >> >> Wont this check always succeed? >> >> > Works here fine, it just there for case of possible programming error in > future. > It never enters that condition here. Ok, LGTM then. > > >>> + goto fail; >>> } >>> } >>> >>> for (i = 0; i < 4 && pool->linesize[i]; i++) { >>> - int h = FFALIGN(pool->height, 32); >>> + int h = pool->height; >>> if (i == 1 || i == 2) >>> h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); >>> >>> - pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h + 16 >> + 16 - 1, >>> + pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h + >> align, >>> alloc); >>> if (!pool->pools[i]) >>> goto fail; >>> diff --git a/libavfilter/video.c b/libavfilter/video.c >>> index 7ef04144e4..fa3d588044 100644 >>> --- a/libavfilter/video.c >>> +++ b/libavfilter/video.c >>> @@ -24,6 +24,7 @@ >>> #include >>> >>> #include "libavutil/buffer.h" >>> +#include "libavutil/cpu.h" >>> #include "libavutil/hwcontext.h" >>> #include "libavutil/imgutils.h" >>> >>> @@ -32,9 +33,6 @@ >>> #include "internal.h" >>> #include "video.h" >>> >>> -#define BUFFER_ALIGN 32 >>> - >>> - >>> AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h) >>> { >>> return ff_get_video_buffer(link->dst->outputs[0], w, h); >>> @@ -46,6 +44,7 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink >> *link, int w, int h) >>> int pool_width = 0; >>> int pool_height = 0; >>> int pool_align = 0; >>> + int align = av_cpu_max_align(); >>> enum AVPixelFormat pool_format = AV_PIX_FMT_NONE; >>> >>> if (link->hw_frames_ctx && >>> @@ -65,7 +64,7 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink >> *link, int w, int h) >>> >>> if (!link->frame_pool) { >>> link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, >> w, h, >>> - link->format, >> BUFFER_ALIGN); >>> + link->format, >> align); >>> if (!link->frame_pool) >>> return NULL; >>> } else { >>> @@ -76,11 +75,11 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink >> *link, int w, int h) >>> } >>> >>> if (pool_width != w || pool_height != h || >>> - pool_format != link->format || pool_align != BUFFER_ALIGN) { >>> + pool_format != link->format || pool_align != align) { >>> >>> ff_frame_pool_uninit((FFFramePool **)&link->frame_pool); >>> link->frame_pool = >> ff_frame_pool_video_init(av_buffer_allocz, w, h, >>> - link->format, >> BUFFER_ALIGN); >>> + link->format, >> align); >>> if (!link->frame_pool) >>> return NULL; >>> } >> _______________________________________________ >> 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". _______________________________________________ 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".