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 73DAC45267 for ; Mon, 16 Jan 2023 04:10:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EC0F68BD12; Mon, 16 Jan 2023 06:10:38 +0200 (EET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15B1968B1F2 for ; Mon, 16 Jan 2023 06:10:25 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673842236; x=1705378236; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=9bb41GjmBeHfBC7gXN4NGYjpQiAzRNyHGWkgNe/Bmag=; b=kNq1I60E4cOS4oW2wSatzGmw4myG5A01krjQF0qyGpXKZoeMIboaUbwc IbPAIwKl+H1/6B4Ug7uW2W1jQL4AIn+JKyRcNrwmB6Rp61aaA7apESbVe ifCvjjnC3Kac7BGp18APhfBV6FAC5AWGDTFby1+SeWdzQJPZ/UX1AzX8Y ybb9AjuTxavLWnDG6qIhz2qg5sJe2jYxe9i/V6CctjZj7uMBxt25v88mV FFA3KhSMl4uEZbskwyScGtrm/111jct34n6eMe2Y2/df5G3yFSft/MAzr tdh+o+IqxunP0vLLg2b61U25xYf7+IQBFvqYtIhrhxJNoMotAe4cC4u3i w==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="325640620" X-IronPort-AV: E=Sophos;i="5.97,219,1669104000"; d="scan'208";a="325640620" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 20:10:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801251668" X-IronPort-AV: E=Sophos;i="5.97,219,1669104000"; d="scan'208";a="801251668" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga001.fm.intel.com with ESMTP; 15 Jan 2023 20:10:22 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Sun, 15 Jan 2023 20:10:21 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Sun, 15 Jan 2023 20:10:21 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.170) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Sun, 15 Jan 2023 20:10:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ROv2sB/XY//yHC+Q6g300/hdmHB9A9Fkv+UtH2oeQE/DN56qYH50lyBUO4l1m7qB/mglrmhNcS3niQdDo54ggvFJsvGeLE18ptC+t3g44ks1iSo3iZNV0S/QquPler/P9EEas7D/TMyvrGHFXYemOBUgNyMh+kd/9udiBdt4hY39kqIFh8Xb5o3RP1KaH6MMLBst2kWAKoGt+7l9PlBx53c81YR15eaC5fkf6jeZWGunhA6dB10Qt8ATAPa6V7KzB2jOkxJ+mPuRBzo0Y8Gy3G+aEr74ZBlCDDz3H6J6b+MyDe/dy/t7dC63Xzb6lYuB8sEYWDL4OdO5RxiBAtCM9g== 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=9bb41GjmBeHfBC7gXN4NGYjpQiAzRNyHGWkgNe/Bmag=; b=hz9rJYmmg3K+BJvFfG4ti/NTJGlX56G8uLuZhZgTgXLZs3alN8VsqFZBYbknLoFO00QQ4TKEuWYABU43YPEmJIlWw9JZ8JV5CTvyFYlBkC8M0iAfImm19g6uR7UNk1hv7WMoFCXJLzhe8//POavfRr6Gssc0kw2ixd9oaEJB30wo/sqD3FNGjhvz0g/5nALM3L4WNUVkXJ9zzSzrSewRg95/kj52sWLnEEMppiKHaw2y2NwvTWXhBRYs8CXO9B6CA4zqmt7an/LEw3mjcEkSVvrmXf6Xli76YeUCs6A+x0xp8NXrXE1fKjzIP/cni2Y8jD5fp4paonuo+32SNMvCWg== 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 CO6PR11MB5585.namprd11.prod.outlook.com (2603:10b6:5:356::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13; Mon, 16 Jan 2023 04:10:19 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::e3ef:177c:4008:7ee9]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::e3ef:177c:4008:7ee9%5]) with mapi id 15.20.5986.023; Mon, 16 Jan 2023 04:10:19 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v4] avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI Thread-Index: AQHZJFn+FIeWaA3hgUaeh8lgnoyt0a6geBQA Date: Mon, 16 Jan 2023 04:10:18 +0000 Message-ID: <4f2ef8121a76bb0d7e014656b47484d85e84bdaa.camel@intel.com> References: In-Reply-To: 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_|CO6PR11MB5585:EE_ x-ms-office365-filtering-correlation-id: 73ca306d-d0d2-4063-8cbc-08daf7779489 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zrCo3vaq/brOJQGig1PlQebVtywkSFRKr+71LiiKmUpRhwiypf9P61HFs5BKMZD0LeU0+DKdwjeYP3XS4nfOuNQ90YO0x0I4T9eNYOoeZTHT53rVspmFn+RTBl9imcaaf1CiJB7s3zCU7HYwDe74r0wwAI0oa+FMp8vVXlAj8Um89To3ZslcAe7Os3Iaylojhh/k6bVawaSH7CP7LW+QYjIju1XTpKCikrCCs8JkRGAHbydDY/rqkKAK22YJTZjuabWJ9bG6Nf52z6s39sONO/4sOeurqpVVt7POwP6M+MxTam2AYaH7wp1xJb//fmAD4Bje35DeRCvI9e6MlYtWaUm4dwid1gQRfR7veft7xlU9y0Y/t5hQsd/AhsSU7UdMf8AdCWQLw5p1ryjZcNlwTg0RSJNkV2bx8RXY1Tz78XR0aTnjmMzViZrZhESAmLSuodYbJFgKBJS3ldpJuACRgshQZIZxSrQo8mF6WT9Ufpysb9HSw68bQXpBRfJx27msZyrLz3K3thfJZ78gA4XyEPpdokFpbt9wcfO5nGYy88+ReTkw17xnWcWav21ggfcK0RBCv+cu5eQmPiw2Zed/B+iHnfl0k2CBedywJlQKYZBbCJpCvjzTCE/xkYz4fbHCeGg/ZXiLm3SXzozP40YGhVeolXrH5rsql+5lpd631bQWxxm+BuvUWKMifhJ56aDDkO0/XfvnH7/bU/LGvwe8Kr+yCoYpt9Yo1whgxHej32Qloy6WzqwG8bl77P4g7dKnYuz2DTeLGG38i+Tfr3VHuQ== 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)(396003)(346002)(366004)(136003)(376002)(39860400002)(451199015)(2906002)(8936002)(5660300002)(76116006)(26005)(36756003)(41300700001)(6512007)(186003)(38100700002)(91956017)(8676002)(71200400001)(66446008)(66556008)(86362001)(6916009)(64756008)(4326008)(66476007)(38070700005)(82960400001)(122000001)(66946007)(83380400001)(6486002)(478600001)(2616005)(6506007)(54906003)(316002)(966005)(19627235002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?T1VRWmJkSGVDY2R6WUFYdmlOcnNJczIvcTQwRDRHQThGQXY1b0pNQ0xWazFC?= =?utf-8?B?VGhITzBpdVRjUlVaTjZxclpDeG0zWUE1dEp5Wm5CMGdESjBSMTZQMnNCMmt1?= =?utf-8?B?RkNQcmFCQ05NT2ZDODBTTEJrWWprV0xqQ05tVnZqUDZvVGhKK3J0RUpNN0xG?= =?utf-8?B?Qkd3bEY1WVJaMEk5WTVDR01TSm5sLzRLSkNXajZrS0xLUTFna1hwczVXNGtw?= =?utf-8?B?bFBRVkdOUjFBQXJiRXYwNzM1SzVwY0E1NGdUOXcrZ3g0QUc1enErdXQzenVU?= =?utf-8?B?RmcvZkJka2tYZHZ6TE0veDVmZUg2WkFiU04zTVF2V2lLOGlHL0s3b3ZTRW1D?= =?utf-8?B?V1l3enVRc3ViVjV2byt2Y0NRajNGUjc1OHd3UnBwc2hKeU5jVkFpbXdMaDVs?= =?utf-8?B?M1pwTlNLdW0zOE9yOW16MnJWcXdlQkpKSXI0d0tmNUtWMEVUS056Y21oUm9p?= =?utf-8?B?Wnpsc0Q4U2xTanBGSjAwbmZpbUVMalFUa0JOYU9rblhoVzhFY2lyNWo5b0tj?= =?utf-8?B?Z3BLVnhidkFibFQrRi9jNlR0RVNDanRmeEFjdFVEN0Y1ZVdrT3hFZk1xQWNB?= =?utf-8?B?RjJCTS9zQ1d0V2YyZFh5YkpXN3Q5a0Y0QVFzRDJ2aFNkU29sdEx2bmh1NEJX?= =?utf-8?B?L3FURll0Vi9xeEJpTHVVYk1DeEkrSjl4MnNJTG9nV2Y1dSswaUhXWldPOTJI?= =?utf-8?B?M050NHA1dWFJaDNEQUVMNUNjNkxZVXgwUVFLbzBEUlVoTHZFcW1lZGdQL09t?= =?utf-8?B?ZjUwVjdERDZDSmx5blFkYS92b1pHVThEVHozN0pDWjhJQzBFOW1DMGFQUkJT?= =?utf-8?B?N29OQk52VW5GRVU0Vk1MNUFMTXBYTWFZTFExdEk5T1B3MEh5MWwyeVRNT1pt?= =?utf-8?B?T2Nwdm5sVVR1alFFajZWTTI2ZnZTcmVxd0xaNWVaZUZZSEp3Q3hnY3NvelB0?= =?utf-8?B?R2hWdThORWE0K0VDYk1oRE9NWTVkOFk3K3IrM29xOElVeFUybS9zVGhjN1VV?= =?utf-8?B?OWQ3NE54aEFxTTh5ZE5SRWJJQWtCRTBGcWM4Q0NpdEovQW5YRDUyZWVZZExY?= =?utf-8?B?YW9qMkpMR1luWllOdklNcDhVaXBSZFRJMmdweG1lWTlLM1FXRkZpZzFLRS9v?= =?utf-8?B?RUFINCtnaHZ1RjNQZU5VUk5VQzRnYjNhb1JicURrbHgreEZjaDBFTm1XbXVL?= =?utf-8?B?dDFBREdONzRHVVNuVkRveUpUOTZqMEZ6eVFwRVZJUzBMaUhuUTdqaEsyZDZH?= =?utf-8?B?NEVvNW45eGc3NDJhZm1UWGoyTUFXU0hQdytGUjhIVUROT0M1c2lOZXhRQ3ZP?= =?utf-8?B?S3pCUDhjU2JTQzBSNUxkV0FXSnBsWFZQdU5KYlMxaDB3a2J3VFZqUldWYmVE?= =?utf-8?B?azlCTzFZVTh1RXJLci9ZaXBudVdIL0ptL3Z5NlRNcmppVG1kbERiTzhhY09m?= =?utf-8?B?M1ErSTg3SlNZU3F4TlZScVNpTStRa0hYV3p5WEEvNDR2Mkc0MlNYRkhOa2J6?= =?utf-8?B?VEQ5Z0oyVFZxUlFiWG1XbG1scFlOWEJhMWpJQUJZdC9UZ1BJZk5qNFVtTFZU?= =?utf-8?B?Vlc5NmtTR01CejluWXEzajE0YksyM3RJTTVaeHNOSE41UzdYYWZPR1R6cTlu?= =?utf-8?B?MWRzUWJZQmw5aVZkL1R5TUViVU16QUlhWHl6NVRqVTF3Nk84OHo5ME12eUNv?= =?utf-8?B?bzFDRzByUy9CUnZGZlErNVErNC9IT2trbE5zZ2hlT2pWRkF1QlBtNjUwSTkw?= =?utf-8?B?WjhRN1Jkb0k3dGtPM1A4SXBldFFuVmtYL2lpZDdOTUN4aWZscTlkUm9jR0xj?= =?utf-8?B?Q3A0SWRkbWRaMlZiTitUdzJYT3NIRTBPaXZRVFR2a1ZPUE9GQjc5ZU90ZUNj?= =?utf-8?B?MUloMG41ZTB1YlRrNko5SitEWC9Dc3lndFlpMUQ0Wjk0VmJPaW5ObTY1WnZu?= =?utf-8?B?Y0pjSERaKzE3d1Y1SEJUWVc5MkNmdlhlS3J5bUIvZkQ2b3g1OVE2V3ZvRHVQ?= =?utf-8?B?L3ZYR1BocnNIWmhWMTFXb0E5cXhBNzZHRFk2RkdLM3ZZM2FvclRHd0pwRU8y?= =?utf-8?B?WmhNVHZFNHlQS01rTkd6TDVSdjArM3ZoWkhtZHc4WDJHaDV3NFQ5ek1uYS9S?= =?utf-8?B?TFVaR3VkdnJMMnkxZ1RKZ3JxRFgxUVNjWTVCSE0wT0MxN3MvclJ5ZnhveU9D?= =?utf-8?B?MEE9PQ==?= Content-ID: <469BF10730EE924B8B1BBE50A8B2E4A2@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: 73ca306d-d0d2-4063-8cbc-08daf7779489 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jan 2023 04:10:19.1245 (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: tM+GftidOQpJqEPxKlBs1Gg6Jk93s9VVDFHTiVRtF5pZi3AtwtawmxwKukolC/s3qY1UEP1fhUbPNeS4tDtOxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR11MB5585 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v4] avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI 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: "haihao.xiang-at-intel.com@ffmpeg.org" , "aman@tmm1.net" , "andreas.rheinhardt@outlook.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 Ma, 2023-01-09 at 18:40 +0000, Aman Karmani wrote: > From: Aman Karmani > > Signed-off-by: Aman Karmani > --- > avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI > > v4: updated deps in configure v3: fix build failure v2: add control via > sei parameter > > Published-As: > https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-46%2Ftmm1%2Fvaapi-a53cc-v4 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging- > 46/tmm1/vaapi-a53cc-v4 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/46 > > Range-diff vs v3: > > 1: 149fa8e61c ! 1: 367db524fb avcodec/vaapi_encode_h26x: passthrough A53 CC > data as H264/HEVC SEI > @@ Commit message > > Signed-off-by: Aman Karmani > > + ## configure ## > +@@ configure: h264_qsv_decoder_select="h264_mp4toannexb_bsf qsvdec" > + h264_qsv_encoder_select="atsc_a53 qsvenc" > + h264_rkmpp_decoder_deps="rkmpp" > + h264_rkmpp_decoder_select="h264_mp4toannexb_bsf" > +-h264_vaapi_encoder_select="cbs_h264 vaapi_encode" > ++h264_vaapi_encoder_select="atsc_a53 cbs_h264 vaapi_encode" > + h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m" > + h264_v4l2m2m_decoder_select="h264_mp4toannexb_bsf" > + h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m" > +@@ configure: hevc_qsv_encoder_select="hevcparse qsvenc" > + hevc_rkmpp_decoder_deps="rkmpp" > + hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf" > + hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" > +-hevc_vaapi_encoder_select="cbs_h265 vaapi_encode" > ++hevc_vaapi_encoder_select="atsc_a53 cbs_h265 vaapi_encode" > + hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" > + hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf" > + hevc_v4l2m2m_encoder_deps="v4l2_m2m hevc_v4l2_m2m" > + > ## libavcodec/vaapi_encode_h264.c ## > @@ > #include "libavutil/internal.h" > > > configure | 4 ++-- > libavcodec/vaapi_encode_h264.c | 33 +++++++++++++++++++++++++++++++- > libavcodec/vaapi_encode_h265.c | 35 +++++++++++++++++++++++++++++++++- > 3 files changed, 68 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index e54649fa48..5ba1395bea 100755 > --- a/configure > +++ b/configure > @@ -3191,7 +3191,7 @@ h264_qsv_decoder_select="h264_mp4toannexb_bsf qsvdec" > h264_qsv_encoder_select="atsc_a53 qsvenc" > h264_rkmpp_decoder_deps="rkmpp" > h264_rkmpp_decoder_select="h264_mp4toannexb_bsf" > -h264_vaapi_encoder_select="cbs_h264 vaapi_encode" > +h264_vaapi_encoder_select="atsc_a53 cbs_h264 vaapi_encode" > h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m" > h264_v4l2m2m_decoder_select="h264_mp4toannexb_bsf" > h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m" > @@ -3208,7 +3208,7 @@ hevc_qsv_encoder_select="hevcparse qsvenc" > hevc_rkmpp_decoder_deps="rkmpp" > hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf" > hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" > -hevc_vaapi_encoder_select="cbs_h265 vaapi_encode" > +hevc_vaapi_encoder_select="atsc_a53 cbs_h265 vaapi_encode" > hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" > hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf" > hevc_v4l2m2m_encoder_deps="v4l2_m2m hevc_v4l2_m2m" > diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c > index b1b503b2a6..9f9d77a0e9 100644 > --- a/libavcodec/vaapi_encode_h264.c > +++ b/libavcodec/vaapi_encode_h264.c > @@ -26,6 +26,7 @@ > #include "libavutil/internal.h" > #include "libavutil/opt.h" > > +#include "atsc_a53.h" > #include "avcodec.h" > #include "cbs.h" > #include "cbs_h264.h" > @@ -40,6 +41,7 @@ enum { > SEI_TIMING = 0x01, > SEI_IDENTIFIER = 0x02, > SEI_RECOVERY_POINT = 0x04, > + SEI_A53_CC = 0x08, > }; > > // Random (version 4) ISO 11578 UUID. > @@ -98,6 +100,8 @@ typedef struct VAAPIEncodeH264Context { > H264RawSEIRecoveryPoint sei_recovery_point; > SEIRawUserDataUnregistered sei_identifier; > char *sei_identifier_string; > + SEIRawUserDataRegistered sei_a53cc; > + void *sei_a53cc_data; > > int aud_needed; > int sei_needed; > @@ -248,6 +252,13 @@ static int > vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, > if (err < 0) > goto fail; > } > + if (priv->sei_needed & SEI_A53_CC) { > + err = ff_cbs_sei_add_message(priv->cbc, au, 1, > + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_ > T35, > + &priv->sei_a53cc, NULL); > + if (err < 0) > + goto fail; > + } > > priv->sei_needed = 0; > > @@ -681,6 +692,22 @@ static int > vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, > priv->sei_needed |= SEI_RECOVERY_POINT; > } > > + if (priv->sei & SEI_A53_CC) { > + int err; > + size_t sei_a53cc_len; > + av_freep(&priv->sei_a53cc_data); > + err = ff_alloc_a53_sei(pic->input_image, 0, &priv->sei_a53cc_data, > &sei_a53cc_len); > + if (err < 0) > + return err; > + if (priv->sei_a53cc_data != NULL) { > + priv->sei_a53cc.itu_t_t35_country_code = 181; > + priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1; > + priv->sei_a53cc.data_length = sei_a53cc_len - 1; > + > + priv->sei_needed |= SEI_A53_CC; > + } > + } > + > vpic->CurrPic = (VAPictureH264) { > .picture_id = pic->recon_surface, > .frame_idx = hpic->frame_num, > @@ -1226,6 +1253,7 @@ static av_cold int > vaapi_encode_h264_close(AVCodecContext *avctx) > ff_cbs_fragment_free(&priv->current_access_unit); > ff_cbs_close(&priv->cbc); > av_freep(&priv->sei_identifier_string); > + av_freep(&priv->sei_a53cc_data); > > return ff_vaapi_encode_close(avctx); > } > @@ -1252,7 +1280,7 @@ static const AVOption vaapi_encode_h264_options[] = { > > { "sei", "Set SEI to include", > OFFSET(sei), AV_OPT_TYPE_FLAGS, > - { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT }, > + { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT | SEI_A53_CC > }, > 0, INT_MAX, FLAGS, "sei" }, > { "identifier", "Include encoder version identifier", > 0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER }, > @@ -1263,6 +1291,9 @@ static const AVOption vaapi_encode_h264_options[] = { > { "recovery_point", "Include recovery points where appropriate", > 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > + { "a53_cc", "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > { "profile", "Set profile (profile_idc and constraint_set*_flag)", > OFFSET(profile), AV_OPT_TYPE_INT, > diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c > index 94b56c6578..f5b85cef6f 100644 > --- a/libavcodec/vaapi_encode_h265.c > +++ b/libavcodec/vaapi_encode_h265.c > @@ -27,6 +27,7 @@ > #include "libavutil/opt.h" > #include "libavutil/mastering_display_metadata.h" > > +#include "atsc_a53.h" > #include "avcodec.h" > #include "cbs.h" > #include "cbs_h265.h" > @@ -40,6 +41,7 @@ > enum { > SEI_MASTERING_DISPLAY = 0x08, > SEI_CONTENT_LIGHT_LEVEL = 0x10, > + SEI_A53_CC = 0x20, > }; > > typedef struct VAAPIEncodeH265Picture { > @@ -84,6 +86,8 @@ typedef struct VAAPIEncodeH265Context { > > SEIRawMasteringDisplayColourVolume sei_mastering_display; > SEIRawContentLightLevelInfo sei_content_light_level; > + SEIRawUserDataRegistered sei_a53cc; > + void *sei_a53cc_data; > > CodedBitstreamContext *cbc; > CodedBitstreamFragment current_access_unit; > @@ -226,6 +230,13 @@ static int > vaapi_encode_h265_write_extra_header(AVCodecContext *avctx, > if (err < 0) > goto fail; > } > + if (priv->sei_needed & SEI_A53_CC) { > + err = ff_cbs_sei_add_message(priv->cbc, au, 1, > + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_ > T35, > + &priv->sei_a53cc, NULL); > + if (err < 0) > + goto fail; > + } > > priv->sei_needed = 0; > > @@ -888,6 +899,22 @@ static int > vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, > } > } > > + if (priv->sei & SEI_A53_CC) { > + int err; > + size_t sei_a53cc_len; > + av_freep(&priv->sei_a53cc_data); > + err = ff_alloc_a53_sei(pic->input_image, 0, &priv->sei_a53cc_data, > &sei_a53cc_len); > + if (err < 0) > + return err; > + if (priv->sei_a53cc_data != NULL) { > + priv->sei_a53cc.itu_t_t35_country_code = 181; > + priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1; > + priv->sei_a53cc.data_length = sei_a53cc_len - 1; > + > + priv->sei_needed |= SEI_A53_CC; > + } > + } > + > vpic->decoded_curr_pic = (VAPictureHEVC) { > .picture_id = pic->recon_surface, > .pic_order_cnt = hpic->pic_order_cnt, > @@ -1355,6 +1382,7 @@ static av_cold int > vaapi_encode_h265_close(AVCodecContext *avctx) > > ff_cbs_fragment_free(&priv->current_access_unit); > ff_cbs_close(&priv->cbc); > + av_freep(&priv->sei_a53cc_data); > > return ff_vaapi_encode_close(avctx); > } > @@ -1413,7 +1441,7 @@ static const AVOption vaapi_encode_h265_options[] = { > > { "sei", "Set SEI to include", > OFFSET(sei), AV_OPT_TYPE_FLAGS, > - { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, > + { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL | SEI_A53_CC > }, > 0, INT_MAX, FLAGS, "sei" }, > { "hdr", > "Include HDR metadata for mastering display colour volume " > @@ -1421,6 +1449,11 @@ static const AVOption vaapi_encode_h265_options[] = { > 0, AV_OPT_TYPE_CONST, > { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > + { "a53_cc", > + "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, > + { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > { "tiles", "Tile columns x rows", > OFFSET(common.tile_cols), AV_OPT_TYPE_IMAGE_SIZE, > > base-commit: 3bcec58535d395945a390bdc7af4048a7abc60eb LGTM, will apply. -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".