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 76B734204A for ; Mon, 21 Feb 2022 12:25:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CA6368B18C; Mon, 21 Feb 2022 14:25:52 +0200 (EET) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04D6768A305 for ; Mon, 21 Feb 2022 14:25:46 +0200 (EET) Received: by mail-ed1-f49.google.com with SMTP id w3so28998882edu.8 for ; Mon, 21 Feb 2022 04:25:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vHJxi9siRsJ4AMc48iqIMvWYogTQB6wOjzsGuxAnxP8=; b=Fqk/puhyWFSpKSJ2y9pJSBtX4iKiFFwsTEH3rOa5OF0vqs4oLsIixetg4Mv/nwWg9n 2QgCppkRVJmKYbIEW2JmTsoNY73Tg/cDfNxizDwLigJY3Ohhsh1yvj7/BTUorxjjt4FG HUtcJaBc87vbocmXf8JTsQPG4MlXlkI0W/92YIvEmExd9GQx60jeVnkLYkVI5jnlXHmV yWmpOpqdaqZ8ZpxaZmlDnS6XDSMeDesUGahNno/BPIoyJvHJ2woURXYTkyT11tV8tGLq CRfWxNbGwl6smXIurB8aXnmhFkLY/3aFqWZhpgJWl3gqij/MMuvn1Z3OjLP9lK6PUKtu gopA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vHJxi9siRsJ4AMc48iqIMvWYogTQB6wOjzsGuxAnxP8=; b=Dyux1XyaABUyQB6MCZfFLQuavAV277YTGVNVfOFxchWZwZLovGLuvetFmmQ6CYeCb6 xbqvDNtnqsRYIPBjaJjHjeJxbl1aK0ATXTnbaZkNDm4SKqvnHH5typ5uR75R1PpeCSiS sc6OT5nKhL9aslzP80QmdJLzCs7BDB4HNNFC5jnWfBNLxUc+ne7FL2Ur3hvvjYiUEwnY 3Xizn+r4CVN2SXRWtCsTmmpYEwUodK28r2LUuop6BQPjnDgFqA2OdmXdukJ5t+kgugpQ hQ+5PJjH1LpHmnlNFfSa/Ikne3/mZwRhax/Kr4gqoZ4ceeW76myA3MUPGDLXoDkzs2Uz ovdw== X-Gm-Message-State: AOAM5304ZrqVm5OBwhd8GqJ9mVuZ8rL4syba4VDpePZ6eYzcRLvY6uV5 s2YRHhynZMbC/9ADGKqx16HVnwtaHRs= X-Google-Smtp-Source: ABdhPJzXWMKck8vPp2bibcqdhpS6hG4aF7Wt6WPFuAQ1uCoSsiwYt7vjMyWyqjZLtLXxYsDLwQa19A== X-Received: by 2002:a05:6402:b37:b0:400:500f:f26 with SMTP id bo23-20020a0564020b3700b00400500f0f26mr20540443edb.301.1645446345467; Mon, 21 Feb 2022 04:25:45 -0800 (PST) Received: from localhost.localdomain ([212.15.177.16]) by smtp.gmail.com with ESMTPSA id v5sm8585973edb.15.2022.02.21.04.25.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 04:25:45 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Feb 2022 13:27:15 +0100 Message-Id: <20220221122715.424475-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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))) + 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; } -- 2.33.0 _______________________________________________ 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".