From patchwork Wed Jul 31 12:55:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp455176vqs; Wed, 31 Jul 2024 06:01:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwP5xhtjOOWUUVe9VLy72o6ebWUeGzQMNUvIL7n1/wUr2mONAlFUwQuGPw8/EbcMXn/tTBzuuJiRTWQ1WCfWFWNw6SrWgtEzU2LQ== X-Google-Smtp-Source: AGHT+IF9Yux0Z/qFICMjplj81d91O9Bhgjul3HTZH9TbwkHCeouT+i7qAh6NlGwh1XRFpEkPAu50 X-Received: by 2002:a05:6512:2522:b0:52e:fc01:ddfa with SMTP id 2adb3069b0e04-5309b259bf3mr11159140e87.7.1722430918421; Wed, 31 Jul 2024 06:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722430918; cv=none; d=google.com; s=arc-20160816; b=JTs9P/opOoS5UmCPGJV683av9+cXcA/NaNynCPLgrjv26xgL6wbRN+oXgBk77YMB6x vXqzWZZ8bkc67CSs/B2pB/PU99EuNBNCr0Yat94hXzFOVuj4OtIo5uw7Er4IyyS4uaoN iFSee36OSzRZtyETr4R5ZzeEu8h/mXu99EW1EFeiHD2mRXggJKPncsSWJv80YdiMQzq3 six4ld9xzuYYyzAR40xt+hz+oRzbaTdaeebxbc9Bv/OdD68fP9rhI1dyfmp4YYUG/ZlE CqLmQpsj8x5bvuEZ8nYHovPNsF8v1Jgs/AFkeGodOmurpT5lBH3IMNTr0IMo3MhygkMP erWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2IRNhCJ66RGEV53IRBJyZd7Mlu24qSSRMhZ7ocCMvnE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hto4xdE1KywjcQZmYc3NfqeQhSRVNhwGTCvRtiWT9PwAH3/piHBwrZUqCFsDL7DT+I VXkerBaYoVw6zOzCPYoFWHwgbdGG7rApsY/QMdKgC5dsi2gpC+yCUArJ6BlAleNKx1mq 2vFxDWDt1TlNX4Ww0EmQCQZ4Zru9ureEwAxr6yGktMC8EV91776/FQfsLwKm/ap20dxo OcPEiogo68BnCVy7YPsm+HU0IADsH6d6gRchAQv9AFRKOmbugQvC4p6G+uw5tzajayC1 D5fRwVko5yN18+l+sxvpNKK/2aykgWvwUiiKkTdxnh+GzdphbzFZdmgvlEOmc1fdAPIY QMew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=c4yUvI1O; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52fd5beedbcsi4203809e87.277.2024.07.31.06.01.57; Wed, 31 Jul 2024 06:01:58 -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=@gmail.com header.s=20230601 header.b=c4yUvI1O; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B7B168BDE1; Wed, 31 Jul 2024 15:55:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5AFD68BDE1 for ; Wed, 31 Jul 2024 15:54:56 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7104f939aa7so469294b3a.1 for ; Wed, 31 Jul 2024 05:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722430494; x=1723035294; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/5rASMi8P8kP2kvhpPjU4cF79kBxRM17JyEra8ozrh4=; b=c4yUvI1OsoacCfWfpln7J9AJUlvBkfj5Q6EujZnEX0vuLYUBNm+oUeQTU6J0r9HbEC 9Ed2lLyVEqhy10/4FfvUF3V5NIwXbLxGjwtZDLKHhDBl9AGcYgy3UHwGqTQLVSLtGNij oXXVIjyHsj2Kp8Vy+RVqERkX99LQiqlkI770lmYmrnBKgw8GRcE1bi/4yGZYXsQhDzwj QlwB2r5eMAjrf5I5Md8KiSQDoKOiwk3iFeSPZtv1Wi6rVvEgZ4yWiOkSvvV3jXGHWbKs TbCUr8vsQ9cQBnHvSDtKJ4M5jHYumQpPa+xK1p4OCRm3d5dFgVWDBl3RdxrIrKESCllV UWjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722430494; x=1723035294; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/5rASMi8P8kP2kvhpPjU4cF79kBxRM17JyEra8ozrh4=; b=IjttJap+YbkFYY1lBCcsDJIVNvYMbM6EB3oOJYzhl1qYWAg3LPzbqEMor9rWdON69d K1rBjID7vBafsvEkLFt/VNoOuD6BGZPB9z54yIc7B8I0JASbzfffGyEdWTQK5Ktfy8di 2Ac7LuCaiWsUNPI9wr/bIuUyx9nEa7DtoAuOG9UGBXDmsNy1sUjekcG2fBXk8Oy/U8K/ Vgrtv6SEWdlzQPzVNTAAmma9fWNznlT7o8s9xs1z+Ph5uUxk03A+oiE5ytpkBkBrhTYJ n8MupeGl7neqYrmvuvKSu79MbPRWeV5POC9nDzTpydXZOal1J/9iTDLw3ryCA7HDGjiy 8ZmA== X-Gm-Message-State: AOJu0Yx1xwW6psPqu3TOVANEM8P/szuFtKwsBf/7d/2+n94uw/Bwdfjf 1w25hYDIpmhjD1kMmE2sUyBBqjWAKho4Ydx4x+ytfJjVEYTdTkxFB8/bsA== X-Received: by 2002:a05:6a21:394b:b0:1c4:a5fe:321b with SMTP id adf61e73a8af0-1c4a5fe33f5mr16991886637.18.1722430493730; Wed, 31 Jul 2024 05:54:53 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cfdc45b4aasm1248695a91.27.2024.07.31.05.54.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 05:54:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2024 09:55:23 -0300 Message-ID: <20240731125523.63406-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/frame: use the maximum compile time supported alignment for strides 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: NTQr7QRWeWKh This puts lavu frame buffer allocator helpers in sync with lavc's decoder frame buffer allocator's STRIDE_ALIGN define. Remove the comment about av_cpu_max_align() while at it as using it is not ideal when CPU flags can be changed mid process. Should fix ticket #11116. Signed-off-by: James Almer --- libavutil/frame.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 673a9afb3b..5cbfc6a48b 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -166,6 +166,8 @@ void av_frame_free(AVFrame **frame) av_freep(frame); } +#define ALIGN (HAVE_SIMD_ALIGN_64 ? 64 : 32) + static int get_video_buffer(AVFrame *frame, int align) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); @@ -182,7 +184,7 @@ static int get_video_buffer(AVFrame *frame, int align) if (!frame->linesize[0]) { if (align <= 0) - align = 32; /* STRIDE_ALIGN. Should be av_cpu_max_align() */ + align = ALIGN; for (int i = 1; i <= align; i += i) { ret = av_image_fill_linesizes(frame->linesize, frame->format,