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 2B6E6407D7 for ; Tue, 31 May 2022 16:03:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 070C468B6D3; Tue, 31 May 2022 19:03:18 +0300 (EEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2023.outbound.protection.outlook.com [40.92.21.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A94B68B6C2 for ; Tue, 31 May 2022 19:03:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1gFN0QMdBaJZfChg2UvYx/qSEA77FAjpF/tn01rcVrIaB03MJkSlet1jav6ZXrH0dyEtZw7elM8kD3aIdrJfnYleSwB+d/7hhgk4dnlgJNFbY3+2hoKYFa4nwTm/WnmLxz/sMltxV68GrycWVBURFDGJi8n/Imkiud59AnFuWw8l/MenocyVRDEjtubnUlPEAAbFdLuCG6jCNG9TzHYDFR1uKFOxXH7+CV5BndBbBxSWdYDINu73Lln28fRUMziOxvqv+yQgiT4C+zZa80ZbMYez3NQuCIoa+YJ5KWEUcSYcnviFy8MsFD/PgGRYRX1RxvtqrtHroqshL4cKL7EmQ== 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=dd1O6adfWMhtt8PIPOuYm5Zf0FpjuGoFnln94F5ZG7Y=; b=Bzv9w+Kp5BwFL+VbP5rCr+yBGJzv3AXUcR+Mov9h2jVDEi8jFRLQ1MrZZU74gePm52ep9Mnr9xpuhxyK/Duf+zcmCA5z+1fN99V4TBlzdbsxo5UvKsNd8/EeYo40kZvEJWzNDydSFktR9G0V2p0ktThRO943Hilm3jmeDmuEbH/KEqyWfDF/gTz9OTwHq8iuK2sN9+dC59ZhzbxRpuec7/q6XU56tMFAkgG4+E3sQe+5gfBw1bRrSJ+3Y0NMef4uCtLvaQ7XIzpUgpv8zTGHjRWJlAVuv3M10U6Lxbp1jHhw5UhbW4tlYj7RCGNZiQZ3MK6+RnwymMsxCBoRuamphA== 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=dd1O6adfWMhtt8PIPOuYm5Zf0FpjuGoFnln94F5ZG7Y=; b=OxI0FCp6FrBeybUqRue5tghrURSdEhAKw4ClSW2V9nroCsYbumxLEuCI5+7IatgooZaWkIsk9euhd2azWsqlLyeksgXxzS0XIYOSlWjyaJ+rfPmBi9VOCUSb61trIH193ItRbrmS+ofyvGL63RPbsiHF2rXbmFenA3nTWk35q2DG2AugSIthXApA58Honsxo+9QkAv8aqrGQeAAX6bNTJMrZQDHIrWjRUJCufrdHrTQXB55sycz2+Hz0clo5bzxh1Jfs5rFYE577LQP8CNaxn71n/EfsM6CrC7/kNHpgjU8mNj/5SJz+scSfyx0UOtgnr8G4gFJZPexWllZVoAhY/Q== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by CH0P223MB0025.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:e9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Tue, 31 May 2022 16:03:09 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::f144:21f9:cdb1:5c8a%7]) with mapi id 15.20.5293.019; Tue, 31 May 2022 16:03:09 +0000 From: Soft Works To: "Xiang, Haihao" , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 4/6] avcodec/hevcdec: make set_side_data() accessible Thread-Index: AQHYcNfZBb3Dc2zMwU2N8om091dd7a04wqEAgABoTiA= Date: Tue, 31 May 2022 16:03:09 +0000 Message-ID: References: <485d7f913d6e2d600ccb9dc0f81e6eaf498804d4.1653552529.git.ffmpegagent@gmail.com> <65fd87e90d9ad7df5fe4fc767fc2ac2dec38defd.camel@intel.com> In-Reply-To: <65fd87e90d9ad7df5fe4fc767fc2ac2dec38defd.camel@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [8LAriX9tO2TeGotwJgW5WpVhRg4x2BNQ] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7032b12a-3f67-4221-6786-08da431f0e96 x-ms-traffictypediagnostic: CH0P223MB0025:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XhGBLN++2Eor+IGCFYG4aG9sZYomrUENlbXm/09AqDUkqCRQ027JEv/gHmdWwJpx3UzD+L1ZYjD3kLeJJWwMoNZiWGHK7/cmwT/9cHDWp96LQEJJfIpkm/qGJdBcMFttjaXXCWCJujZag6UGV+J+M7gXCCu5qaeslBzNgL2Fap/FhCiKAJyaRDbBZM+Wz0rIP6Ug7KadRJ8+Awc2b0rglZbGkvJSIX3+PghLjiVL/myDvIPyGNhpfm1Qtl4V921vfxbSNSWCbF2xPZ3LlzP5M5BL6PL7maCDe+gU95+wxDLBnMQihGFjRfZVFl7U4vO+6waoH9Juxm1+XI9E4rr1JTvZ8qKbp+tpDz4oryqCJSbp/nDiIUDXaNujHW/q+ouOj6y3HuSevz1UlBYuxc0F04vbwcfzv5v/Ogbdw7fVr9SFEJIkivW/McGkpZ7liZ6JKYctoRSI8K6bXlA1feETP86yjpD9dMymxfRnC1z6DTLBDKOSXLNNREk+OyV4A1E488lrXb9MyXZ+dCY9yQM++OMsqe44d1Tlkm1153a1b9it9Y6mgE90duVh1ERdn24O/NthLQGnJimRH+WtcN8e0Q== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?d2N5MWxpakJObDcya1pLdzgyeE82d0ZCcHRLR3VNUjg3VE9NMGZSZEF4dW5t?= =?utf-8?B?SU5EbENxT0YzSkN3NElUQThHdVRXcm81M05zaW9oSlhiTEc3NkN6VUVyTmsz?= =?utf-8?B?aUZKZ0xjcEpRRnBLSHNaSmVsZFhCMXR0V0Z1Lzl3S1ZSTXdHMjNzVWlkLzk4?= =?utf-8?B?SUxLMTVrZUR1YmErVVZNdDFBc0svdXRzeTVQYVFYbHpzanVYTWRSR2Z3YmRa?= =?utf-8?B?ZEdZYlUxSS9oNGlkOUJHQVlmcW5tdlhYaGVQcWtlZ0h0T0Q1NWFUaEFESDJW?= =?utf-8?B?RlRhNENad0dueGNCcVhRYTZWVGlOblh3OTQwSlNsNDFDM0N1ZGxCNE1GWHJK?= =?utf-8?B?d3BIdjBHNE1qcjNHRjhxYkhhVVZnNTJGdWFqQ0NmVzFXaE1weElya1M1U05k?= =?utf-8?B?cTJBNHBrdTZ1UUhBQmJiNnh2cDF5d3ppZkVDdEZqUExWRmdCRk5PaVZxNzdQ?= =?utf-8?B?NWxKZTRGYUUwd0RqVG50VGRrL0RlQnpOd29sWkMwd3lrL2YvempaR1JTalpL?= =?utf-8?B?Tm9kUzdGczY2MkZJa1diaStBelNWYVpidHdkaS9tVVpHOUs3aG9lR1h1OG9X?= =?utf-8?B?alJpTFNWZzdkUSsxTytOOTg3K3NDcU9OcFF5SWZpcFV2cHRVSWl4cUJFZXdu?= =?utf-8?B?dWU5SXFzbmdTWjA4MG45M2V6Yjk5MHUrVE8rbS9jSkJ6cEMxRjNmMVJ6TTVZ?= =?utf-8?B?N09TMm9KNjlObkZJMXpvTkZnL1dscVNjM0tHQkh5WTRiMU5SZVUwUURxeVFN?= =?utf-8?B?RHcrRHlLZEFibGNkTXU1SHc4YmlKSnlZbElZTmd6aUtETzM4bS9oVUU5TE9H?= =?utf-8?B?djE2Q3RLQ1R0RjNrbVduTHhHbFROQXZZOVgvM2RJL3hJOEJ2aVZpNDMvNUZO?= =?utf-8?B?MFN3RmpKZlBadW5SY2IrbTVIWHdvVUxsY0dOWEthS2dzRUFKVnR4RUd5cnlt?= =?utf-8?B?cHo1NmRpc3llTEQwYm13aHNyTFkwc0M4R1I3RWRscGs3YnBCOEpMam5PNEJQ?= =?utf-8?B?RHdleDNwblFKUmJKMHplNS9xWjREUExDYUd0cWJ5NUJzT1JhK2FYS1RMY2xK?= =?utf-8?B?N2FhMmozSktVekN4NldBOEZsS0lhK0pKYXBBWlFXZzhPNWJlQ2hIZHo2Z2Ny?= =?utf-8?B?UWpXT0ZWdTl2aFR4YmR5T3FMdVZIQ2pCUFEzaHRMTkJVdkVXRTN3TjEzUThM?= =?utf-8?B?dkVhaDFjSmEyTXJ2YnQzc3ZDRWVkVktQREZWZVNONTNMRHNzZjhmN3lXRkd6?= =?utf-8?B?YjY5VFhYWFl5MjBHRHlScmxrUUpjSXh3aGtHb1pmU2xhUnRuSXVRL0NjRTg4?= =?utf-8?B?R0JnYjRIODB6NjFTRmFSZkQrQ29hclNlQTVmbHo5Z254TmU3b2hKNytmUUVr?= =?utf-8?B?NDNGZEM0WmZRZ1BQTVBHYzFCRXRDOGtDMlowb0E4ejZuOHVwdm9GTDI4TkdZ?= =?utf-8?B?ZFh2b2NFTUdKTUNpRmxLVklsc2tCTHVqZ3dDcUVJSmcyYUJZMzltRUNxUkUx?= =?utf-8?B?V1FSL0lzdEM1SktaQ0JrcEtIdGVaaitTOXFuMVVSbFNtK3R0RFRMaStOdHo1?= =?utf-8?B?LytWVUl5TWxZTnBtTkNMNWtkWVhVR2Y3Mm5YLzVxRnd3YU5IS3RlSUNERzA1?= =?utf-8?B?Um5pLzRxZjRXc2l1anhkbUFIbVFnbUIyTjFyYy9oSGFiSEtIRmV2UDIrckg3?= =?utf-8?B?T2VkakUwZ2VsVm1JN3IzR2pmOVUxWUMvNGk1aG5CSlVXdEtkaEo2ZXh0V2Ix?= =?utf-8?B?NGdDTHA0b0RaZVdpRUNHTnRGOFZhalZRSTc5c0JwbHBnNDAxd2dVWjJ6VG11?= =?utf-8?B?anVFc3ZYblVQajdFL1ZuWE9YNTRLVGNFTDV4QWllaWozVm5NY1hDQWNoVWht?= =?utf-8?B?QXBqajhreG9KLzhjTHJPL3RZaWVSRmp4SGl2N3lqTVpESDgrWVdGaXNRby85?= =?utf-8?Q?gqvho1KhHhk=3D?= 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: 7032b12a-3f67-4221-6786-08da431f0e96 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2022 16:03:09.3975 (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: CH0P223MB0025 Subject: Re: [FFmpeg-devel] [PATCH 4/6] avcodec/hevcdec: make set_side_data() accessible 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: Xiang, Haihao > Sent: Tuesday, May 31, 2022 11:38 AM > To: ffmpeg-devel@ffmpeg.org > Cc: softworkz@hotmail.com > Subject: Re: [FFmpeg-devel] [PATCH 4/6] avcodec/hevcdec: make > set_side_data() accessible > > On Thu, 2022-05-26 at 08:08 +0000, softworkz wrote: > > From: softworkz > > > > Signed-off-by: softworkz > > --- > > libavcodec/hevcdec.c | 117 +++++++++++++++++++++------------------ > ---- > > libavcodec/hevcdec.h | 2 + > > 2 files changed, 60 insertions(+), 59 deletions(-) > > > > diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c > > index f782ea6394..ff22081b46 100644 > > --- a/libavcodec/hevcdec.c > > +++ b/libavcodec/hevcdec.c > > @@ -2726,23 +2726,22 @@ error: > > return res; > > } > > > > -static int set_side_data(HEVCContext *s) > > +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, > HEVCContext *s, > > AVFrame *out) > > { > > - AVFrame *out = s->ref->frame; > > - int ret; > > + int ret = 0; > > > > - if (s->sei.frame_packing.present && > > - s->sei.frame_packing.arrangement_type >= 3 && > > - s->sei.frame_packing.arrangement_type <= 5 && > > - s->sei.frame_packing.content_interpretation_type > 0 && > > - s->sei.frame_packing.content_interpretation_type < 3) { > > + if (sei->frame_packing.present && > > + sei->frame_packing.arrangement_type >= 3 && > > + sei->frame_packing.arrangement_type <= 5 && > > + sei->frame_packing.content_interpretation_type > 0 && > > + sei->frame_packing.content_interpretation_type < 3) { > > AVStereo3D *stereo = av_stereo3d_create_side_data(out); > > if (!stereo) > > return AVERROR(ENOMEM); > > > > - switch (s->sei.frame_packing.arrangement_type) { > > + switch (sei->frame_packing.arrangement_type) { > > case 3: > > - if (s->sei.frame_packing.quincunx_subsampling) > > + if (sei->frame_packing.quincunx_subsampling) > > stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; > > else > > stereo->type = AV_STEREO3D_SIDEBYSIDE; > > @@ -2755,21 +2754,21 @@ static int set_side_data(HEVCContext *s) > > break; > > } > > > > - if (s->sei.frame_packing.content_interpretation_type == 2) > > + if (sei->frame_packing.content_interpretation_type == 2) > > stereo->flags = AV_STEREO3D_FLAG_INVERT; > > > > - if (s->sei.frame_packing.arrangement_type == 5) { > > - if (s->sei.frame_packing.current_frame_is_frame0_flag) > > + if (sei->frame_packing.arrangement_type == 5) { > > + if (sei->frame_packing.current_frame_is_frame0_flag) > > stereo->view = AV_STEREO3D_VIEW_LEFT; > > else > > stereo->view = AV_STEREO3D_VIEW_RIGHT; > > } > > } > > > > - if (s->sei.display_orientation.present && > > - (s->sei.display_orientation.anticlockwise_rotation || > > - s->sei.display_orientation.hflip || s- > > >sei.display_orientation.vflip)) { > > - double angle = s- > >sei.display_orientation.anticlockwise_rotation * > > 360 / (double) (1 << 16); > > + if (sei->display_orientation.present && > > + (sei->display_orientation.anticlockwise_rotation || > > + sei->display_orientation.hflip || sei- > >display_orientation.vflip)) { > > + double angle = sei- > >display_orientation.anticlockwise_rotation * 360 > > / (double) (1 << 16); > > AVFrameSideData *rotation = av_frame_new_side_data(out, > > > AV_FRAME_DATA_DISP > > LAYMATRIX, > > > sizeof(int32_t) * > > 9); > > @@ -2788,17 +2787,17 @@ static int set_side_data(HEVCContext *s) > > * (1 - 2 * !!s- > >sei.display_orientation.vflip); > > av_display_rotation_set((int32_t *)rotation->data, angle); > > av_display_matrix_flip((int32_t *)rotation->data, > > - s->sei.display_orientation.hflip, > > - s->sei.display_orientation.vflip); > > + sei->display_orientation.hflip, > > + sei->display_orientation.vflip); > > } > > > > // Decrement the mastering display flag when IRAP frame has > > no_rasl_output_flag=1 > > // so the side data persists for the entire coded video > sequence. > > - if (s->sei.mastering_display.present > 0 && > > + if (s && sei->mastering_display.present > 0 && > > So sei must be non-NULL but s may be NULL in the new function, right > ? Right. > The > caller should ensure s is non-NULL for the original function. It > would be better > to have some comment if s may be NULL now. Ok, I will add that comment. In a future update, I would like to further extend this to allow parsing of other SEI which currently still requires a non-null HEVCContext (e.g. DOVI parsing), but I figured that this would go too far for doing this as part of this patchset and I'm not sure about the best way to do that, means either: - Mocking an HEVCContext or - Changing the individual functions to not require an HEVCContext So, for now, I'll add the comment. > > -static int set_side_data(HEVCContext *s) > > +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, > HEVCContext *s, > > How about to use ff_hevc as prefix ? This function is used for hevc > only Yes makes sense, will change. Thanks for reviewing, softworkz _______________________________________________ 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".