From patchwork Fri Oct 6 02:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp117071pzh; Thu, 5 Oct 2023 19:46:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHA8zwcTUHmbNZ2lDjyjFhXdHnVguHbEwiaXucdP2aTNtpGatfAXf9GESsCTG2ewOCM6U14 X-Received: by 2002:a05:6402:14c4:b0:52f:a80b:83c9 with SMTP id f4-20020a05640214c400b0052fa80b83c9mr5911984edx.31.1696560405325; Thu, 05 Oct 2023 19:46:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w13-20020a056402070d00b0053828f829d8si1235349edx.365.2023.10.05.19.46.41; Thu, 05 Oct 2023 19:46:45 -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=@outlook.com header.s=selector1 header.b=T5HBpm3U; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A0F168CBD0; Fri, 6 Oct 2023 05:46:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2053.outbound.protection.outlook.com [40.92.65.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E9BB68C95C for ; Fri, 6 Oct 2023 05:46:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kG0L9l3cdoBRTcze+SVYpEesP0F6jb16vtE8oDTlJavKPnGLnXmARSe8fiAbOtefh+WIi2pwCL3vsWikmhNk3qTsP9117wSscgWsXttdi7do9DO0RS9mRqdoAWxMLraqHU/YJTiDmdeP0p5BWQusjhpvLeGHPsWi6goyhvMNHKkBKSgYh6BwrOCVeyxLu2WHyidL1LWCusNqg+TG4rUbLnubrWU8SZ2szPRX30bzHdi85E3ItZcm/RKuXqQpKwfG21HmeljGwsBY3Aux3hi3Tz4q8tUb8OmeyAlL6b0a1Zzc+YAekxCKCTOXw3dzTaD3lkUlweWz9GUJUUk6JCMC3A== 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=l6IdQ8wi+6Ww28byvUa6ZOU2TTxWEAYPUbzLkV/7mUs=; b=eMzYqeMmFhMUxRGxIqNm6Xz5QETTEocAzZ3wP5ttKhy1Nw55iPOPq4koDFywr3d9y/A0cnPCLjHNkjRMs2+E7H+oyVWc4c3i3A1fe/HBhYzZmA1pksnkLOcHRRJKLS1wz4D7ODYpsvDyAkll8pZPKEpY4REKT7vJMd2wgm1p5lLLE2ssjEmLccQ4AqQAv9DGjd6VqeRA4Lv5ZSy3rhNd3xmaHzeJJlTND4cEVg6umZW843q0UGlLQAeD8UvkejlxvKgf67I4mC+uC3jnYbukrgiGYylGjFnxhFvNN2SFar+OIVuVig+8rhekpVhaHIEUhFDgC/YICTy3KSZWAfajHg== 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=l6IdQ8wi+6Ww28byvUa6ZOU2TTxWEAYPUbzLkV/7mUs=; b=T5HBpm3UiDhv1Z+ZeIM1+fNmmezVkxYFhvCd/kpku06GJWc6CneaLrGymryPOzd3lknWK/WI/A1KqjFg3IEJB2j04CSyDbGgrsMhwKBzGtNveg1MEUdLaN+I5deVlp9yEJkLCS0VfNSLTKol9sfw5aPXwL5Wi/8do5+EeAdZH6MyQ3EmKva9I1Ji89W9f+TY+VAzIxdCKtS8zwzxjjDvJs8fiKRUlZ1X0SZ5TetM7om0RBi7k9WsqkVYvhtthSQG+4qMKQpUnX4qNjbDdMbpHHv3bS2V5Ha2zApNHPQHTI2LltdPhJ5f1JLlH8R5RdDjsIIgK8ryoUdRvH5uJJTLZw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Fri, 6 Oct 2023 02:45:58 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 6 Oct 2023 02:45:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [0DmevPzOpsuLX7EBXXumGPnX4zh1JxYa] X-ClientProxiedBy: FR4P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231006024636.1005349-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 08eb3b80-7d35-4565-fa17-08dbc6165ea5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rF7U3ZnboKrj5q1ZQJCe+21j21gcMQgaXbKN+qSHdyI1XGiq9gmCMAzUJV7wbJ12KmvDcQWRvYJ2Mkrkt8f6MkoZp9tLrg9YSLoX0zKN2AhjrETPPmpjkR5Uod/HfVvFipikUcKEtKGmiVUyvvbRK2x0zbbzcNpIewEeXaEKuIbGPhYMi5Xyqzs4ND54ovffkOUWCykrrIDJir99MV4uHuhCiHaTZpUOe7QcCV2rOFUzLVlxZ5kWG56WiKiIgkCIBTFVxrGz/VT3kWfauhNftHGwLCNZTbjPqheF3bf+0GZCjg76nJ2u1aoPz+FQYClL/amwXEZNNjkdk8ZEpS/G5WURPxQW1zjvG/gGztCKt5a8A1JF9h5hCiPsy9KzKevtfsRZXP1o7HDf+Jrg4BKuj63UL3ttg1XapNsVk8AqfuQ0le9tsdUtZ3xdvePlY9tvfHtrxX30ATkeeyPQ5SUsHqC6nlaUVHBDOGALmiIPytOyT/nPcfZrwtbsGMtHj9GIOPqFMoPTBpZik1ebMcfHIkPAoIHOA0RWETaqoyzb5CxCLg6Gt3AYkcO7sprdZLPwpHfRPbd4wYMvv4GY3yraVUZzdSVERsgcfF0DCH8oxgljpdFUxe+HaQxuyOe8srQc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EMoE0+GG0KUx9fLjQ6kqk9Zp0GUG4j0VOL6GFNthR5XjEZ/ab+h9VlFU9XlGtpFjrmLiT0fH4mG+d3FtuUPSCUTNm9xTPPnMDnqKk9sibVSEJA9g8gAu16RWWJp+uoqnZ6R7gZGb1M0vOXojfPAiCRxnakNOlZnM8DZmSJsg0cNSFjsYPjtph+M1drgDvjiXPFOZtdv65fQkMMvz8rU5jcKi49hBLH6W/Y7OJJTvICZiApcU+cNIH2UWHWctYnghufKCA2ZxsOvkS1mVVfizuB9w8ch8PNm3Ps6I4JJz7XudEF0fFebrIPRYnLl6fM7YPvaV+ubt74S/bnKdi46zTML+SaTdU4thEC08IuIkQG8iPQGCs7e5xQCTWpnznnAe3PAOEs/xEpWeTom8032hwY87sqJNqrwiQiEDDm32KDQemQ/dUYBjt3w2u8z4AXF8nQkRIXg8zokA08+BRzXfcyi+18Go2Qg0hkTezcMuEmZmXmdZTHL+Ujb2KnEMheuV3ibSJstXesPOhC6tvUoHBxVjH3FZjnrB7doKTKiGymL82TKyxzfEU3zmk3/xT6aBX9fe6s1mrqg/O2YmWKx1PFdXqN5KOgnwnF7+9KCZDGPatrKxgFMxw/3Zv/8NOT/byLLvkWwpvLpkeI56oniCjjK955WQiLl3doph5/8kHjyaOy4VG+4s5OkfD7c/6fzbV9a2kwyoivVOAhVhjUvR94YkEf2LXvpRX0Gj06g3RdfKJi7+whhqh+Q4IAaGTcI0fFouvWFnQA6PRbTCJ9m5l3by9AfmN/ddpTpld0lV/1NXL+gW0iF3UR3ctenXhuEeKIBlTkWZ9rY3YyBYFJP78NU3e8BJ8NzhCkTZ4ZOWJH1Kjo69qO/K146q1fn48h7X0puA0xMY6l/Pqs55IspR/rkqbEV19d/b+oIthosk6t/Q3mFzQ193swB9OzOj34z89QTBniHbQpijlUZ5SwHRc4G2AK7IFlpqumozUmmw8aDMzGOVhjhMG1ymUjrL+2OVWr6X1y5JuOMfSNhfmYuxqMhNgfgrtuChPrmIfvTHjBJVIZsSaBaKR7Xmd0IiqsoFciIfh5xJtRfp2KF+7LEGOiWeoPzhfWkTmv5N2Cwx2FbinSyY2gZCJwNO5On1k3/ljZk0vYpohCf3evkmYisLSVC7i0rte+ucanb4hg32Zvxnr7jMB//EKyDuE2JrhoAHjJCfpU8/1cG51kawGQ6DR/Z/0NdEi8vj0v026CCRf2TtmvBpqj+j843paIuePRW0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08eb3b80-7d35-4565-fa17-08dbc6165ea5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:45:58.5326 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 09/13] avcodec/mpegvideo_enc: Don't allocate buffers unnecessarily 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +UEEdMT2I2Sq ff_alloc_picture() performs two tasks: a) In most instances, it allocates frame buffers and b) it allocates certain auxiliary buffers. The exception to a) is the case when the encoder can reuse user-supplied frames. And for these frames the auxiliary buffers are unused, because this frame will never be used as current_picture (and therefore also not as next_picture or last_picture); see select_input_picture(). This means that we can simply avoid calling ff_alloc_picture() with user-supplied frames at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 7 +------ libavcodec/mpegpicture.h | 2 +- libavcodec/mpegvideo_dec.c | 2 +- libavcodec/mpegvideo_enc.c | 16 ++++++++-------- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index b7c804c8ec..a0f5181325 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -247,7 +247,7 @@ static int alloc_picture_tables(AVCodecContext *avctx, Picture *pic, int encodin * The pixels are allocated/set by calling get_buffer() if shared = 0 */ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, - ScratchpadContext *sc, int shared, int encoding, + ScratchpadContext *sc, int encoding, int chroma_x_shift, int chroma_y_shift, int out_format, int mb_stride, int mb_width, int mb_height, int b8_stride, ptrdiff_t *linesize, ptrdiff_t *uvlinesize) @@ -259,10 +259,6 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, || pic->alloc_mb_height != mb_height) free_picture_tables(pic); - if (shared) { - av_assert0(pic->f->data[0]); - pic->shared = 1; - } else { av_assert0(!pic->f->buf[0]); if (alloc_frame_buffer(avctx, pic, me, sc, chroma_x_shift, chroma_y_shift, @@ -271,7 +267,6 @@ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, *linesize = pic->f->linesize[0]; *uvlinesize = pic->f->linesize[1]; - } if (!pic->qscale_table_buf) ret = alloc_picture_tables(avctx, pic, encoding, out_format, diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index 7919aa402c..a04820237a 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -86,7 +86,7 @@ typedef struct Picture { * The pixels are allocated/set by calling get_buffer() if shared = 0. */ int ff_alloc_picture(AVCodecContext *avctx, Picture *pic, MotionEstContext *me, - ScratchpadContext *sc, int shared, int encoding, + ScratchpadContext *sc, int encoding, int chroma_x_shift, int chroma_y_shift, int out_format, int mb_stride, int mb_width, int mb_height, int b8_stride, ptrdiff_t *linesize, ptrdiff_t *uvlinesize); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index b4ecb56987..07febcfe55 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -236,7 +236,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) static int alloc_picture(MpegEncContext *s, Picture *pic) { - return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, 0, + return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->chroma_x_shift, s->chroma_y_shift, s->out_format, s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, &s->linesize, &s->uvlinesize); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5dc95ef309..26a596430d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1090,9 +1090,9 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src, return acc; } -static int alloc_picture(MpegEncContext *s, Picture *pic, int shared) +static int alloc_picture(MpegEncContext *s, Picture *pic) { - return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, shared, 1, + return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 1, s->chroma_x_shift, s->chroma_y_shift, s->out_format, s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, &s->linesize, &s->uvlinesize); @@ -1163,12 +1163,12 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) if (direct) { if ((ret = av_frame_ref(pic->f, pic_arg)) < 0) return ret; - } - ret = alloc_picture(s, pic, direct); - if (ret < 0) - return ret; + pic->shared = 1; + } else { + ret = alloc_picture(s, pic); + if (ret < 0) + return ret; - if (!direct) { for (int i = 0; i < 3; i++) { int src_stride = pic_arg->linesize[i]; int dst_stride = i ? s->uvlinesize : s->linesize; @@ -1595,7 +1595,7 @@ no_output_pic: pic = &s->picture[i]; pic->reference = s->reordered_input_picture[0]->reference; - ret = alloc_picture(s, pic, 0); + ret = alloc_picture(s, pic); if (ret < 0) goto fail;