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 CF6804AB35 for ; Wed, 12 Jun 2024 13:54:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3A9B68D90F; Wed, 12 Jun 2024 16:54:33 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2087.outbound.protection.outlook.com [40.92.74.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2567B68D902 for ; Wed, 12 Jun 2024 16:54:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oo4+fcnW0R0PJq319iD8vkbdue/EAptaHdH0066fjcnCtB6Nd4uLyxBtlX3asDZEio2jvfcmuEBgb0Pn1z8uvDZPxqbIg3lpEsnFdttpXHsyXPTnfbPA8taA6c+GRQsIIBDl7E3K0sjm5Mx9Zn38rsQ+3LcsJ2/6OKie8B0Yy4NiGTu9YshBfCLSPUC4CkEkYl4xGyX063cLhlgOB5t17jagEkLZ9HTG1pH4L4NeDCmBGh/1f9X8uc5+zLpnWxjtIJfUSA4xJzkM6q83BUz1/eZHLSaed5ta59Mehn2r82N3MtPzUXGX2FNOzYmTUKjs5oQMkY1roZ/4cy0jpQLeZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TwmfUvA7wWqObfnzbdNyGlMK3FW/+2QjvjPvs8H37dg=; b=H0z5TcDXKjSmLxcjv14ut16Y0icBq8pThyBmiirhOgBSSgl1DRQShqfNhuC+s8DEzmlhgk6lT0OZl9HFtPmZwt7EhoqLwL+N5tXKXvmfPwL3aDu3oJbKJjkYJFGZ+XDuePMmDLINIUSzqk55Q+TEr0vbSrIB6PTKpG51CvsZjOd/Ko0HbUfcvf1AhgTSs8nbc1YcqH89VJYDpfR1azEXdNPt6kOvTrRCc17zip6xwpNIIdz+2hEUVAp98z1QEriggcTNZq1iXTrqpij36cEb9uDcitY6eDUHXaaITmNbevkR+iW7QOtaUdPYzertsFr1QsAOpluGpLT42IwbaheHIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TwmfUvA7wWqObfnzbdNyGlMK3FW/+2QjvjPvs8H37dg=; b=ip48o7gjFFKkfbn+pbo2shBxHwEt96D/GWXr4CdCA15jMNRRQiuGJnfabFMJ1PbAAI1HKYB/DwEQRvCV0qJqZnLwNPmc59Z+so39Nt8saWEYunuP0fKXHfyaX6ZfGeG1hTjIDaJSMsyHRAkLO/m9qsdg1TfKw3cuUjSltB0ftIcaUxG4FAN1F5VbN/OQNKHnsOhPBarihYuBkSDo3eaDe79yGyrCj6jjnskmj8UKIjNfqG1C8FABqxdUVzeiKlDXM4peSjiQVNYF5etbzQheVvCVyjAfQbPpocdvuYqCFHLZzRicXzgCuV3oyta3T9sC+Z60BFDSLC61YLYQcUSCWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0204.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:54:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:54:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [SxV3qU0r5twRMh7MWcKGHqCZyGqQKD2eNWpG16z1VaI=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-33-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0204:EE_ X-MS-Office365-Filtering-Correlation-Id: b7010d78-3c62-4565-ab7d-08dc8ae72dac X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: R8RlciyZbdM5aVMXVV+dZn1etZZ23jo5uNqIFKW84RajbuuVVbzIh+aDmTSUZGAekloZOnb/F4nUL0zoGDgEe/AB9+C99Ft9vtYCVuqERIVugJ2AQYpfIoAHRZocjIRy7M5K6/jLdxtR7+/NlZUrZjgLiTwfttHDfKg5uBnlc014wSGKvkDTXfAhWgmwe1GT9hehkQd4ZWNmN6PUHV1DLkmueBDie9CSx/tr0mC21dVODcsHLS90t0zQUcnwIqjiBlG5PqPi/Wssbtf8WgzxkSLNZHtcLH4wXH71pvWVXV3B0Aa4WgAexW5P9gtLJSgxfCXlkpILeA23ewFDNs0HfazJIEnXTyh9UBG4gUGmUCM93Tt9vhc7fgUU98PAr+5nteQz1QoPlqtzajqVZobYnIq9TclHYLToJowC2elCMRy0gLgAU9An/a/ugZK19knj0OqieTrxhmAWful4Um8c4fezH23Fpii8PTDyd57+S0+lLWmYyBUoqaPJu3hIsBuPld3kYJLJUWzW/CdGDcmJPJ29hXEam7WGQsYxOUte234LI/eRGsRZd0PjB/m6N2KBluOMMgkr0B+09D757i0wcz8W45uryIy86d9r5fDJgOuHSizEFLsKMT8vAF6tXRgp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SxAiqL22gv7WHzQXZz325PxYeHvQK01KKYrZtSeXC+KzKrFCSY/dYUM5HKa7?= =?us-ascii?Q?fLvaqlv94l8DAXszQttWr0hfCvfYHWZJyS6oa2KhNk2bob2/v1GzKMtekWCc?= =?us-ascii?Q?KeYhtvdhX0d4YTnCIDGONGfqwRxvQYEKv0fCyzhabq2W7mMQGwVXsBX9J1dD?= =?us-ascii?Q?hxN92DeOB0nS2FwQR5OYcnC4uluwldJ8Wg+IjXCQzFMUJOKb/GKeHwBF1Ppd?= =?us-ascii?Q?Slxy7ipBcXkd3BC/3QNua+Vjsry1Nqe3PKHhNAMC7QmEvPcD14p4ioWfF9WK?= =?us-ascii?Q?6zXz+T7RG6bbeWZmE1AOECoeion0pC+gVervS78OauQZ26CT9WDazd+pMKYc?= =?us-ascii?Q?U/rIvyFy67OjqA5o99oSmD6kxer1BvzJShzsuyRJxIjtWCnudxgX4Ptj6/pp?= =?us-ascii?Q?gdGx90MaAGUeTrxna/Xc9g5hGn431jTNV223idkByL6o+1xTYH3W5CxX2Gmj?= =?us-ascii?Q?OSirSlwmYuiWmGdg5HFqRCCEToMGh8N1knWtM2b0jXUnvJLUCa5n9TvexNNF?= =?us-ascii?Q?03bUvWjRDNj4UJ5lOtWB7GEP+TodlhYxCOyfcy9YfWwE8f5Midaff9fsIXA7?= =?us-ascii?Q?/hMQMo7vrozCF4YzvfJvy0udLGI9tIZAKC4VrfGgb5KttcQrg2Sr/6c/cJmh?= =?us-ascii?Q?T0//Q5GiDE0w+ogm/25q/WRtxdTddtk/c9xgFKyxKLQCqH/5hUDA2sf0wivY?= =?us-ascii?Q?JZPtxdwU7hm2D235KBPB0qjKXqFaM/RE2JnBGGJZsrcINbwbSjWaXl8vz/yb?= =?us-ascii?Q?Ohx5S4SPTBjrpTidvIyPKGVmRC+yo+mmy6AEaQhfyOJzeUV8juSIiJVOjUhR?= =?us-ascii?Q?MXu1osNSgVWCnMltveO8o1otiksu4bGUrm8OjAMyTWDJPEaHTbsioE70GH8T?= =?us-ascii?Q?JMrog5IWi5+LF1JepdjETuk707ZXp8f9ECf3DOOd6jyMAC2vf1gLjQ6w7DQc?= =?us-ascii?Q?ye3kzTm3ynXlURxmi6uyukjV0gZkRIiLsfQAC+k3UDHOsJcFVCJjnYLONecP?= =?us-ascii?Q?BFZAo89Uu5BkrjVodPqTUz5D22hJf8mcGwZoIAxbO06Ou77JZY29p8IYMa+h?= =?us-ascii?Q?93oLTAZ75hCmLIMnROefJW7g+5XxsRS/pZxKnZGKaEaR2dISU+akjjgpLcrJ?= =?us-ascii?Q?4Cl+GFQCZ/q1aB5GDur+ApQiZ10Xsbn/KbWqLkjjOTv/hVEjcaTGuHZLFc4T?= =?us-ascii?Q?X332gJDZy7bdwV8n8/8hI/dZVVlzzqjI74qwwY9616iJNFL3Hw66DztWSXoN?= =?us-ascii?Q?i5f/smmmH9prqu0QDkHmOx8ox/a/aMGumeub/5U+cg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7010d78-3c62-4565-ab7d-08dc8ae72dac X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:54:28.9928 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0204 Subject: [FFmpeg-devel] [PATCH 34/57] avcodec/mpeg12dec: Disable allocating scratchpad buffers when possible 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 Cc: Andreas Rheinhardt 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: They are no longer used by the MPEG-1/2 decoders except when using lowres. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 4 ++++ libavcodec/mpegpicture.h | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e0e9a8fb1e..7485b7c65f 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1000,6 +1000,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if ((ret = ff_mpv_common_init(s)) < 0) return ret; + if (!s->avctx->lowres) + ff_mpv_framesize_disable(&s->sc); } return 0; } @@ -1874,6 +1876,8 @@ static int vcr2_init_sequence(AVCodecContext *avctx) if ((ret = ff_mpv_common_init(s)) < 0) return ret; + if (!s->avctx->lowres) + ff_mpv_framesize_disable(&s->sc); for (i = 0; i < 64; i++) { int j = s->idsp.idct_permutation[i]; diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index d3f39bbae6..196aa9b744 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -21,6 +21,7 @@ #ifndef AVCODEC_MPEGPICTURE_H #define AVCODEC_MPEGPICTURE_H +#include #include #include @@ -135,6 +136,15 @@ int ff_mpv_pic_check_linesize(void *logctx, const struct AVFrame *f, int ff_mpv_framesize_alloc(AVCodecContext *avctx, ScratchpadContext *sc, int linesize); +/** + * Disable allocating the ScratchpadContext's buffers in future calls + * to ff_mpv_framesize_alloc(). + */ +static inline void ff_mpv_framesize_disable(ScratchpadContext *sc) +{ + sc->linesize = INT_MAX; +} + void ff_mpv_unref_picture(MPVWorkPicture *pic); void ff_mpv_workpic_from_pic(MPVWorkPicture *wpic, MPVPicture *pic); void ff_mpv_replace_picture(MPVWorkPicture *dst, const MPVWorkPicture *src); -- 2.40.1 _______________________________________________ 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".