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 3063F44244 for ; Wed, 2 Nov 2022 04:23:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEB0368BE34; Wed, 2 Nov 2022 06:23:42 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2049.outbound.protection.outlook.com [40.92.59.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7092A68BE28 for ; Wed, 2 Nov 2022 06:23:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DtUp+vz6+9/Lpmw4Yi936ejp2mDqssiA+E0COhBhYt49RIOsqkq+vcj8At2MpcMjpsGK4bjT27O7HOt20aKVfoNn0ZWZ8RnYiosxIIUsR/nZIYuyjPkf0kGHZR+zi+Ou2EjuT9NmLGBg8zb2kb/Rice3FeGHQSrfLHFwFJ3CGij6eehaQZvzzkUM+P5VByFbu89FWJCVx2vw5PKs+iocOruJrq3/RzFju90BCafR5t1U/rP60g4KLysYWrRCiBVW9pJQR6AMX0r4W1fAhWJqcVHUrK19R0QZfK5tlha0+rW3m04Ktm0oG2F6ULHlj4N5Sbs8VMK2X0LtmE/JJ/AGOg== 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=yGEnfrdYyXW6pApSjeLk+6qLgEWsKcRsz6XXhl5vp3U=; b=R5f1/dCpMsguWfns2GPPIGGNxvkwefv3o3v6YeKxQf6F+s9fLj6wKKQmv+j8DN/V4LpJbXv4fYnsPBFxXWdYf2F+PH8QSHErWhp55TR3Jt7s2h0oD8Ze2lTa5ElrDrUnXW+y1adSqHeny1+X7RaUSemk8ZmiaDXqDEnh/+a3Zee7Y42ZNVVZgbekSCryOFDh22U4pj0xEvKEdFhmtI9uW55CHgtsjP+lYmYzzSShoNXGVMftub7HgAXYGTI8onkjhQIre/w1MyjZgZEKBK9IQ+LMn7bQUgXMJbCEti3iQ3tX9Sl+psZYbuSrEr2jtFoiwlrYCf9Rqeg9pRhZP7MO/g== 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=yGEnfrdYyXW6pApSjeLk+6qLgEWsKcRsz6XXhl5vp3U=; b=MMgHRsd2CeWxumWT3bwJaNLQuaGe52HXgffodMImxXPj/3RVsps9cyfBzGCJV/KoxeTGcgraJ6w+2wGYLTGyBDdrywjhHsAcmDfL+0aaYMqvRCL2AYDME5lylhFImctZSee/7BhlTk4Be25N1pTCRHaJRyj8d0W0iz3S1ic/h1DnlH8rF9AwILliRZPBHKZV8/GwWBSY8kMuQXK6onEnKpApbfXh7jhKDJ6qXR3f5NHZtTIV44ykQGpODKFw7L/qJbFJlcATDaIQIN2RO1OQjL+rQoZWs4f7Mnw06SxytmhoYnrvE6u1wRE+H/Wry2n1ZGFjWi+qUI6EpwlhZLx6dw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0069.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:377::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Wed, 2 Nov 2022 04:23:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Wed, 2 Nov 2022 04:23:34 +0000 Message-ID: Date: Wed, 2 Nov 2022 05:23:46 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> From: Andreas Rheinhardt In-Reply-To: X-TMN: [5bsEznE4hpKIERBzw7Q8TeHCDwfzlMMM] X-ClientProxiedBy: AS9PR06CA0099.eurprd06.prod.outlook.com (2603:10a6:20b:465::34) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <1b733b0c-a11f-f692-d1a2-d46509d673f5@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0069:EE_ X-MS-Office365-Filtering-Correlation-Id: 22a282d5-a607-49b9-8274-08dabc8a01b6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lU31G9Gqfqoy+SSQCZ0bO5RcDMESjB3/c43CNmWuY1buVM1AtxT2wlvBdNFVIIBshC7wAU2NmNDNUaj4dN7PZZsRSZg25nRKl6Tlv7WA7BXVE8jEjfdxAMKAs0pJHTmUVn3U67ExLXCkCUC56/gX0BlT15+8CCpRbY28qzpNXpz9c4K/wsr62VfiSDp6glcOk8UC467Lrmm6+Jab/6PDp2esif5q98qQqGwc/Pgvyda1ZvqzZVTafK4xsJ5wqI0AN0EqHNlQL4vXGVndsT7mWGjuNrBa0Sco7tDFOYTLt3XPYS6+ZJQzkPYbM0na8a+jj631k4wGm1wA2tOYH++NZLgKON0e+O+qDskIFisVRbJcGQsm97UOlep7GOzCxZtSM48wdICu5wMhLdRRhZwCkWmCaAtr21BLBx85gFfq/OQ298d74/EQ4Pm5LmlG9p9tGTS2Hx1VMV5bRnb7+n/yNpTxM2HCcgpyy8b+1UPHIX0bc7VTcqrBTex0F2itmDJ8mS6rBpALRSi82GeBFCCurrCoVrlsD8zitb1ksTM6PQle6TqYdcNY0FM7PXOj3WXp6c9bq300lnPGSG1zyLdC2DKU4O17F/E6byozf9yHoT8lClELapVr/lGt5UECFR2FDocoj/HR8x6Tjz3yQZTIqZhysJjxxI6MW6EIBz3xHJu6vGcpqjCZNFYpf3VhzdN7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y0QvSVpxNjV3QUt0QmpJcWViTFBmUkxnVmFLdGxFbzBGNVYyZHB4V3pVcHBo?= =?utf-8?B?TkZJdGRPbzJIbXRNejd5RGc4Vk1WUHZ4bW5MekpQWkpZMW5ROWpxd2ovemNU?= =?utf-8?B?SityWS8rQzkra28wbE5Ddm91Skt0UlZCV2hLRnpNN3VwbnFhZjlLR0o1ZmVy?= =?utf-8?B?aTFqUzkxN1pWK0ZQcUdDT2U4a1BMVEpLeXpLRXh2OHZFb3VrYmxFaGt5SDhz?= =?utf-8?B?ZVpSZmNFeDBia3hQZzk2aXJoU3ZSNnVxWTZ5ZExtVHBsby9ZR0tLS3FmTytM?= =?utf-8?B?a0V0RkF1NnV0TjJRclRLZ2lOa1NxYTRTbmFvLzRBWTZNbXVOeWtIbXYwVVFF?= =?utf-8?B?RFZrNzlhMWZ3MWNZUHpqak9FMGJJbjJyQkVkSmpQKzBCNjJ2QTJ6d1lmeVVP?= =?utf-8?B?dnFjMFFGZDl5MDIrcWhQMWhSTTB1MncweURiOTNUMGlrcnFVYVRudXQ0VUhQ?= =?utf-8?B?Z3Fwck5rSi9uRFp4OGFsUE1acFpMcHNETXphWGNtTFhHbzJ0WUQ5bVNPd3dw?= =?utf-8?B?Z3V3TEU5Vm9BRS82L1FnVTcwRjZJYmRTZHAxTlJFT3VRY0krR0RYM2NISzVh?= =?utf-8?B?SE15RUcrTWdPV0JoOXlyQSt0VzBPeDRkNjVTSEtwenZ1dXRvNzVwczZqWmJX?= =?utf-8?B?VDBLdWpoajRma2FTbDNJSDV5Wkd3Sk9PbWtENVhiSWVaeHVUQnNTM3FBV3Bv?= =?utf-8?B?VDBZVlNjZ3RuK3czY1Q5UDZIL2UzL2huNkZXQWNrbkZoeGdZMFBOUi9Va3ht?= =?utf-8?B?R3BMZlFoRExjRTlmVFNzTFd5TlhLYWlpd3R1dXJvMHBaTldUaDQzOU1qRFl6?= =?utf-8?B?d0RvSDJkYWFUZ3JDOGhjT2wyQkV1dlhwRGZsUGZ5dEZXNmtCVUh6SUw2Rmkx?= =?utf-8?B?T0dkOVlGeWF0MzZzZ1QxT0t1ME8yUDZBTVNybjlFclB2dUFTV1Y5V3M0cDV1?= =?utf-8?B?Z1lhVE5ESXozTjFtclVIeHZKM3IzOFlFOEdpNnUzOGFyZHQ0cHFnVWpqSklO?= =?utf-8?B?ZGQwSzBubURYaE9Bb0NXQTBUMGp3QkVQbTRJRitBdG5HdEFuTHlmSVhUQ0Nj?= =?utf-8?B?QktCcHUzVHdtbFE4T1Z4OVNYRUM3TndRZEFZaGdUS1ZEZ3VFVWZwWXhPQks2?= =?utf-8?B?a0pkNHFTbmhJWmFWZE5ueTJCM3NDbUJMcTR1UWFabWh3N1pYdWtMaG41MGQy?= =?utf-8?B?WUlCak1KZ3A1KzJRUllyODJ0ejUwNWFKNGd5YXlHOStzZzdEVVdFUThITzRa?= =?utf-8?B?VlhKTnJSb3ZxZ3hwdHRDRmtSWHBYb3dkTzlBRWFRQ3NZT1kxTDM1elZxNGlB?= =?utf-8?B?WW9oNGZqSmdmS1dVdTMvZHhrcGU1NE5TMFVMV3FzOVMyaVhwb3h1SHJlZjQ5?= =?utf-8?B?OUtpZjJOSEJGMWZQSytCN3NkYWFoUWlaQ3p4UXdxeS9Uc3NQamV4a1o4dTFv?= =?utf-8?B?SFhWOTZETnhtSFNvZ081cExOZ2t1M0hYT3ZxNzlrMkkxYzYwTVQyN0xiLzlF?= =?utf-8?B?MVJUUWxYRVNTK25LeDZKaG90UjE1TzNVL2tIK0dJdW5SOFNkTlh1NjdTMThj?= =?utf-8?B?dkFxZmQ3bi9KeS90ZmhNakRtaGdpSy9QaTQyNEZwd2hQNlVHMWQyNU05dFJT?= =?utf-8?B?aldTc3R4dlptdVowS0hUOUlOQVdLWFZZRDhFU0dzQ0tQTWRWZk9MVEZVdkdj?= =?utf-8?B?MDNFTzNSTHNZOWtoVURaMVVwRnRLZE8yTDdXNUlXTFNLWENYRWg4NldYTG5a?= =?utf-8?Q?MDsxDxgK+JfrQnL6vvujMe0PZ/3GkldXzbXG9dI?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22a282d5-a607-49b9-8274-08dabc8a01b6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2022 04:23:34.8780 (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: AS8P250MB0069 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/vpp_qsv: Copy side data from input to output frame 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: Xiang, Haihao: > On Mon, 2022-10-24 at 23:04 +0000, softworkz wrote: >> From: softworkz >> >> Signed-off-by: softworkz >> --- >> libavfilter/qsvvpp.c | 6 ++++++ >> libavfilter/vf_overlay_qsv.c | 19 +++++++++++++++---- >> 2 files changed, 21 insertions(+), 4 deletions(-) >> >> diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c >> index 8428ee89ab..ae9766d12f 100644 >> --- a/libavfilter/qsvvpp.c >> +++ b/libavfilter/qsvvpp.c >> @@ -880,6 +880,12 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink >> *inlink, AVFrame *picr >> return AVERROR(EAGAIN); >> break; >> } >> + >> + av_frame_remove_all_side_data(out_frame->frame); >> + ret = av_frame_copy_side_data(out_frame->frame, in_frame->frame, 0); >> + if (ret < 0) >> + return ret; >> + >> out_frame->frame->pts = av_rescale_q(out_frame- >>> surface.Data.TimeStamp, >> default_tb, outlink->time_base); >> >> diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c >> index d947a1faa1..04fd284b92 100644 >> --- a/libavfilter/vf_overlay_qsv.c >> +++ b/libavfilter/vf_overlay_qsv.c >> @@ -231,13 +231,24 @@ static int process_frame(FFFrameSync *fs) >> { >> AVFilterContext *ctx = fs->parent; >> QSVOverlayContext *s = fs->opaque; >> + AVFrame *frame0 = NULL; >> AVFrame *frame = NULL; >> - int ret = 0, i; >> + int ret = 0; >> >> - for (i = 0; i < ctx->nb_inputs; i++) { >> + for (unsigned i = 0; i < ctx->nb_inputs; i++) { >> ret = ff_framesync_get_frame(fs, i, &frame, 0); >> - if (ret == 0) >> - ret = ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame); >> + >> + if (ret == 0) { >> + if (i == 0) >> + frame0 = frame; >> + else { >> + av_frame_remove_all_side_data(frame); >> + ret = av_frame_copy_side_data(frame, frame0, 0); >> + } >> + >> + ret = ret < 0 ? ret : ff_qsvvpp_filter_frame(s->qsv, ctx- >>> inputs[i], frame); >> + } >> + >> if (ret < 0 && ret != AVERROR(EAGAIN)) >> break; >> } > > Patchset LGTM, I'll push this patchset if no more comment or objection. > Can you wait a few days on this? I'd like to take a look at #1. - Andreas _______________________________________________ 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".