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 2205D42045 for ; Mon, 21 Feb 2022 12:09:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1E7E68B18A; Mon, 21 Feb 2022 14:09:05 +0200 (EET) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C05D68B095 for ; Mon, 21 Feb 2022 14:08:59 +0200 (EET) Received: by mail-oi1-f169.google.com with SMTP id q5so10563039oij.6 for ; Mon, 21 Feb 2022 04:08:59 -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:content-language:to :references:from:subject:in-reply-to:content-transfer-encoding; bh=rrsF6f6hqcIX0T8jglL6XhHtf80NykrZMJPduYyN6Oo=; b=GJX73G1fWqvEUdjb0DvyCuJd69XJ7KY8wuABIv3a92Fd0gbPWtvYw/ILI2aB4mxxUv 7WtWQYfoAtryuo3fmK7K5JQNTiOYSO8uE13bU1A5EVZTut4cp5f+zku6qkj8pHcs+MH5 OcxUSwSL26YttmzIqcIKIVfMg4EJYfj/FK0TfiyFm8HACn4sHEXIOFaeUqfhQcH1hR2g XwQJvIZQYhjwbga6iaRGJHb48QvyHSJbNbNLBQ++qavqgoGE1LgQ+k8f2aOS6B2EGS6r 7bPqYTUAj/H3DpbYstz93253OWPj9bi8TKiM9G2bgzAXfrpDLOUFEbrEY9rJPFVX9qPs Gt2g== 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 :content-language:to:references:from:subject:in-reply-to :content-transfer-encoding; bh=rrsF6f6hqcIX0T8jglL6XhHtf80NykrZMJPduYyN6Oo=; b=QMhi8TlEJKBaWnMLiN7m5NI29C091p1V9kDL7fCGxSTumCXV8oNCZCIGFu/wuLOBnC D7OzHrA3OTGH3tcmBvywrUGdk1rVM/9J2YEgoQp3Jft0az0hu39JK5BDpGIFzm63yCCG tCO8ajl8u0u2Qv7oKzwBPnf07hoEpgN4ql+la3wFZAyHLJAaeHVd8McrilquoHdh+he8 3U357AzV8WOf/K8KhcD0vIfflztLLDRUPqLfNkQcM4w00CkUwf3+fC5e4W2umOUAfpGM MvaBUUSag5i3eL0MW6xqjDO610C4U6YQ9GDLMH+vMg47TMaswVMQg2XO6vkOKrYthdXy a60Q== X-Gm-Message-State: AOAM532FJtVfRagcIlQLep5kCTrKaIc4tRi0L828P0WSTh3reXox2+bx dDQ3BZ3IArrawgGOSh3mmYJE4RiAZLxXbg== X-Google-Smtp-Source: ABdhPJzcrGix4W2s+5i0ShfHq/znQxuB8n1F9w+9SJ5nIVq8gT/5dOb2SsaOasbZeHU5tLgbdyXA2Q== X-Received: by 2002:a05:6808:ec6:b0:2d2:7782:4f92 with SMTP id q6-20020a0568080ec600b002d277824f92mr8577923oiv.31.1645445337269; Mon, 21 Feb 2022 04:08:57 -0800 (PST) Received: from [192.168.0.11] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i18sm4794199oob.36.2022.02.21.04.08.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Feb 2022 04:08:56 -0800 (PST) Message-ID: <9efd1fb1-a879-c617-f957-2beaeed36af2@gmail.com> Date: Mon, 21 Feb 2022 09:08:54 -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: <20220220220242.401901-1-onemda@gmail.com> <51258010-516b-ca27-4dba-3f05506ea5b3@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 8:33 AM, Paul B Mahol wrote: > On Mon, Feb 21, 2022 at 2:54 AM James Almer wrote: > >> >> >> On 2/20/2022 7:02 PM, Paul B Mahol wrote: >>> Signed-off-by: Paul B Mahol >>> --- >>> libavfilter/audio.c | 11 +++++------ >>> libavfilter/framepool.c | 16 ++++++---------- >>> libavfilter/video.c | 11 +++++------ >>> 3 files changed, 16 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..ebfd5dc0e0 100644 >>> --- a/libavfilter/framepool.c >>> +++ b/libavfilter/framepool.c >>> @@ -76,14 +76,10 @@ 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++) { >>> @@ -92,11 +88,11 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* >> (*alloc)(size_t size), >>> } >>> >>> 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, >> >> Why are you removing the padding on each plane? Just add align padding >> bytes and it should be good. >> > > linesize[i] is already aligned, why would there be need for additional > align at end of buffer? FFALIGN(pool->width, align) can be pool->width. If so, then there would be no padding at all. > > >>> 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".