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 DED9E44A93 for ; Tue, 1 Nov 2022 04:58:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D79868BD31; Tue, 1 Nov 2022 06:58:40 +0200 (EET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E45E768BE56 for ; Tue, 1 Nov 2022 06:58:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667278718; x=1698814718; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=6DmanOo2wJPiuvEoxdjUdGESJJCIALhEgrqnfA/hHxM=; b=KTUBK+II4qdaZFtaQEimm0uICl13P4dLOnnptUtfTzfiHPbNLGsyflai tU77xHomNPHi2EmhE5tB7Yg9B/Oh3mLp3SJj/tipfikwkTQ6/66QnimVk m5fH59imXg9xYiWxVmrNlk7wIojnzqoarYdveULSnZ10X2FkpZc2cX1w4 bLZZ8ATl5SuN8vCS0UyLPR9kka91UsVVfA7dtQZI/LwZHIXWDHNMvjoAe P5F3jEihuXKR71UsdWr4tJi/QWfDIBFNRZqwtlxJd6hO9/UbSLkvK4Mum ExgmLnY6AheMcd16Fbhbf3GlUnFJVfbjwy00EJZcX1ETJUddMrHLlaq69 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="289457481" X-IronPort-AV: E=Sophos;i="5.95,229,1661842800"; d="scan'208";a="289457481" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 21:58:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="963017953" X-IronPort-AV: E=Sophos;i="5.95,229,1661842800"; d="scan'208";a="963017953" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga005.fm.intel.com with ESMTP; 31 Oct 2022 21:58:13 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 21:58:13 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 31 Oct 2022 21:58:13 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 31 Oct 2022 21:58:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A+zK2GtcpNA0296dgSmPHKLvHUQV/g0QFzc2e7HgSFv43P5jxrh7WgTQoqCDhpvxvKxq6KBsYuLjuwz2W0AxCX5mL68/P85vPxUG4ztCGjmIISRivj6ukaTEs5UqEepuB83eZCL4K9uMRzOlp8HQi6GY82IfS8mcP78HXTj64WN7pVqdE5dyELEI2Qqhl+GFkp+wh80Gh3PZZKrmD5piLSUuFvaYVtyE5UVAWc0pkX+Q0K0Mpkc4k7cYf9rhN4yklJaCuAiI7EJXJgvbnv/rJdC0pcn3rdq6jOWxM0ZDgXNu7CdieAigT7BaFsHFNaD9HxAR/jtVHAHzD9NDmK03og== 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=6DmanOo2wJPiuvEoxdjUdGESJJCIALhEgrqnfA/hHxM=; b=dp9E5J+Gcfhgs7i8Cp/JP5CqLnPfOb3NZV9vtES2WFW1moaUY4KNKfVT888WUEkmpQI5hpuL88GTnS3biMcQZ5tXnqinwiZtBz2M9aU4hg+QMtVWqH5KJFRc+whjDrMVQu6w5oLbal3+1SfRdzBxiTbdXQqU3AB/EquL5w8y1GoLY4vu29Dd3JPKO5aytbEOijrhJnqPFL7zLcTwlRdfY97I6Amuvj6mj2ct8M6m6fVDCwyZfWrJivepuFCFGxKYIG4E9JLOgQESjtmXrCNE4LQ3+/52U3bKH4Q07KJVBvNg+4WZ0CnZ6XTQ5WQdaNJ9gpQ7Zr1LIdWdfJYjHu/Qow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by DM8PR11MB5624.namprd11.prod.outlook.com (2603:10b6:8:35::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.21; Tue, 1 Nov 2022 04:58:11 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::8c4d:83ab:3e7a:3f23]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::8c4d:83ab:3e7a:3f23%6]) with mapi id 15.20.5769.021; Tue, 1 Nov 2022 04:58:10 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 2/2] avcodec/vpp_qsv: Copy side data from input to output frame Thread-Index: AQHY5/0UxuRIJZ441EK+oHEhYKmTQ64pjRkA Date: Tue, 1 Nov 2022 04:58:10 +0000 Message-ID: References: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> In-Reply-To: <43eb3257afeb4d93bac31fe593e6edffb2a09e50.1666652664.git.ffmpegagent@gmail.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.36.5-0ubuntu1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN9PR11MB5515:EE_|DM8PR11MB5624:EE_ x-ms-office365-filtering-correlation-id: 15c97caf-6add-4a6e-3fe4-08dabbc5acd6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sCUqFBrO+9mjGoagwN30/ZxrZkP+oU9QlrPADCQTeX2kAzRoR8iRD9Fg0lea50wGlPt2zcWojkoPXeEoDPAUbr4O9nA3OO93xi640s/Y5n3ZCupQblyw2GgHkRoMUPD/KlCFIc1IXQU69rM8KpWCHKhVO9aQHRDbJJW+CWriyc47SLwIQUuWJC/CD1MKjGESbc+/lG2XPq9x9PUwo02oOd31AqjGQ3L0YbTJBnjr4gWrtOcEsCI0xxTGayF+PTwv6XG4fwHW0gEP0A5VPcod+QZwmPLryvNFpp4NgqV6vDtGZ9ihMW0+xCZFwR8Wgkm1gb3T2YES+hforeGeyg2EyynN+0TtLf3VXsXAXMU6pKUyWKCN41g//s7Cy1iSs/l8kRocIteK4iLgZ0YLz1wMrrz4QcefLjoiWMglQmix9VKzcIKqjoj9VcNkmhlvgJwIpefdSNSn8F0knEnrVpuOofoe9Ui3V9v7npJ60AtVTO6a47mCDDOx7USswu+dJ3zsZUKnf3pDSKJRIrWYH2m+0W2bvtiJLFXxKD64FkvsRPm18/OaNj+x8GSl8c2oOJ5ievbPV0hEj5nmOccWMaJ4poeTrS5+l47lUvF90+LIC4gWUyCeIKJtRN/da5KBKRiSLrJymgv+iZaBXOa364qNzoS+U+AF0+UVZkUWuTDrRFdDg+FkV2fBFHz3HtLIWzPX4zTbH0pAwMaW/2uuKm9mHKRbBAWo8VYvTf0jGCLikamh3RAlJ07vXU7PSFxFrsIcVebyAvAA4kBDrCJay+vyBw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(376002)(366004)(136003)(39860400002)(396003)(451199015)(36756003)(76116006)(91956017)(4326008)(64756008)(66446008)(66476007)(66556008)(86362001)(186003)(8676002)(316002)(6916009)(38070700005)(41300700001)(8936002)(38100700002)(122000001)(82960400001)(6486002)(71200400001)(66946007)(2906002)(4001150100001)(83380400001)(6506007)(2616005)(478600001)(6512007)(26005)(5660300002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Mmh3NHMzbXJKRG12ZG1WZGtlUmtrbngxMnF4Zm9MZDBsOU5MemMyREJocjR3?= =?utf-8?B?SVh1aDhNZm5BaUYwNHJXQ3JKaGhYN3QyeDRWSys1OExSMnRnSHllZFZyZFl6?= =?utf-8?B?cnAxWG43eE9ocjNjSnB5R3dvTFVBZi9BSjNNRTlmaVZkVE01YWFQeVlIaUxx?= =?utf-8?B?YWl3N2t2S24ra1h3dnVnejVacDdVRzQ2ZkFxZnZ3eWdweDRselV3WDNMeFZN?= =?utf-8?B?Z3gwWUhvVW1Vb3VkRTdmdk5LUmtHai81Z21MMy9JaCtOalVOK3c1bW5Gek5R?= =?utf-8?B?dTVyTFJBeURhY21lNTlYa1V2M3pwaWJIc3VzdGRkRERvWVZzTVoySndoMmIr?= =?utf-8?B?L28xc29TenkwdGllR3I3aFlOVVlaSWx0NGhTVytCa24ySlBMN3hSQzhXTGFy?= =?utf-8?B?SzRid055SFNxRW9taWRCNVBpODBqRHVDK2JwcGFGb3ZnNGhNMWl5d1lFOFVj?= =?utf-8?B?dVB3Y3Uwbk9MVHRQblZsQmFJWC9SV1hkWC9TUWFIWmRZeGVuWFM5ZFJxbW5p?= =?utf-8?B?M0RCRUlCU29KSjBCdVpxTkpKdENweHdUdHB4UTRDQzh4Ty9UU0xuUjI3Mk55?= =?utf-8?B?YlhwVXp0enhjSldPODlsaUVMQWlobXBwTHFrZEIzdjZuN0h4NlZvbVhoYW1k?= =?utf-8?B?dE5oNXpGSDhXYWU3ckcydE9XTmxQN0UyTGUrR1FKdVFhWTJNTEFBNUdsNHJW?= =?utf-8?B?ZDNZMGs0eGFEZW9oUi9zZ3ZoZUR3aFF5UUZpb3g4ODJXaWZwS3J1M1l3aGhC?= =?utf-8?B?eHhEUWgxNXI1eFM0NVgvQWVDK3EwTmtmbEY3UE5rQmRpTkEwbTdhRi9mQm5u?= =?utf-8?B?NFVjMFp4YVZxN0ZaT3UvdGp0eGxHSGhFYnFlVkZjS3BCM1FSTC9QMWk4ZEdp?= =?utf-8?B?OEc1ZG9WeTVGSkxiWHQ1ZjJORlNJdFdXY2lLK0dyMFpCSFJuOUJMenJXMm1D?= =?utf-8?B?TTJiN2l5NHh3dUFTaGVZbVRlb0R4U2RJUVJLajdHTGk4OTUwVk0waFFJOWd5?= =?utf-8?B?eGFUZXJrV0ZKQmFaak04TzdwcW1nZmVWcm52QUluYVNHM1NKZjJwVW9paEZP?= =?utf-8?B?bzVNdHlNa24yS1NMeTVZNC9QaWQzUXYybFcxRTNIb04xMDZyTDhTelUvMUZz?= =?utf-8?B?MGxGQjRaOENzMEpqNW9FaVVmS1lwTEdPQ2VYeXZiUllNS3dFUzlNUDFLMUtm?= =?utf-8?B?QU9XM3BJeDM4MUUzNmc1eHlPbUY1VFdkcnQzdjc5cXQwQUZycWdMVGI2b3Jq?= =?utf-8?B?TmlMa3JiaGhoeVhtNGpNZDBtaTRCbk14SE9QWUxNU2N1elA0eDBBQlEydUpT?= =?utf-8?B?ZWRPaDh1d0NDdHRnSTFBa0dsSitqZlVsWmtvUGJtMmY5NFNjcEd3QmJ3cWdE?= =?utf-8?B?ZWh3MGx0M3lRZHRUN0VadFpQVDBqeEJTODZ1VEJEc1hJdkY2N2F2bXBJRTBi?= =?utf-8?B?eXNwYkxvWTNqNkMwM0c4TUd0c2Z4Qmhwc04zWVlUK1YwWGl2VmFkU3plTG9N?= =?utf-8?B?c0VKSHVkb1lZNE5sNk55Q2JQRm4yY05JR1lYRnJvSkJKM05Va1BidDAzOHFP?= =?utf-8?B?dkpmYzRwVWtlcklDQTJYaFZyNW0rRWI4YjRCMjFrTWJ5TTlNbXdNQnpaNUpr?= =?utf-8?B?YW5UeXNaTkZtbFB5VVdpVTlMRVJ2S0tqNkFLaEoxdXdzQklEMjZza01QYytH?= =?utf-8?B?K0NFK1NyeEx2NEZIanlvTnpMamRQTlJVdG5LUzJCTGp1WFB2WUtnQ3FJQ1lI?= =?utf-8?B?amJDckZPbEpDTExwTjd1WW1MdXM0Qk1QV0ZUeSs0N2NZaVQ4c2t4TmVIbEtx?= =?utf-8?B?UmtTMGVSZlRJdklWdE1JNFYxUWZRbDdiYUE5VDJ6NVJqd2c4R0lwQk5mRXVL?= =?utf-8?B?b3k5Wk5wLzltQkFDU1BhOGxJeVl5bzh5SWhCeVpucDB4T0lhdnpOU0pXNW9K?= =?utf-8?B?cE4zWEhwd2xaaFVZZG1rWEJvSTU2WTA2WnVidFNWRURRVlBteHRmYmlWUnFJ?= =?utf-8?B?OUFUdlR0Ukp6VThwcUJadnA2SWY0NGhVYndhc3M0MXNNM0hXSTljcUFmSlho?= =?utf-8?B?S3RRS0pnRUZLSWExU0ZSYUhxbllTV2orQ0pSSlV2TTlPbE16QVFKM0pEbHZ6?= =?utf-8?B?ajk1dXBqQXI4eWF0eFFleWNpWjg5WHh0Um1DdENobXlYazZjV0kvK25xdktx?= =?utf-8?B?REE9PQ==?= Content-ID: <25F48F1AC68E2746854F86C3FC89E69C@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15c97caf-6add-4a6e-3fe4-08dabbc5acd6 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Nov 2022 04:58:10.8551 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FNpATq6WdUAZloQp9gYPwIZmh3mpcWpzCcFDSQmj2V1IBZcv7ifqQfD6p/NDXDGjOejOUpTzt7ZWxOORxvfG8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5624 X-OriginatorOrg: intel.com 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 Cc: "softworkz@hotmail.com" 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: 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. Thanks Haihao _______________________________________________ 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".