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 A126B40C20 for ; Wed, 29 Dec 2021 06:11:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A56768AD39; Wed, 29 Dec 2021 08:11:05 +0200 (EET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0660A68A9D3 for ; Wed, 29 Dec 2021 08:10:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640758263; x=1672294263; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=a68jaulrjhMEYdeFK4nZzoMBO7mlGcuH503MwkIhcPo=; b=RRms+4lzeGdxPdaqzpoI8wCU4nhRcV9FsljRMK6ikJ2RdbwvADOizyFH zMQBE8hhtus42osuAzP2v4GZeN7NK6H49MfgSShrp+6abtGS5DVSBjlKd T/MczyRdjYdPjgxXZZYP/LeCuCzkwZc5IScUqWRDpioIi7IJDPquXdPvz pzNUb273ahK8q65QAjQlW010tjDB2HLvn/rDbHePvxqxsQy5z70r0/BxB blJD/r5VfFGQFdpQGpfDzsAKsqGxf3UxmnuhxyYwmkjAJTO5qfxdCIaPN JO9ttBhti87Nw/BxgW0Utu5rtEmVjPqpPv+jDVqRkXTYp/AfVhV6JTtZ6 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10211"; a="265704533" X-IronPort-AV: E=Sophos;i="5.88,244,1635231600"; d="scan'208";a="265704533" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2021 22:10:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,244,1635231600"; d="scan'208";a="758882854" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by fmsmga006.fm.intel.com with ESMTP; 28 Dec 2021 22:10:55 -0800 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 28 Dec 2021 22:10:55 -0800 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 28 Dec 2021 22:10:54 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 28 Dec 2021 22:10:54 -0800 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.45) 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.2308.20; Tue, 28 Dec 2021 22:10:54 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCILH6CYxwGFWUNpBmHjdnjZpZPrhPEf2Azl2XzZf9bB2ycmQMd/mYpsoibZ4VG1JrUOThr5HUOTMXyl/h3ntmkKz0lQdt6mBhWlCTB8A04FyQC7KAWdJS9D0uLFkTUoNnsFfWIVtDkFwKA4yj2pr28ieXg6iBKEzGEvvSAl7L1MidJ/nX5QaPQFrX8ieRYsdy/bltfsALkFq8gH21dWoBBiWFuBlWIVjsddlFHCvYDO+DS6yJCYLo7dIATQDREbG7ZH0znVwHohRnpPXa457ZVWamdmjL7GrCST1xBzgDikPzO6tljUrzGWH7B3HFKD3LGcvegVeu+TZyv0KEynXg== 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=a68jaulrjhMEYdeFK4nZzoMBO7mlGcuH503MwkIhcPo=; b=F5LqJoiouYPmaHfMfwncST3zER/plVPmRS5is4BcPlmjWyCAqzIX3aVUntAaNrlEfFg91CF5rWks7fjWxcmQXA2fp85dHq8R4s1fh0hPiEHw2nUCNNcJA78MBukDFQVwkcZIi0uvJmUGQaFrH5LVLIcJCviFaoymuQfrhn23A78Eh6/HIQEGfX78vIkzj16e7UVGzlwpQcnw3B4qHFdrp+8WRkcrz0Q4GgmjBN/1KWW/JmgBNVuKM1EcwVASdTHnCFjLSN0QRPi53MblTIcmDWgrXs5EYLmkmqfBPX6a8tl8wsrzuDEtkTnqruWpePRtJ2gXigG5xE2bSzhKpc0aVw== 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 BN6PR11MB1715.namprd11.prod.outlook.com (2603:10b6:404:49::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.21; Wed, 29 Dec 2021 06:10:52 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::bcfc:ceef:cd03:dd16]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::bcfc:ceef:cd03:dd16%3]) with mapi id 15.20.4823.023; Wed, 29 Dec 2021 06:10:52 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 2/5] avcodec/hevcdec: make set_side_data() accessible Thread-Index: AQHX5VIpWWhQ8JM93k+LjYHppSsAOaxJKwMA Date: Wed, 29 Dec 2021 06:10:52 +0000 Message-ID: <241786aa97219943c2679ab7d32ab91fc2866c77.camel@intel.com> References: <62b3a721e463650b46e527abcc9169ec1cc3e9f8.1638210102.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3a12cf29-7485-413e-5146-08d9ca91f7af x-ms-traffictypediagnostic: BN6PR11MB1715:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1332; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: q9MElFtrq6owQpcx8u0RtcPGXZorJX16TZmGw4sqAqMd5+Dw0UXHHiYpzDhC/I9wf4/eVC04lwGbJ0eLqS3khALwRVetZzaD+UO76xoUiT2jPz5mathYwpyEwR2SLudK4TbqokHw00UbPovBWXbtficWckbgyV1/l0kTTVqAzUAozIGkNxFfCp1L4q/EJInxVtU1OZzYz+EM4TNeXivYUp8EzhNClruJaVDMCzssiA7rjV6t4dFnqQ5xsKKJues7UYP0T5w+Td1P6KgSREy2USAwrhb8z6SNC1d7fW524i6pVLFX8DBne8Ke8ot/s+bBlgzj0TqZ+YmbW+Ga8uck9kt5BCl+HanVWcCtPtY1x6tO/3kQ2CbuEnX7UMfVBnTBN7QVSRRrMARrqR4Ji6WAGoKvEqfTQ9yZ3JnE/n6TB3s4YJM07TA7mxKbLVA9e7AROghs8w5BhcWjOdeefXKXS46VXkRCdyKg3qDZBFpPHtp/OWD+ZaQ+vqf+dqvzJzYta2mbzREWgmLxeqlM+27WMLYFSdStFUQxNYf0mZNu8uwvq21/PKY/sG1ZRM4I37mtA6Kim2UhASY/6ixhySx91P4uSWL3vTZWe/5N+qUxCLIuibCCnccDF5ehDUGnbwlRaxT0fwdxYE6vks/nhdpIomWnC12kD9ZIq3Y8dzqnC0FbbjeCWTfg+LHNTYqWbwcEX2X5jAG/lmUzTJ92G7oLzbq4UjwA9wdTGVK89pHJJRM= 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:(366004)(8936002)(26005)(91956017)(6916009)(186003)(4001150100001)(66476007)(66946007)(6512007)(6506007)(8676002)(71200400001)(66446008)(5660300002)(2616005)(30864003)(82960400001)(76116006)(64756008)(66556008)(36756003)(38100700002)(38070700005)(508600001)(6486002)(316002)(83380400001)(2906002)(86362001)(122000001)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?a1cwaWNtOWMrM3lMZDlRWUV1VThQVnZXWFg5ckNORWlFSWt1ZEpOK05IbjNl?= =?utf-8?B?QlZsUWNxQkVsMThveElQYkw5UmUrQ1RGaTBVdy9uWndiT0Jzemg3YTNoalN5?= =?utf-8?B?OHJoZzdPbTlMOHdKZmVoVXhBVTEzYkMyRVFxSVpvRXJ0VlFrcWhvaWF4UWhl?= =?utf-8?B?SndiKzZycFVhM0E3TU82VGQwY1RMdHZwZFdZM2JsQ2ZlaE1yc0xQZlE2R2pz?= =?utf-8?B?Uis4UDh0bU9laGNyeitBOXZQK3d6M1RtcVNpeUs5YjQrLzlCdVZ6NWl4OC85?= =?utf-8?B?VFdrTFgvT1kyY0tBdmZ2cnJNamVUZ0dqTTgvblhxc0NwRWFwcHJEalNKRCtF?= =?utf-8?B?dm91TzVaY1Z0VFRZS0ZXU003ZEFNWE1FeHkwNmNRVWY3L0dkS1lYNGNKbXlE?= =?utf-8?B?Kzk3UUFSN0N2bUNoTWlxL0NNOFllK0xZMWdWR25lSU92cU4xZVhBRjVOWUJw?= =?utf-8?B?WUMvamZMN2loNnBFKzdqVE5rRkszdHI3anFldUN2MmhpSUZkQUhYQUhpMUtP?= =?utf-8?B?WjRMNktIeldQeWd0NjZDWEtMVTBVeVA0SnNWYmR6M29VM2NGVzk3TUE4d2Fa?= =?utf-8?B?c3NSZVY1KzZ5T01MQUlVU3daQ0ZZM3BmVy9hUkdSUGxZQmwzMlM4RkNjeW9j?= =?utf-8?B?OHV6cUsyZndDblIvcEc2cmpNWVc4V25ham5UYVVibzZ5NHVGaUtRaCsxWW9T?= =?utf-8?B?OGhvOEU4NDRpVHNaQVRvM1FsclhWMDFyYUFhNUE2R0o3d3VRc2c5a1hvdTdn?= =?utf-8?B?TUhZWVVqQUtLV201Tm5sS1F6N1pUS3k0bVNGU0xmMXM2cEtmcDVRU0xsK2g0?= =?utf-8?B?d1pVNG9JVU5NWExqUjBOYmFTclh6emRxbElTNGYwMWVCN3gvMkZlSVJXQTNo?= =?utf-8?B?TnNUUXBYNVBXdlh5OTNlQXRkd3NzdXBBWWZiYXY2bW9Ob0sraXU1NTBlSm5D?= =?utf-8?B?MGdXYmVET1pOOHB0TnluamhiYlhCaERRQXZtYmQ4QXI1cWJRMW5oUVhtL1Nw?= =?utf-8?B?K3UrWjJMeHNiQVZXTUtoYjRlVGJ6YU5YZjRDSEhJTGRPQVVsMmowQjl0WmFv?= =?utf-8?B?SHNsRHd6UVJlODV1eXZvLzJVQWxjZzFHTHFmUFloenF6ZjRETWttN202bTNZ?= =?utf-8?B?KzNDeXd0ZTJKMGJyTGlWakJQWVBvaEp6TkcrV1d3N2VSNTEwb3NDNTZ0aG1B?= =?utf-8?B?K0dUbjY5eHRJaUtxSjl4Mk90SkFSRG5CSG0rd0dBa3NyN3Z0bktqbE1UR1hO?= =?utf-8?B?M0dtNFhSMnJZc0R0MFRBVHRvYVJxbG9HV3BCaFVqOEF2aDREVm9yakNhcTFL?= =?utf-8?B?Z2ZCOFFCMHEvUFFMZXRvNFRtUU5ld1JhWmd2cE1FdG9UWU9ENHF4aTlaT3lo?= =?utf-8?B?MkJPb2FVTTZ3Snp0Z01IOThxRkcwWXRoRWEzTlpiVGV1WDFLYzV4Sy9JWUc0?= =?utf-8?B?NmdObFBOWS9HYWhxOWI5NVVLd1g5alhyeTJweVVIQTNHeGs3MHAwa2RKQmM1?= =?utf-8?B?eHNUMVhXZkFQVThMZ3Rjb2pGVnlBbjdsc0F6bWF2aFdYU2FCc25IOTR4OXpX?= =?utf-8?B?RFp1Y2QxQ1JmTlRVdHZWUFk4RktlSFROMHg0N2I5SHQwUkRQaVh0WHJSSFcv?= =?utf-8?B?YStCd013cjM1aUlDNzJwN1dzME1NdmhKdTh2R1FVUzk2am84THNiajBwTmRM?= =?utf-8?B?Mmo1c1lKRkFEejA2SHJ3cjBhSlN6UzNnRmpTM1NuTk9IYzhBU09pQWwrMm9x?= =?utf-8?B?RG5RNmN3TVNXME83M3hQUkhHTlhsNGpKVnB0dmQrWEw1em15bXRSbTJtcFk1?= =?utf-8?B?ZVFubnhkUU5ReC9HbUczazl5T0U0aUNCdmV4MWpkREpTc1RrZDJhOGJ2L2h3?= =?utf-8?B?L3pvRWYxSW9NMERXanZSd0txQmttZVc0emJvbVlyK1dSdnlvcE5KR0F3MWxs?= =?utf-8?B?bVBQMi8wb1JvUW9JREcvVklOUEdDOWVXVTIyOTcyaldQMXl0L2ZLZHlPdlBv?= =?utf-8?B?UXFuMkp4ZzZJaEMvNlREOTdrWnNNMzJ6QncvVXFnYUZWTlhpK3lXWWMydkk0?= =?utf-8?B?N0pqc2Z2aTh3TFlkUHFETFdHUFZTSi93ZTh3MzYrREdwU3pmeUlFUWFQMTZh?= =?utf-8?B?dXZhckVTclpLWWY3Ri9IS3l1L2dSZUtNOWZFdHVsV2s2MjNMcmxqTWtDYTBU?= =?utf-8?Q?MaBgNSwoq7D3eLXu0KdcIflHrTm/e8sjsBSXlTmf6aiK?= Content-ID: <2FA08D0E1BEC5B4AB9B8C57ABE0A8437@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: 3a12cf29-7485-413e-5146-08d9ca91f7af X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Dec 2021 06:10:52.2448 (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: ycZ2h13dEsFobY4JqHPG+evWEUkyVOBbo1h+tWHr4MoAshWWoNg4LgINusPFaw8j5w4QsVmt5pnEAlSDHekZlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1715 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 2/5] 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: On Mon, 2021-11-29 at 18:51 +0000, Soft Works wrote: > Signed-off-by: softworkz > --- > libavcodec/hevcdec.c | 112 +++++++++++++++++++++---------------------- > libavcodec/hevcdec.h | 2 + > 2 files changed, 57 insertions(+), 57 deletions(-) > > diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c > index 46d9edf8eb..53593d6186 100644 > --- a/libavcodec/hevcdec.c > +++ b/libavcodec/hevcdec.c > @@ -2720,22 +2720,20 @@ error: > return res; > } > > -static int set_side_data(HEVCContext *s) > +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, > AVFrame *out) It would be better to use ff_hevc_ as prefix because this function is for hevconly. Thanks Haihao > { > - AVFrame *out = s->ref->frame; > - > - 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; > @@ -2748,21 +2746,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); > @@ -2771,17 +2769,17 @@ static int set_side_data(HEVCContext *s) > > 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 && > IS_IRAP(s) && s->no_rasl_output_flag) { > - s->sei.mastering_display.present--; > + sei->mastering_display.present--; > } > - if (s->sei.mastering_display.present) { > + if (sei->mastering_display.present) { > // HEVC uses a g,b,r ordering, which we convert to a more natural > r,g,b > const int mapping[3] = {2, 0, 1}; > const int chroma_den = 50000; > @@ -2794,25 +2792,25 @@ static int set_side_data(HEVCContext *s) > > for (i = 0; i < 3; i++) { > const int j = mapping[i]; > - metadata->display_primaries[i][0].num = s- > >sei.mastering_display.display_primaries[j][0]; > + metadata->display_primaries[i][0].num = sei- > >mastering_display.display_primaries[j][0]; > metadata->display_primaries[i][0].den = chroma_den; > - metadata->display_primaries[i][1].num = s- > >sei.mastering_display.display_primaries[j][1]; > + metadata->display_primaries[i][1].num = sei- > >mastering_display.display_primaries[j][1]; > metadata->display_primaries[i][1].den = chroma_den; > } > - metadata->white_point[0].num = s- > >sei.mastering_display.white_point[0]; > + metadata->white_point[0].num = sei->mastering_display.white_point[0]; > metadata->white_point[0].den = chroma_den; > - metadata->white_point[1].num = s- > >sei.mastering_display.white_point[1]; > + metadata->white_point[1].num = sei->mastering_display.white_point[1]; > metadata->white_point[1].den = chroma_den; > > - metadata->max_luminance.num = s->sei.mastering_display.max_luminance; > + metadata->max_luminance.num = sei->mastering_display.max_luminance; > metadata->max_luminance.den = luma_den; > - metadata->min_luminance.num = s->sei.mastering_display.min_luminance; > + metadata->min_luminance.num = sei->mastering_display.min_luminance; > metadata->min_luminance.den = luma_den; > metadata->has_luminance = 1; > metadata->has_primaries = 1; > > - av_log(s->avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); > - av_log(s->avctx, AV_LOG_DEBUG, > + av_log(logctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); > + av_log(logctx, AV_LOG_DEBUG, > "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, > %5.4f)\n", > av_q2d(metadata->display_primaries[0][0]), > av_q2d(metadata->display_primaries[0][1]), > @@ -2821,31 +2819,31 @@ static int set_side_data(HEVCContext *s) > av_q2d(metadata->display_primaries[2][0]), > av_q2d(metadata->display_primaries[2][1]), > av_q2d(metadata->white_point[0]), av_q2d(metadata- > >white_point[1])); > - av_log(s->avctx, AV_LOG_DEBUG, > + av_log(logctx, AV_LOG_DEBUG, > "min_luminance=%f, max_luminance=%f\n", > av_q2d(metadata->min_luminance), av_q2d(metadata- > >max_luminance)); > } > // 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.content_light.present > 0 && > + if (s && sei->content_light.present > 0 && > IS_IRAP(s) && s->no_rasl_output_flag) { > - s->sei.content_light.present--; > + sei->content_light.present--; > } > - if (s->sei.content_light.present) { > + if (sei->content_light.present) { > AVContentLightMetadata *metadata = > av_content_light_metadata_create_side_data(out); > if (!metadata) > return AVERROR(ENOMEM); > - metadata->MaxCLL = s->sei.content_light.max_content_light_level; > - metadata->MaxFALL = s->sei.content_light.max_pic_average_light_level; > + metadata->MaxCLL = sei->content_light.max_content_light_level; > + metadata->MaxFALL = sei->content_light.max_pic_average_light_level; > > - av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); > - av_log(s->avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", > + av_log(logctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); > + av_log(logctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", > metadata->MaxCLL, metadata->MaxFALL); > } > > - if (s->sei.a53_caption.buf_ref) { > - HEVCSEIA53Caption *a53 = &s->sei.a53_caption; > + if (sei->a53_caption.buf_ref) { > + HEVCSEIA53Caption *a53 = &sei->a53_caption; > > AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, > AV_FRAME_DATA_A53_CC, a53->buf_ref); > if (!sd) > @@ -2853,8 +2851,8 @@ static int set_side_data(HEVCContext *s) > a53->buf_ref = NULL; > } > > - for (int i = 0; i < s->sei.unregistered.nb_buf_ref; i++) { > - HEVCSEIUnregistered *unreg = &s->sei.unregistered; > + for (int i = 0; i < sei->unregistered.nb_buf_ref; i++) { > + HEVCSEIUnregistered *unreg = &sei->unregistered; > > if (unreg->buf_ref[i]) { > AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, > @@ -2865,9 +2863,9 @@ static int set_side_data(HEVCContext *s) > unreg->buf_ref[i] = NULL; > } > } > - s->sei.unregistered.nb_buf_ref = 0; > + sei->unregistered.nb_buf_ref = 0; > > - if (s->sei.timecode.present) { > + if (s && sei->timecode.present) { > uint32_t *tc_sd; > char tcbuf[AV_TIMECODE_STR_SIZE]; > AVFrameSideData *tcside = av_frame_new_side_data(out, > AV_FRAME_DATA_S12M_TIMECODE, > @@ -2876,25 +2874,25 @@ static int set_side_data(HEVCContext *s) > return AVERROR(ENOMEM); > > tc_sd = (uint32_t*)tcside->data; > - tc_sd[0] = s->sei.timecode.num_clock_ts; > + tc_sd[0] = sei->timecode.num_clock_ts; > > for (int i = 0; i < tc_sd[0]; i++) { > - int drop = s->sei.timecode.cnt_dropped_flag[i]; > - int hh = s->sei.timecode.hours_value[i]; > - int mm = s->sei.timecode.minutes_value[i]; > - int ss = s->sei.timecode.seconds_value[i]; > - int ff = s->sei.timecode.n_frames[i]; > + int drop = sei->timecode.cnt_dropped_flag[i]; > + int hh = sei->timecode.hours_value[i]; > + int mm = sei->timecode.minutes_value[i]; > + int ss = sei->timecode.seconds_value[i]; > + int ff = sei->timecode.n_frames[i]; > > tc_sd[i + 1] = av_timecode_get_smpte(s->avctx->framerate, drop, > hh, mm, ss, ff); > av_timecode_make_smpte_tc_string2(tcbuf, s->avctx->framerate, > tc_sd[i + 1], 0, 0); > av_dict_set(&out->metadata, "timecode", tcbuf, 0); > } > > - s->sei.timecode.num_clock_ts = 0; > + sei->timecode.num_clock_ts = 0; > } > > - if (s->sei.film_grain_characteristics.present) { > - HEVCSEIFilmGrainCharacteristics *fgc = &s- > >sei.film_grain_characteristics; > + if (s && sei->film_grain_characteristics.present) { > + HEVCSEIFilmGrainCharacteristics *fgc = &sei- > >film_grain_characteristics; > AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); > if (!fgp) > return AVERROR(ENOMEM); > @@ -2948,8 +2946,8 @@ static int set_side_data(HEVCContext *s) > fgc->present = fgc->persistence_flag; > } > > - if (s->sei.dynamic_hdr_plus.info) { > - AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_plus.info); > + if (sei->dynamic_hdr_plus.info) { > + AVBufferRef *info_ref = av_buffer_ref(sei->dynamic_hdr_plus.info); > if (!info_ref) > return AVERROR(ENOMEM); > > @@ -2959,7 +2957,7 @@ static int set_side_data(HEVCContext *s) > } > } > > - if (s->rpu_buf) { > + if (s && s->rpu_buf) { > AVFrameSideData *rpu = av_frame_new_side_data_from_buf(out, > AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf); > if (!rpu) > return AVERROR(ENOMEM); > @@ -3015,7 +3013,7 @@ static int hevc_frame_start(HEVCContext *s) > goto fail; > } > > - ret = set_side_data(s); > + ret = ff_set_side_data(s->avctx, &s->sei, s, s->ref->frame); > if (ret < 0) > goto fail; > > diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h > index 870ff178d4..b0d2f2e169 100644 > --- a/libavcodec/hevcdec.h > +++ b/libavcodec/hevcdec.h > @@ -691,6 +691,8 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, > int y0, > > void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int > log2_cb_size); > > +int ff_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, > AVFrame *out); > + > extern const uint8_t ff_hevc_qpel_extra_before[4]; > extern const uint8_t ff_hevc_qpel_extra_after[4]; > extern const uint8_t ff_hevc_qpel_extra[4]; _______________________________________________ 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".