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 5CF564014B for ; Thu, 2 Feb 2023 02:47:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FA6468B4A7; Thu, 2 Feb 2023 04:47:43 +0200 (EET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869C868B149 for ; Thu, 2 Feb 2023 04:47:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675306060; x=1706842060; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=ewUMcBY8LKZp9ZMOKUC4TnCs1EIbPPXT8EoF9UzdEmk=; b=Ph8JNrKnN/EFUyFpa6z7IyRriAVBdkNSRsoFXvAAuSlRZtYWUIrjAnQH AvNcS+McEBJUhNRoQyDfdI4eAzWIU8ATHj9QATmWX3GUxwZIzz9CkvwBY uwO+3vMVH03rsbv8012W1pHmXZk3CWoZyCtEUyD8Gtc+y27x8uf7ooepr +Zyx0gceKcyyNQhNtKwj6mbvaRFu8uDoZ6HCvxSqOWiufznaN/6GUysZh ztK6K/eOgQkR9kHHhPFSZ8WGdsXD6rfmYqS9i3+g4VybGz40zwWSDjAKr Pj2kHu+NNjKgcDWrVw7jkmFUmx9jOhkqjpRi7mY9nZ7Zf9Eg+0yIoBYyN A==; X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="330468664" X-IronPort-AV: E=Sophos;i="5.97,266,1669104000"; d="scan'208";a="330468664" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Feb 2023 18:47:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10608"; a="789118877" X-IronPort-AV: E=Sophos;i="5.97,266,1669104000"; d="scan'208";a="789118877" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga004.jf.intel.com with ESMTP; 01 Feb 2023 18:47:31 -0800 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.2507.16; Wed, 1 Feb 2023 18:47:31 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) 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.2507.16 via Frontend Transport; Wed, 1 Feb 2023 18:47:31 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Wed, 1 Feb 2023 18:47:31 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MHS188kmoTr0rLVBntgelnmvHf6RAU/ZLsPZL7FvWtoZAb/pvNJCOSY91Nm2zKf7LVb7SZiJ5NtbBqH1jQ/gduOUoD/trPLtBN/h6XSYS/7VhxQl4AH15LAc0GiwbRx8B5P5MUnt1A25SrtYwrPbXJTEggdGp5F0iJs80lseUJTdmoRMvvXdmsrodT/XPd3Gddg1uWQVe9vtt9wqWGTED7h2c2Xp2NzRa5HdmmEuAMQeaozV3kEr3XGQX1Bjg6P9oxTtBXGrNNbnJw0ap1/mRYgzig2lDcAalARkp8Lj7mJz70mDyA7R+3hJ7BEPAX5SrJCfS13PiiMoRUpeDHbtAg== 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=ewUMcBY8LKZp9ZMOKUC4TnCs1EIbPPXT8EoF9UzdEmk=; b=QlSPx6YO8wEhq2iPhwf2/W8qztiq5ZdUhY0HCIErrx+T18U4/qRlqhl7qbIWrTrl9j+iMUs8HMoYCuLZQvYkyjYYUj9Gbv7ucClsGuz4hUby4TlBQ3WNHBn3NH1+38DDFN6oO5ylpehgUSmW4CqK675P2rKVInhIOz4CkReMuQZIASxMpiz4mh8x32icT5zmP+U+Yd/GS9iLz8vxXJVBu3RaJJcTnY/tMTvTnJl1mofmoS20WgusQYt8IwXo4RmzaMSsIO+JLEbgDESXoJw5mOBPZMhj4TZEM6HSWU6PtUrKqZHwkDb4dYST4b+v3R1LDq4vQf+VyZsz59BZBfSt0Q== 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 CY5PR11MB6137.namprd11.prod.outlook.com (2603:10b6:930:2b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Thu, 2 Feb 2023 02:47:28 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af%9]) with mapi id 15.20.6064.024; Thu, 2 Feb 2023 02:47:28 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH] lavc/vaapi_encode: fix propagating durations and opaques Thread-Index: AQHZNXYVsnJmpvb2sEarD8wt3yuioK65Z42AgAGO1gA= Date: Thu, 2 Feb 2023 02:47:28 +0000 Message-ID: <3909e226e4e39465ccf0dc63d5f4bc55421655fb.camel@intel.com> References: <601087569af7d6b82fe47f82c28dd17b99e7e59f.camel@intel.com> <20230131131447.24732-1-anton@khirnov.net> <98a71bdc2e90bb875f487ff416f72b0674614e88.camel@intel.com> In-Reply-To: <98a71bdc2e90bb875f487ff416f72b0674614e88.camel@intel.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_|CY5PR11MB6137:EE_ x-ms-office365-filtering-correlation-id: f4cbbd82-0b32-4584-f71d-08db04c7d2fd x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: InVITj8ZlDgk4iXnxQuI4sh2cMjjkQGZpVXcDSJ2LALdrKjj5dg2C2VAjNU7ljg+MQRCBESUOC2SablOfl8/tUJ49njtg5Wwu0XhHEWt126HZ1bpPiA8L3HNlMeX1sa7I7qojqLFDKju+YJRVooHhbYYqZmOMYDRJNbEgfQ214s1oGutxrdBV8bZb0FdT92LKaJdo5fuwuX8ggFK7MQXTQappSqSv1yg7+0vg4Z8uclFd6oA6vgC3/VXMMy2f7TVN6UNLAMgeM0Pno3B/BRhnnMDRj4vJ+I9fhR+ko/hWvmj3ZpG8Ks30Im10LxP5YutGXk/s1LlIfkCxsoQKkL0aBg8aqCW/avq+bYoNN5U7PCkrT2TJ28NLhz54njkW3SZagQjvtyLfD6mGFmnNLOGynmNd4v7pX2VhQ1NNB4DMNx+p1QrSbNl0f0+AVFvWyeA4P/AA9W6lZiPqSs4v9zZDSV8KSWrCsUXPjIa865b0P3BJc3OJQidYt4734Q/ocHDZu69IYaixmOM/6fAcQLDrgx/LnEiPEgJxzCsjXPvyqpN9QGhN+oKLASRFxb6d4C3dt+L0I9+iw05KnSI9B+Ug/NzK26G9GrgG+v1xQ4oe1zYwQQu3lwExiMw+ADQzpnf61VAno0O83XtmvFRgkvPWLmVsJyKCZE9a2+xty117vSfNLYGYTaIBPZ8vBas+UdJMmZcumzbK73Nrrydd6BmcA== 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:(13230025)(376002)(396003)(136003)(39860400002)(346002)(366004)(451199018)(2906002)(36756003)(38100700002)(83380400001)(71200400001)(316002)(6506007)(478600001)(6486002)(26005)(186003)(64756008)(76116006)(91956017)(6916009)(6512007)(38070700005)(66556008)(8936002)(66446008)(8676002)(41300700001)(5660300002)(86362001)(122000001)(82960400001)(66476007)(66946007)(2616005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?U29IM3dvd0RDSE1JSVlRb2t6dERBdmZWc1dKZ3owdFd6L1o3aHFyT0lOZU1J?= =?utf-8?B?aVFzdUVzaUtkRHZRUHJILzVBUGd3bkdMekUxSytsUDRySjZWa3VzUGF1Y00y?= =?utf-8?B?WkVndFNTeGNBSlZjeGc1aU1kbS9NQVBtQ2IremxDRDN1Q1Q1K2ZtUnJ3ckha?= =?utf-8?B?R21hbW1MNXd6NVpNc1oxbDBZNEZtRmRMOC8vWndzNXVwejMyMlJ6UTI1Nytj?= =?utf-8?B?N1BJUDliMVBzYmsyMjltSTk3UERmN3U4eEMvSjM1QUZTRHJaZDJ6ODY1Rm9D?= =?utf-8?B?a3RrcWVoRllTaDhhRmZUaFNQbVpjMFVlODUvZTZ2U21CZmdNQ0tlZEViWkQ2?= =?utf-8?B?WDNpNHRnOVlVczViVlczK0R0Mk9uTmwzblpYNGpRbW42TllZVkRjd1h5UlVX?= =?utf-8?B?Rkp4cDltdjh1Zi81NlVSN3FZcCtISUNoKzc0TnBkTk1CS0w4c1hoZ0VYY2Vo?= =?utf-8?B?V0JvdVVORHBLem5YbjhWc3d3NC9XWjM3d21iV0RyTHpCSzFobTI4VlZzd2Fo?= =?utf-8?B?R2VDeU1xK1RwUURVMmRDVkExNVhjWW12MUN1OUI3QWpZL1l0V09pL2w1d24w?= =?utf-8?B?czRoc0VoZGJ6VlhZUmZkazRVWnZhT2k5Q0lCSFhtclQwYmRWbmo2dEFML01B?= =?utf-8?B?eXFRS0lZbGZyNlA3aGdGbklKNVNjS1BsNlYzeTJQMm40L29jRnpma2VQNXpW?= =?utf-8?B?ZWNmQWdJTTJsakJlY0E5V1pxNTg0ZmNHMEwwWndxZGVudGdkckdTZ0grRHBZ?= =?utf-8?B?VzVXaTdEKzQycDAyRzhybzhOd1pOSzJUM3JYd2FyRW5pSkFLcC8xRGlXVlB4?= =?utf-8?B?eWViSHVhb3hvUncxSlF5U01LWmE2clJVWC9uTXhKaXY2WEtwOFdxVkR6ZHlF?= =?utf-8?B?ZWFxL2p1QnBjTEh6ZEIvdzMvWlpHcnVsY3EyZ2lUY3RLMmxvNGgvMHNVMUMz?= =?utf-8?B?Z3JheHQvU0xBNlJXZDQySmppRXJYejQ0Y05mVzNCaFRpY2lOeHFRdGFlVzVL?= =?utf-8?B?SjJidXUzdTVRRUltdlNqV1VqTTNNMExESE05Nm1kbFpYK21qM3ZQQ0F6VDdU?= =?utf-8?B?OGhoN1FBa1g0T0h4M0hhZCt1V0U0S1JKVG1pQXhoQnV2N1BpZzFxN2kxaS91?= =?utf-8?B?RXlMa1hHZ0cwbVZkSW1sOVhaZmZQbXRoT0wyU3QxVlhVSjIzZmNNZENBMlkv?= =?utf-8?B?TXYwT2Y4MmJNNVBjQmtkeGtkMHNIVmhna2xIaWFmSlpsVng1ZjViM2hwQWpm?= =?utf-8?B?bFR1RW02U2tNeXpRUHlzZWVxa1hVUXhTR2FCaTJaV1N1aFlLU3ZXUEpjNmcw?= =?utf-8?B?bmhTUGJPc3VyMm85K05jVThTSWE3eE5Lakx1Ym1qY1ppQnpybFFaUWdkL0RY?= =?utf-8?B?NkdEQUU0ak5SZ1NRR08vTGw1NUtvbk4vdlgxUUpqTFRJT2xGbTNGelowY1E1?= =?utf-8?B?aDVLSXg4T2RXV2txTlF0UDBYaDFJQU13WTl1Z21NbFlKSkhnbDJjNmY0cTdS?= =?utf-8?B?SldVdVk1NmZ5MHd1TFhyUUQxZSs5TUNTQ09UNWhobUhYQjRrNno1aFhqVm1N?= =?utf-8?B?eFBzVi9VYUR5R1RqUC8vRDBzUWpGWVdRTFJKNFN3RWVNN01CMUw4eFN3Mys1?= =?utf-8?B?dlQzLys3OEhnMEZUN2ptTE1KSmkycUN2VlZQUDZrTkFoNGtlQ0lPNk1SLzJG?= =?utf-8?B?RXlHYzJWRUlUZVJ1SkZwUWdRb09FdDJJY0xOd3lYelZMSjRYODQ0K2pCZmZi?= =?utf-8?B?MlRROVRDNHE0YUo3YWdVWlNDelMzTHBpaVJScXBWdEo0NUxuTWQ3SWF5TGJv?= =?utf-8?B?Tk5URTdMK0xrNEVTT3gzbWRlcm96WFFQZ04wYi9tSDBmaG9sSHFIZ2U2T3lJ?= =?utf-8?B?MXE3djhzbjJIVmJRWUs1UnVLTmlLOHJ0K1ZBMkIxWnFZWEl2cmtJUGZYd2Q0?= =?utf-8?B?Zmo4eTBCUU1BZTBBbUZUWlJFZ1ZhbHo2b1R1dnNnTTNCdk02dTdkbU1BK0xB?= =?utf-8?B?UVROY3hudjZKNkFLMVZxVGU2dStKby84cFg0VStzWmduZUV3N3grSzUzOUoz?= =?utf-8?B?VmQxRUI2bkJ3SGNpenpOSHR4czBnZWNqbnVwMnVFYzZGTkluSmdpaURHYnJN?= =?utf-8?B?c3NGYmdMbU1OMmM2T3ZsNDdGZVNsSVNrNTRMSlVQaURYV01KK2FCQjNjS0ZM?= =?utf-8?B?cnc9PQ==?= Content-ID: 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: f4cbbd82-0b32-4584-f71d-08db04c7d2fd X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2023 02:47:28.7606 (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: b5MO5x6Fk07pyXfBLPfoauckzXrxkr9oQLejRqCQfD7wzYx0xr3K2n2B/4LPznG5kpdtUC0ey8CaKmzGSVqxkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6137 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] lavc/vaapi_encode: fix propagating durations and opaques 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: On Wo, 2023-02-01 at 02:59 +0000, Xiang, Haihao wrote: > On Di, 2023-01-31 at 14:14 +0100, Anton Khirnov wrote: > > input_image is freed by the time the output packet is constructed, so we > > need to store copies in VAAPIEncodePicture. > > --- > > Is this better? > > --- > > libavcodec/vaapi_encode.c | 22 +++++++++++++++++----- > > libavcodec/vaapi_encode.h | 4 ++++ > > 2 files changed, 21 insertions(+), 5 deletions(-) > > > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c > > index 6787b90e8d6..bfca315a7ad 100644 > > --- a/libavcodec/vaapi_encode.c > > +++ b/libavcodec/vaapi_encode.c > > @@ -695,7 +695,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, > > pkt->flags |= AV_PKT_FLAG_KEY; > > > > pkt->pts = pic->pts; > > - pkt->duration = pic->input_image->duration; > > + pkt->duration = pic->duration; > > > > vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); > > if (vas != VA_STATUS_SUCCESS) { > > @@ -706,10 +706,11 @@ static int vaapi_encode_output(AVCodecContext *avctx, > > } > > > > // for no-delay encoders this is handled in generic codec > > - if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY) { > > - err = ff_encode_reordered_opaque(avctx, pkt, pic->input_image); > > - if (err < 0) > > - goto fail; > > + if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && > > + avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { > > + pkt->opaque = pic->opaque; > > + pkt->opaque_ref = pic->opaque_ref; > > + pic->opaque_ref = NULL; > > } > > > > av_buffer_unref(&pic->output_buffer_ref); > > @@ -785,6 +786,8 @@ static int vaapi_encode_free(AVCodecContext *avctx, > > av_frame_free(&pic->input_image); > > av_frame_free(&pic->recon_image); > > > > + av_buffer_unref(&pic->opaque_ref); > > + > > av_freep(&pic->param_buffers); > > av_freep(&pic->slices); > > // Output buffer should already be destroyed. > > @@ -1152,6 +1155,15 @@ static int vaapi_encode_send_frame(AVCodecContext > > *avctx, AVFrame *frame) > > > > pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3]; > > pic->pts = frame->pts; > > + pic->duration = frame->duration; > > + > > + if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { > > + err = av_buffer_replace(&pic->opaque_ref, frame->opaque_ref); > > + if (err < 0) > > + goto fail; > > + > > + pic->opaque = frame->opaque; > > + } > > > > av_frame_move_ref(pic->input_image, frame); > > > > diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h > > index 359f954ffff..a1e639f56b0 100644 > > --- a/libavcodec/vaapi_encode.h > > +++ b/libavcodec/vaapi_encode.h > > @@ -75,8 +75,12 @@ typedef struct VAAPIEncodePicture { > > int64_t display_order; > > int64_t encode_order; > > int64_t pts; > > + int64_t duration; > > int force_idr; > > > > + void *opaque; > > + AVBufferRef *opaque_ref; > > + > > #if VA_CHECK_VERSION(1, 0, 0) > > // ROI regions. > > VAEncROI *roi; > > LGTM and the command for transcoding with vaapi works well now. > Pushed because this patch fixed critical regression in vaapi path. 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".