From patchwork Mon Apr 29 21:14:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2274841pzb; Mon, 29 Apr 2024 14:24:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUnM1uMO+JvpGLbLNX/WaPk4Pwem4BbXpqDqSly41xCd8lPCg3jnck/FEJKJAkXw40nF8c7ODxycqByMUwsSYInLU3eFH8yUImxLg== X-Google-Smtp-Source: AGHT+IGAKtNGBYMDu8FS93H62ilsGi0qImeo9j1FpDUMICJM/jJdxKmVZBor3MxmPEaRPAEPMZc0 X-Received: by 2002:a17:906:ca53:b0:a52:5a02:2430 with SMTP id jx19-20020a170906ca5300b00a525a022430mr6962184ejb.5.1714425870776; Mon, 29 Apr 2024 14:24:30 -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 qq27-20020a17090720db00b00a525c39ac09si14966436ejb.962.2024.04.29.14.24.30; Mon, 29 Apr 2024 14:24:30 -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=nihTUGvT; 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 4ED7F68D57C; Tue, 30 Apr 2024 00:15:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2018.outbound.protection.outlook.com [40.92.50.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 150CA68D569 for ; Tue, 30 Apr 2024 00:15:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PTJouuCWNCdVc2/v/Zlmt6Yf8OEzJP3I4BwCFMTtjhWSmdjKPxyaClB3v4TYJRRJB0KUrhMEzAKvTrJ9AVQ327BqMJGIOjK4HatBCbzipiHAgAmOGiMxoa5COAX8n6v4V1BlIflwUs8c8JNFU9hGffFa3NBxAPrWYqhRy3tMyexJrYDw6nwribvotR0n/r1y9Mvnr4W0Myu2j/QT/GGPCGXHW9gZqOMQhYUEr30tokoc+Si8pjGB1P9fg7BoyxKpALXjpX+427S38xtbkcSh1swKTAyPAs1MKUK89SOJVMF525dQlLg1ny/i76lZpLErK22X8exdC515P6sznM4moA== 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=63HF2TRwgWyt91QVWfyQ+uHSzyLLPtgRuJsKNWfRgAQ=; b=EE2WbVBrqPBHubxYrNuxySPa4cdoPZRR3yrV0sxNjE31GPkiEgAibe3cnUGPc+he2j9DYJws62ufvLBMOcChkWnkwExOtD26rf42oSDaKuFeI+ZCzykpA0qX0M/gUjOrFKq0CBgssmoYQ0CeFaQyID49mu/QKBgKLDihwlWFUPwavbzTsSnPhEuUtFg7QLzHGi/gXxBDQwCwzk4DZ+cknXBymOZnwsy9R4qGGL5iOz1bTPH9KVIuN4ukAGPAjXOEYqGLdgs+hG6LlNN71Nda4UL8Dzm2CXboaLlVzHqhallJ1Cl6rAkSe/2ki25YDoGRkUoirPnvQUgWnrFQWwQybg== 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=63HF2TRwgWyt91QVWfyQ+uHSzyLLPtgRuJsKNWfRgAQ=; b=nihTUGvTK7x1vVkdspsgJiMPKq9mgPHlOZSJYnd8oIBo8X52RG5aNhbYR/qpX+iI6qBDWmVPyE/iu9BsX/2BY3l+wcOfgSD1sscv0CguOQBLY2EXyYXnrAoVkA6YOXkHONGcrcwgfQvWNP2qQU1ZbHdf0vn4HJ+Rpi/5rex7rJETM2pwPbghJU5wINiTC2qdKIonVHyWmSTrgF4x2YveHfVembst7E+44ejdotrjbn29imTP0eiqd0LUOYWSsdrWHMU14xXscEeBf6P9OaCpGoUUH8sODIhGXcajU0uQ4r76I5Yr/GtCOYZL+z3LsCYgeavB5gsi6ovJ2ZrHzvLe0g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0372.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:15:56 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:15:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:10 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [sOvGA/pFxsprBM40OIjhcfGAHF0ETW4Cy2y4jh9e58s=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0372:EE_ X-MS-Office365-Filtering-Correlation-Id: 72cee9e8-012f-49dd-308b-08dc68918f32 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: gJvH4nWBBfxtOedbhGw9ETdECRZ9w6GpKzCjM30WCcPXkIAL6Yg3aQgp+Y9zd8S7N5PIXOvfa+/O/YfM0e2MnAxT1kIRoUnvLWDKLbBFOcWpXOs52qh8Fq9owEJeWE40q+1ubAULPrV6aZvfDObanE6HPSdEJRFiv7j9WTrADkFoZSlJM9poKI8+PKXSYk1Ok0bZ+9+uE7JZt7VcZzmrXySm014+0qYko8xXBZwYSG3PiItG0akGEqqQx7rwRh1DTybXzBQJCSMenthqrSkw/as8Tppz+qsvJDUM1I/hl3MzLaHa0OlgAM5EsyEWWm7dQUqY5hYQJt0CYYsBN+zOv0WKabfwUNaiGjggg3GnZtljKNB/rWxk+3RMonosFjb40WSaObo2/T2SeaNOidlp3329kZVGEzeNFSxwDIvS7nOJ4vW+Qu3ytd1uFlKElkfEvspAr/Nkcf4g3QZ1KtoyfpQ70A7i+RDFYafqizNboQHGGc914rrH1BD+P8howAStZVBIgjdcSAzN4xeADyGlOAnj74paoysVgpWie+5fBgtBJBUdqpMd9lCqCfNsgw7J4VKX14/P1lEFd+NAEuOQpGTtAM+DSBB7+hSPQxEIb47XCG2s4qhqJLlKzziBgsEv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZUwnYWN8f+WzMbnOfJm3QC7m3ump+zn8lYk0r3rqRme2ewpWr/t4Wgvo20q+7Oa1DZLJs3fZdZlBKnM1PO1hwyO6sjlFpQlr1laNEQUw+ikw34sYT+ASrkRQN23jxJlnQfMyQSeRureg7nniaQzrIUFC+awv5QGxrELI9PJ1dscWziQ7gTzP3alUMM1+x2Yj1q6+HNAQz3dgbmr7vshD0hxfab/zVZK9Bv8MUiSrTKGeQ2MpZbMtZlAI5bP9lcrTFCmDgq6RxE58RQcdVSkzG0T5/rCpSi9PEObE1PbScPVAJgtWxc2P7yHtRz76+Cy+wZG3hlSwh0ZyjYD4VU3vTgDg40FuvPaJJQJ8k9jS6dFASQXAjPdVk82swtiP20Di/l76HNKdjY10U6QVaCnLghLh+fjeqq7ycBAYvjIITuUEuPk5/JRnfZn0kwciJaCPQ1CnRD/r7mlszkM607J2MBwJKr3ojEEKKdDAn4MIpL4ptgkmaP7q4wsUvgjVVPKunzK4zngYXN5n317CM7vCgwtjRs+m8YeLpsycoQdVWvO8E4EyxxcLss4WNFAon2bBbCKFOFbfrbSdNfdQlCOiWoT0UXoRY3mCiqwBBheVKwKmjERhTSHvFZWPOI/Ia3Qkah9QVKWzlbNmOLFLRFHv2yBej+pz+JuS/fAzxdXwxF3VQU2XPBJL/eh+PK6IC3YRMVGB4L2mpqe/lLxNjAqmK2W+BN6+KSzr6MpZGyd8C4yHy9z71yiiKl8OPGVm0Luy1f0KnOm8Kv36ZoVj3I3otRPEuxcnnDX4B7WaBbrMuRZAP1LAv3rApabkrxzV+lmlIdDSanIIFb0ZePxg6ri4o85WI/QELACW2lZbOxN9JuErlYbf3CZSqQbAySQqDrptVDt8Qxd4261xvIglnxSA87oGvdtFU/Ve4+JGQKskrLCUOObnDiZTz0MGGKJxMGTIVUDnUgbPpCmJ7oWNHyKcEPZigwimVsgeH8NubajMEvFKXWhKHYfMTby07CIgbe4zSniR0JiaMkqSk90XATXDHIcZ+66HB1taTWggw4rQJ47Sok7mh5z++gmwIPEl6ONe7/NFnfDqA/G/Wh3bSpkQnD0XDrer/il4/WwKXHUitTtrxSxJvtgqsO/uRtlj+dWYrUIcOkVfWqLjFkVrY4pQ++4OTXOuR8iTF4d6lWaZU0oEWlacgHpK9zTf0iJjci48FSqDgLCSJzgqlh1WwdewF/yeNY2SqPF1IbAc9DzWcs7AX8KXjGrE5SEQk/5EO3JFsnDnDfTQpN94gWckXT2L2w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72cee9e8-012f-49dd-308b-08dc68918f32 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:15:56.3612 (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: PR3P250MB0372 Subject: [FFmpeg-devel] [PATCH 29/57] avcodec/mpegvideo_enc: Move copying properties to alloc_picture() 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: C7P3zSLWrsrp This way said function sets everything (except for the actual contents of the frame's data). Also rename it to prepare_picture() given its new role. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 426a4a4ff2..b310baf3ed 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1091,7 +1091,11 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src, return acc; } -static int alloc_picture(MpegEncContext *s, AVFrame *f) +/** + * Allocates new buffers for an AVFrame and copies the properties + * from another AVFrame. + */ +static int prepare_picture(MpegEncContext *s, AVFrame *f, const AVFrame *props_frame) { AVCodecContext *avctx = s->avctx; int ret; @@ -1107,6 +1111,10 @@ static int alloc_picture(MpegEncContext *s, AVFrame *f) if (ret < 0) return ret; + ret = av_frame_copy_props(f, props_frame); + if (ret < 0) + return ret; + for (int i = 0; f->data[i]; i++) { int offset = (EDGE_WIDTH >> (i ? s->chroma_y_shift : 0)) * f->linesize[i] + @@ -1186,14 +1194,9 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) return ret; pic->shared = 1; } else { - ret = alloc_picture(s, pic->f); + ret = prepare_picture(s, pic->f, pic_arg); if (ret < 0) goto fail; - ret = av_frame_copy_props(pic->f, pic_arg); - if (ret < 0) { - ff_mpeg_unref_picture(pic); - return ret; - } for (int i = 0; i < 3; i++) { ptrdiff_t src_stride = pic_arg->linesize[i]; @@ -1607,11 +1610,8 @@ no_output_pic: // input is a shared pix, so we can't modify it -> allocate a new // one & ensure that the shared one is reuseable av_frame_move_ref(s->new_pic, s->reordered_input_picture[0]->f); - ret = alloc_picture(s, s->reordered_input_picture[0]->f); - if (ret < 0) - goto fail; - ret = av_frame_copy_props(s->reordered_input_picture[0]->f, s->new_pic); + ret = prepare_picture(s, s->reordered_input_picture[0]->f, s->new_pic); if (ret < 0) goto fail; } else {