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 720EB44EE3 for ; Sat, 28 Jan 2023 08:22:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B179968BDDA; Sat, 28 Jan 2023 10:22:39 +0200 (EET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C89868B6D3 for ; Sat, 28 Jan 2023 10:22:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674894157; x=1706430157; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=B7Lx0C0K1VtMbMkRQufSBI/E9jSiDRVt8Homx7ZjyWA=; b=DkIKuGRUf7z/SZojVd8vvnnbXE4fgW+Z+AbhAygiz6pZR0LMz0WoGYBO FxUN87htzMUBtfBC8FHoz/B8O7S8vgfvImdBCbU4WCD/N4Dc+8dsQsCh7 JGeGVbPVvcY/jL+glDkHiG49HKmG6XVB3GjtZqdF2cTYOJK39RKwN9Zjp 8pElMs934Z+1hKCjwFRHBb4FAEIoIeodXdaN1gjDzobsy+0CH/341kZhL 91093JcMAVe3TsK4fQ66Ukfq/bmKoyhGuw9er6xOCWlsYMcn39pkvPF0c dnSkNSdJf5V/cl5hSI1yv9DMPy0aCU/YIml45xZrL9t8zo440ONiA9LxU A==; X-IronPort-AV: E=McAfee;i="6500,9779,10603"; a="413495967" X-IronPort-AV: E=Sophos;i="5.97,253,1669104000"; d="scan'208";a="413495967" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2023 00:22:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10603"; a="992339831" X-IronPort-AV: E=Sophos;i="5.97,253,1669104000"; d="scan'208";a="992339831" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga005.fm.intel.com with ESMTP; 28 Jan 2023 00:22:26 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Sat, 28 Jan 2023 00:22:25 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Sat, 28 Jan 2023 00:22:25 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Sat, 28 Jan 2023 00:22:25 -0800 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.169) 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; Sat, 28 Jan 2023 00:22:25 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oakz3VlyoUaqwyLyMiZjAGTHv25B/yV2exFFW8lc8LQV84YQ/6AdmbmAaiwxpDpWmcpNaiSNpY0vsJCUCmMlucKWOdPZ+vQJWMCZza7W80iwLR0fywKrYdqaMEnh8lu2LiyCivCf5TUndOlJYjSnHN9jztmIT4fBaxPqUcYrO3kPOmZMlAdZmF1ul9oR/j3Y4kJjt3wrnUl4j/jE/fhCRRWzpGdi0CItk0XE5yXdAKOlJ7AMEVu4gtRepDsveKyclUuRJoyuML2EZD5p04Qh8RCicGHeKpaDF1dzc5DQSSCQ3QNioPcq97xWUEXWESArwAxUVIh4KXT1m8ahSQ8iwg== 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=B7Lx0C0K1VtMbMkRQufSBI/E9jSiDRVt8Homx7ZjyWA=; b=X89nRbMh6j5UUvpcB7zwV715OFMGro1FQyttzn5BCWr8P8O+2dwQdQSxIoY9XkJx6g9Q2/nASwO6iwO2m3Fl+eT0uJHxa4fcOS2Tqjq0qlATHJMG6EuNfXfJlxbltZzScKrHLBSrsbsgJjYbwzT07XneTNeKTJpcjidgJjpdFHbUm/n7H2h4NykFyxY9tOlGGnzxxvICKSv+KrRvSA7oCQ3Pom135vpx2m37NGNpHEwCv6osUNgJMYtbz2Q5SvM5TyvfCpuXBTYTTVxOfqu79qxW7GZ1eUVcc0bL5Kph2Ez7Mbf91ZrazLod6/Lo7g8qjk+hxQwDd2vpu3xiCKSDXg== 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 DM4PR11MB6288.namprd11.prod.outlook.com (2603:10b6:8:a5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.23; Sat, 28 Jan 2023 08:22:22 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::36ba:13c8:6a29:c7af%7]) with mapi id 15.20.6043.028; Sat, 28 Jan 2023 08:22:21 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v3] vaapi_encode_h264: Only set pic_order_cnt_type to 0 with B-frames Thread-Index: AQHZKmWKQlgt9sF9dkGSyQq5ywcQ3a6zjniA Date: Sat, 28 Jan 2023 08:22:20 +0000 Message-ID: References: <20230117111756.120551-1-nowrep@gmail.com> In-Reply-To: <20230117111756.120551-1-nowrep@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_|DM4PR11MB6288:EE_ x-ms-office365-filtering-correlation-id: b6569f79-08ab-4e78-ba3c-08db0108c6dc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1AsHLQWEATSSlThujpy3ucBzKqz/S6k4HX4E8t+9gGxJIRH/lrJ6ZK2pXQFiE3G7DmrV/4Dfy7pAc65RUy3sTM/H25kjShG0t7K8KPpiwJnyX/i6qg4mE8Ufke9yzMrkdSFBBF+KT9mr+/XzXjDteQlcj/8+Ar5W3e6XZCMFmBID2BnhX88Gix/gNl1CxqjrpP0N4cGkus7Uz5mi7OMg5DiGXm+ERISUhwkI5jOk8OInL3GXhS4eQBYgBneyo0XlL1788forE+tO7ds9h6RPTV0NdVpolQx+dE2hW9mpWniiexE+PL61lxvU+bY2sAhl6ZzlQ/71n4ckSTLP+FZUPAuPOAk3KS1gtJebJ66tbvt/lGs5Ox5ZOiQ6tAtL/4djV7yIB73sf4+sUJzJ15lfEde0v1f53eU9urYmpMhgWdVXUD3ccCo+/a5THPoV+U0BoNFPtlHYB3eua4g6itqTnvHlf1C/34U8reDXUbLz9SKualZMw8BLnddjxzdSj0gL12/ca6feb+05/QwJ0lm4tm9s8aHOXScRjL/rqA6lL1qVYve4mU6U9HjceLjds4nnv200PR2DzoWqO2rjTuDzhGtNLuiaz3OQzUYBjkw283zV4ZnCH1RS36R/zIJ8HSJIRahA3cDSe69fjx99KlgLM0ZHvFleyM61UDXCj6Lo8VwPdjwpteop9i/BDUp7gFSJYxWAhvxr6n2zBZE6aqCmlA== 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)(346002)(39860400002)(396003)(366004)(136003)(451199018)(83380400001)(91956017)(4326008)(41300700001)(6916009)(66446008)(66476007)(66556008)(66946007)(76116006)(64756008)(8676002)(122000001)(86362001)(2906002)(8936002)(2616005)(38100700002)(316002)(5660300002)(82960400001)(6486002)(71200400001)(6512007)(36756003)(6506007)(186003)(478600001)(26005)(38070700005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?eHZPaldkOHo5d2tGbFJpYU1SdFcrRS9tejJHL0xkY1Q4MUdscUN5SzFORGtF?= =?utf-8?B?dU9TZ0Z1dlJUR1l5RWdMa2xXem9xaXNjZ0dKaGpQNVh3QnBzQTNZcDllZlkz?= =?utf-8?B?d3J2Q0VGTHR1VCtJUUg0cHJzRDBpZkRtdkprS09qbE8wdXI4ZGhmc0d0QnZV?= =?utf-8?B?QTJZY0RNa3JoOUFqcGJVbUxRcmw1QWZFU0l1UEJIb3BaWWEySERRWklEbkNO?= =?utf-8?B?QlJzWGQ1YWhnWFhna3RQM3Y2N1I5cGZGSm0rSk41bGdkN0ExQmVLTlBwRHlH?= =?utf-8?B?N1pRVUd5dWxnbCtHTTFvUHZ4dHNZNWtvNXBtUGlXK2tzOGxZTlBwT0N0S3Ri?= =?utf-8?B?elVaUW16WmpkYVhzVzA0aHJFMkV4YlRwcWQ5K1ZGQUVnU1VGZnhvT0JTSmJC?= =?utf-8?B?WDRzSzI1QVljRVZTbjNzTm1UNnhLc1RBYzNmN3NyN2VZTzIwY09BK3IxRFJV?= =?utf-8?B?a3ZOM1cvMyswWjFCb2dxaXptajRrY0ZkYmdoT1M0eDJyK1ppblpKdjBpOEQv?= =?utf-8?B?WTh1cjlPRnAvNk4zV0NPVGl2WVl3S1NMZE5kOFAzcWR2c1Z0clZrc2ZRRjlG?= =?utf-8?B?dCtqTERGYnJkNnBBL0JTUzNsdngzOUFGNlR6R2RPYnFoUmVZWHY1OXNDSmpz?= =?utf-8?B?OFl3YUpWZTZWYjlIbEQ5bFBqQm5mK2dnWGJpbWw1UHFUcGNZRWo3aWxCcWVR?= =?utf-8?B?NURyQUU4TEVtekVMQkEzbHRvcTVhMlFkc0RqU1U5NjcwQ3FLME14NlJmeHU0?= =?utf-8?B?ME0rUHkwTlg1QmszdFBKY1IvYlVqSFBTbzc2Uzh2STduN2g1ZnhYcXBNMlMx?= =?utf-8?B?c0d2LzdITkZTZUorM1RrYVh2cjZMNWFwZ0lqTTVlbHVWQ3ZMeW5FTVkwcGdS?= =?utf-8?B?UEw2a3QrNDAxbGxUaHhFU2VmVHJCYkpoVk5qdE1rUHFVeWM1ZFFac09FWk9k?= =?utf-8?B?eDNBeGVrK1MwRnFSOFUrb1F1Mm9WbzZZTzBCQzQrWmJLM0dVQkNYVFZGdXZm?= =?utf-8?B?K0kyazBTM2NzblJFeVRkK010YkpRanNCMmd6aHlNbHduaHl5WTJ1S3VqMys3?= =?utf-8?B?a3pLdTFUL3ByQll4dzF2UFRQaUw2SkZ3WGpvSWRKUmtMOVJ1QlFERnVmbEtN?= =?utf-8?B?M3Q4QXJwaFdtUUNvUkw3ZUZwcDdyaFFpSjdMbW9rMEhiNU1oVGh3TW1tY0Yr?= =?utf-8?B?QUxnN0oydzBYVm9QajRPdzdNTDZsTTJBS210b28xVFgvQmtqaTFlYUVTdFE5?= =?utf-8?B?WU1Gejhuc1oyellFMlJqT1JZZUhRQnhQQkJKV2MyNUtjN0hIODY4VGtiMzRs?= =?utf-8?B?cmdJZDNnZEExM3pNTGxEK1UybFBJYVMxQVl2Nld0SXZ4MElVZDU1UUxzMGV6?= =?utf-8?B?R1lKbDlOY2NjRHoxUzBzQzV5TS9maUNac3NNemZmUk0yTlJpQkVEY1BMUG14?= =?utf-8?B?VXpYRVQ2TnJHSnd1YUM1Ukozc1JFQm1LdCtVNUVCbXU4THVrY0docmJ1NHRy?= =?utf-8?B?M2hDQ1NnUktKeDFWQVJDQjNGa1piUFkrYWdhN1lGbll1andJV2xxcDd0Q2Nx?= =?utf-8?B?UGxpdmJiSXJzZytLQ1JLQ1ZEblVKVndsZExNd0k0Zmphc1V1dlBqKzZKNjhD?= =?utf-8?B?dTBlWlZLeHBMSE40V2dudHNPa01XN0psamZaOWQvRCt6VDhIbGVMdGd0MGoz?= =?utf-8?B?dkNmQVhtNVhBRTZlbXlaQThic215OGQvWnZYQlB6ekRiY3A0Y0orQmJPa2dj?= =?utf-8?B?UGVnbXJheTZMRXpIcWcxWE5HYktLTE9sakpQV29WZU5iamtzRG44VjRHbmk0?= =?utf-8?B?bkpwdFRJM0tMcklQQjY4ckptSDlvTllNOGt1L2RMR1FWMm5iVzRrWlBnanYx?= =?utf-8?B?YnJuQ09TTXN1T2w1VnVQcEVLWFBoK2U0TGQ0SFRESnFXamlNTVI4THdKNHFw?= =?utf-8?B?QjBBTHQrWnlPM0pwM3RnT3FzdTNlMWVKclJ6ZjJxWGtsaFM1WDhRSTYwU1VN?= =?utf-8?B?NnhJcHlOc1FDTjRLOWJTcVVaVGNTdi9WZTMzOTI0WkducVZHUVJNR2g2Y1F2?= =?utf-8?B?aERpTTJ6bzVmNGo1YnZUNW1acmlqM2tUdkQ3TjVKQlpKQlRkd3RMNHhJQ1Bt?= =?utf-8?B?cmoxblBxMC9NdEpGNUliYUZVblRuTG1uZWVoWjl3VWJCMDA0OVRxL0JTN2pR?= =?utf-8?B?Rnc9PQ==?= 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: b6569f79-08ab-4e78-ba3c-08db0108c6dc X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2023 08:22:21.0308 (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: B5FthgYA5SQDW9/MhkjY/po1eM9K4LftgQbVYdxDzXvhBt0ff+HhEHAMBywaUwpb6rxxqkc/8t5n8AjgP/E+QA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6288 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3] vaapi_encode_h264: Only set pic_order_cnt_type to 0 with B-frames 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: "nowrep@gmail.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 Di, 2023-01-17 at 12:17 +0100, David Rosca wrote: > v3: pic_order_cnt steps by 2 > --- > libavcodec/vaapi_encode_h264.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c > index f15bcc6..de0951f 100644 > --- a/libavcodec/vaapi_encode_h264.c > +++ b/libavcodec/vaapi_encode_h264.c > @@ -361,8 +361,10 @@ static int > vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) > sps->chroma_format_idc = 1; > > sps->log2_max_frame_num_minus4 = 4; > - sps->pic_order_cnt_type = 0; > - sps->log2_max_pic_order_cnt_lsb_minus4 = 4; > + sps->pic_order_cnt_type = ctx->max_b_depth ? 0 : 2; > + if (sps->pic_order_cnt_type == 0) { > + sps->log2_max_pic_order_cnt_lsb_minus4 = 4; > + } > > sps->max_num_ref_frames = priv->dpb_frames; > > @@ -643,6 +645,10 @@ static int > vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, > } > } > hpic->pic_order_cnt = pic->display_order - hpic->last_idr_frame; > + if (priv->raw_sps.pic_order_cnt_type == 2) { > + hpic->pic_order_cnt *= 2; > + } > + > hpic->dpb_delay = pic->display_order - pic->encode_order + ctx- > >max_b_depth; > hpic->cpb_delay = pic->encode_order - hpic->last_idr_frame; > LGTM, will apply. 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".