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 EA777428A3 for ; Wed, 2 Nov 2022 22:44:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF92768BE2D; Thu, 3 Nov 2022 00:44:18 +0200 (EET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2083.outbound.protection.outlook.com [40.92.41.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 442E568BDD7 for ; Thu, 3 Nov 2022 00:44:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cKXFJOEGvkOfOVG/7fh8+eFqaYF2YFsPGjX3csYxBXnVLanTxVwKuEM23hgbFzs1tf31CPirPDDY8P4hq69VSW/ek013xIhcQUQ4X1IdA9obn60UFR+JwIl72xeZe+Ff4IBGb1XRn1b1YTWcNULfrKYd1ZPk4PDF+bxKSnA/be8UpHFoZUKncas9CIn7uQqbsk71uX+eNhGvqHbh6r1a3Y2s7iLou7aMbPwml+RKvus9Jx/AcwV7WUnkiYcdrRuVgSMJUL+xcuGhUdkKFtaC3rrv/VuAMg/p34LTQ1LRu5Cfx/Wp9PTNPreeveEOgoKsYFlI4C8s7E3Rg4geWsEVoA== 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=9A5z/MxlKpksL7Nv28hwPGl2//36pecSbEnLfUy3OXw=; b=dllFJ6RjWt5V1bFCy41ueOcEjfTqwB6A1Ai81suqhlLJzvS6O2kuGM1WduBUUzXzngMolLQ/Js+zm8GI5o2wnXVqSItCRSGkZCHuvbooe2yflEgTVdJJ0yHMf1xSH9D3oLIi9wgwyAyzMdfgQLrhJOM1K4kwlfnBNxqnUloX8oPS884dXfQQCJos3SduUA9TafsIJSoWGQiMHdq/d7+P+s/a3j1iLB0opaYUpeZ40iMZRrYIfBbaniXVYmMV/TcPI8hdh6TWWOfxxYmh1H3CEU3JJOrSusYzMrU4W8+Y6coIC15dtmpJp5SU0Hf286Q4avT24W7KapJ2nGghLPA+yA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9A5z/MxlKpksL7Nv28hwPGl2//36pecSbEnLfUy3OXw=; b=r+dgiKH42euLRJSZu4khXrLdyBceXja9U20QAss7GpjUJ3uPPwtN4HR4QFwYhH0Stt/EFJ7Nk6JkYJXq0MpTtE2w97bVwv5RIzDADapjoDtWKh31bl7RHw4vhd4a+fjbKYaSKNn+kjg5tqQIm5BMsnWmH9F042ccCjoCSkFDQEq6o0FPoonq/s5JuVw8xXPo9WhqtKqE1oqjmdvHjwuMuGkzKRXygPJtFJ4e1WRDkfJsapMJIaF0OeImFXgurhIQbGgue8wHVjnA7XkI+C8EN/D6pSCKd/35Zu71aci9PTe3dAZ5ylBBtmUGoo828LqHH12Z8Mc+P0K3//+nteNiFQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM4P223MB0469.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20; Wed, 2 Nov 2022 22:44:06 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::45ea:be80:31df:38c0]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::45ea:be80:31df:38c0%7]) with mapi id 15.20.5791.020; Wed, 2 Nov 2022 22:44:06 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 2/2] avcodec/vpp_qsv: Copy side data from input to output frame Thread-Index: AQHY5/0JoEerWZd9y0+skPfBNqKl864pjRkAgABIjwCAAnN5UA== Date: Wed, 2 Nov 2022 22:44:06 +0000 Message-ID: References: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [IavMiKgcMI6ZYj931xcWOCdCo29ZKvnj] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8P223MB0365:EE_|DM4P223MB0469:EE_ x-ms-office365-filtering-correlation-id: 6a0b583e-5de9-462e-4f67-08dabd23bfaf x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HA1Zc6Rt+jMgdnTMngZFRYvDU9WJYCZo/v6mCKhiJfF34Ely25xzCxy6NuWPBDTkTqn938VfV7PxhFDbwmjpDqSDo4oSYtrRS5oZT4U6nkBJH9Z3UAkI87oFoqDc4fDXIeI7/uzC4wJ5J2+hPJxIlegFt/rPdGPGifb0TuZQEORQackAQWy548xb1n/HbbA/t/b09PrbkxnDA6dY0E6u2lug2Uh+1Xgm8T8LzeR/cBekbcsd/xylcOr+BdSx7rrJhI4v/cdEDH+3nsS8DPZhxorqLxFwO1R1YEAmFQye+8UUlg/8w377d5edNv/hTexV7tBpQRswHRE1OUZe8DImz07+hw2swqX3XJGkXAsqxbp717IHEfJclv/a+XzuiUITSI0pHtdMpiqTG6njUnmQj8yrRvyDzF38cCHtojGY0HjW77uLsCpF5pSvR6esz73RFq3Dcb5BTFS2eNHD2juBDNDk7yib+P9zBA8f4PICUAVAvEePhR39ieS2qABN3enARYxVechTPxCa8winJ93h+5Dz8iCHjwH7ZoVGcqC71ThMVL+BO6DvQ6nZd9q2FFqmWw++QEbDWK4EDm7WsUhXYnS8un+xp/OFa9UsA3sDhU/X5CsrXOCbZtXMndt6zZoum0Iz9dudu2EGBtxpq5vTM3OHMGioZ8dpdy9E2bteTOT+UePA6txQY1VwGB0TdwnC x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?ZE8rWHllekFiQ3FHa2hMMkxwbEN5S1MyS3ZjZGZzY2hlRzAvNm40Mit4eXVq?= =?utf-8?B?WFpGd3F5ZllwVzl2MGZ3VU5qUkgzRGF0SDR5dlFzeG9rMHFDdm1CakluLy9Q?= =?utf-8?B?a2dUeHFyMjZXcGVNK0VndWh1TmhTNjU2OTNPbkZ1aTRHMC91b3NYUFgxMEE5?= =?utf-8?B?Q1p3U09zUFNVU1l3WEhaQWxobzBoeE5KVVZKSnV6ZVhDNTdhZmJqUVJhVHAr?= =?utf-8?B?UDRuMjlIMmlnaWJJZnlEems0TlhKY3ExVkhsTStrT2JpTFl0QXlSRnljWmZp?= =?utf-8?B?QTdTKzhSNm5EZnkxb2IxRFloVnBCbUFaR29tNzJoR0RrZ2tUNWZpQUxzSXpr?= =?utf-8?B?SFljcUt5bTNtY2ZVTHkxbHYyTzYrWjlSNUFHUjNGR0tWckhpemZ4V1hLNG1m?= =?utf-8?B?YjB1WXk2czNJNTcyTmpZVWY1Y0NVNFNhNE9oUTQ1Y2dXZkdUVE5RV3lQVnhz?= =?utf-8?B?VDVNRjA0MnhsbEdjdFJOMFBHUjkweFVVOTVSVmVXWVRyTnJnQWk4QTNvc3Ft?= =?utf-8?B?RGo0MUVpbXFxTjRPalFrdmoyY1E3REJ2bWVKY3pEdHFWMUE1SmJlcjlvbmpp?= =?utf-8?B?NGdMbUdhcnNMeVNsaStKeUJ5anNlT1dOa3hXdDZkMlJ6MGFkSUQ2R2kzZXpL?= =?utf-8?B?dHJMSUFueTdOdVFYMElJOFVYTHlCanNXdGhnWjV3SzVESVNWTHRybEEwVENS?= =?utf-8?B?RTZsSC9XN1ZvZ0IySTEvNmtHL0V5QjZwSk96Q0k0dHdBZ21TNVh5aVM2aHpz?= =?utf-8?B?KzN3R3JYZ1ZuczlzL3paM2RUOU9EcThaMG95R3pqWEExRTlrUm5TQWpEc29L?= =?utf-8?B?QytyLzRULys4TFZFc1FPS0xNS3V1YkJ3ZVFsZmsycTYyKzB2dGhpVEdrdzdX?= =?utf-8?B?aDNlRHo1OGxBV0NhbXVXNlBSRW9SNEE0K0ZYQkpJY3NPNUJqZXI1ekQ4MjJx?= =?utf-8?B?ZnBsQUJLSW5wbVNJWTZNYk5qUm9PeExEUmxOY1pyYTJINWl4T3FQNDZNSDAx?= =?utf-8?B?TXJRaExUTXdtWCtDOGpCcjZPVHYwZ1hDM1dNOG5FdjRUTEhlMXp5V3Z3SUZN?= =?utf-8?B?ZjdtcUdDT3h2QWI5QlNLTWdSd05MeDZ1L3cxVWpicEwxWitPLzRLei9wYnlu?= =?utf-8?B?WEpIbzJPOUtNbC9YS29XcndFU1pWVnJHcWZIaWR5UXJjMSsrRFJ5dHo4aEx4?= =?utf-8?B?UmpnZFBROTFhRDE2b25NQldOTnlmV2t5a1dQQjZLNFNyeUo1TWRJYlQ4eHZZ?= =?utf-8?B?QmlTRXVMZ3o0Ky85djJJdnJMNnJvY0p2RGNzUHJ6R2N1dmNwM2xmUVY1a0l2?= =?utf-8?B?UXBjTTJuRXI0WVBRbXB5d1dBM04wbmtBZG1CaG9nWk5PQXMyeEdaT3Z2d1BL?= =?utf-8?B?TXNBY2hic3BXSWJpRnZBZXZlV3RHeGpUbVVJTWNVN0lvYjVGSnZNZGJiUXBU?= =?utf-8?B?ZExmdTdhd3IvRyswNlRLZXN1UTBGOENZZlVqQWVRNWJ0SzBVN21lcmxoWElC?= =?utf-8?B?cVFvRzBGZ1RyOU41RWlkMGdoNk1sRmdLaVNKQjY0NS9HVENjT0Nna1gwbW13?= =?utf-8?B?WkV5bStQT2pOQlBwNnM0K0YyczA1QzlUUnlmZ1RPUkNkeExkV3BlSE51VlRL?= =?utf-8?B?cU5sdDIxcnFCOStLRFZ3OE0yRWZWM1VhZ1VPSklUSzBIWmJPQXZMd2l6OVNh?= =?utf-8?Q?M2acUzbWR1m93qX+ybKK?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 6a0b583e-5de9-462e-4f67-08dabd23bfaf X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2022 22:44:06.3164 (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: DM4P223MB0469 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of > "zhilizhao(???)" > Sent: Tuesday, November 1, 2022 10:18 AM > To: FFmpeg development discussions and patches devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/vpp_qsv: Copy side > data from input to output frame > > > > > On Nov 1, 2022, at 12:58, Xiang, Haihao intel.com@ffmpeg.org> wrote: > > > > 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. > > avcodec/vpp_qsv: Copy side data from input to output frame > ^^^^^^^ > > avcodec -> avfilter > Good catch! Thank you, sw _______________________________________________ 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".