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 0845645C52 for ; Thu, 30 Mar 2023 00:42:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 036BF68C334; Thu, 30 Mar 2023 03:42:42 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2051.outbound.protection.outlook.com [40.92.59.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21C5168C32B for ; Thu, 30 Mar 2023 03:42:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oLgHw+GRbRQskbqQ0YqDzOF1B5j3/k3Y/iyIFQZrS0gmGtHF9dqs7Xpq9BqtEuGFjHSXJ6MkgVC8YbpJ1MyVRkFDvZ8IoNH+WXPNWzuFobksyRjLuyrNHeHBfx0pG0Cg7lEYMIGx5BujMezIX2XL8cfHVpq27wih63ouW9Kqga3O7r9FGFL8B3OeQpiKZi6893T8E50sWNSkQSSFiJSDSKX/lQ+OcHvbLC2TKLgpcj7D6nf4pUZ11xUDjupbUxPqDtVzNHikkfGATRP8xOHpcdlKTxKJYcmselUgCpp6yV/eoTcsmtxjxh9SHVdity1p3IUlRC/KQHNCQ5UCegpX2g== 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=M/OSnFA7AgUuB6tyBXytzvwq1UgXtj8n3LWhggMyhP8=; b=AS5Q/Xrd8WK7hcQ4vgi24PwxFN6Jn7irlUKJN5xDVcEQ+o+J0rIcZNJr/WuM5TxPHUpQpe9KcXJLvTTesmdDG1OTSVYL/wn0zCRWGsIQjGZy6Gx5+JiW+37GbySWXtAjVwWd7+QiiYCOzn8pX7c05HYtG4K3pIi13inU3FX4s4y/RnWbxXD/cqfMWbEzkrfb5Mi3q5JI+0ER9kg+xjQi2j4R5OYXmQUkB5HTYdpUBlVhvybWiyU1+mn1Nlaya7ACqVb3AITC1MLC4xyXJGOJiVqQ9cKrDXlTMq5+Zya1mF+DaxrSeDzJcEeqW/Ni/m/Sq60nOE8D/y/tEOCN2Vrw6w== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M/OSnFA7AgUuB6tyBXytzvwq1UgXtj8n3LWhggMyhP8=; b=ppY1dWTcoMHmqGzWZrQIJMWVAi0E4cjLMeGVItR64UCCzi/tku8TWgOXYm20bqM9ZDmU29bYxEcV/uLzI17rZX3A3T5J/FDPVL0WYfGJZKQHDy6KXR4fhgplx7coJTa5ViEVZtEHC+iqO+BCG7Wu97tscUGtqxARWLndkPx1qoEcBcaJOtguqQHcf7nfwbjW9niByY6YhZ6mzDLyelO1e/WaLhv7zhtdStFhRTWp7ivNZZxWmk3lu75FoRWg/RYAy7gh8O5OEb8fc43p7BMWZiclCSdnUuBMZRB5xNDGpcNjDqnxA8DlZ2+ewCT88PB6HUjQjse9TmdF+yuimotcfA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0015.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.20; Thu, 30 Mar 2023 00:42:32 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e%7]) with mapi id 15.20.6254.016; Thu, 30 Mar 2023 00:42:32 +0000 Message-ID: Date: Thu, 30 Mar 2023 02:43:10 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> <20230324155213.3493-3-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230324155213.3493-3-jamrial@gmail.com> X-TMN: [cxLHpAlnEBbAdoBU3oxFDDWe1NZ3EGdil/Ia4krLg7k=] X-ClientProxiedBy: AM0PR02CA0113.eurprd02.prod.outlook.com (2603:10a6:20b:28c::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0015:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ee2b43c-a646-4294-34b0-08db30b7a5e5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wuy8/e8zNO1vt0qW7XQrPsB/mvdXwqf8zdUM9ROvNGCtAFtDlQeyFsnntrnn8+THKvPjz9WNKBMiIljis2oSA8ohyEJsmY0+SWzD/mb8dap60NUI7jzwVROtLhXD3C977UZLGT5Ai787CymPtG6m7tYWGg/H2agBuxbVqyLKNsjXusLu+jp1SJj/yqb6kVaEj7Q8EtWfjLI32XyXGyvL6E8quQjR5ZeKudyRdmyxib1GE9f0dhEZGS6OxeN1MzI9Ty6mLKK7YAxjtsRDzoZoMHmXUrXwPc2xZDGTwVj04sBlrCvD8ChzXWmoLgy2uFcsCj4XulaSYDk0N1dcv3SRtUdOfZsELThrrqpuuEs6lp90OgDikodPx/+hdkGIVb5AXCbumRhYKLcHVXarrEEzsN79Ohd9N4tMH6PhE91ANDpOlJ6scDmDWJaJQjar8DkGcSpo2NDbKARj1deI31Y/rw5z3w+RwMcWmnRlZJ0WwGpAkxlPp0A5W4U3ThcWnXGHSVYrnvGybfXZMIk8DAujxbgaDJoRtWlNif0lCbcgDy/CsIA/5i+KrwkesNkqO+o54hyiaOfYfo3BLo3qb+aW1KIibb8OZmXJrp/bDyFiu6fLW0U8QjcQsR885/vGB5lc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RmxiY0hkcVlDVk11d2pjbjdWS3F3MnZoMW9SaVBoUG8ydVJuTWFGdFdJU2lU?= =?utf-8?B?ZnFsdWJIUEFTZkpJNkcrR3gzZ0NqV3V3aVFoa3V0a2NHT1pxMEZndm04ajVn?= =?utf-8?B?SnR4RW5GSTB1UTV3bDVuVFJWNHRUY0ZOYTY2YU5Tb1hHRXZsSnpVT2I4cjRT?= =?utf-8?B?UFUrempFM0FmWWEvdnkxZ0V3Qno4Z01KYUYwWnFEWWhvenpVZjVJZktLblMx?= =?utf-8?B?dW9CNmZmOUY2QzBTVTdyck1tZlhnSzJYRUN2SGEzV0VqMVVFTDk0ZjhKR0Jp?= =?utf-8?B?UHBiTWdlOHJCT3pUL1h6VElkSElnNHhIMDZvU29aa0VHT3hoajN3dFRJVWtl?= =?utf-8?B?cUlXOTFqcTdYMXdLb1JIWlhxSTE5di9LZU9JYVFrdFlVdGhuNDFtRHlxaVB6?= =?utf-8?B?cVJ1MWcxdkZYOHVMdmZzd3NLNFlPQU4rUk55MjFsY21JaWhpeXBjKzVDaXJw?= =?utf-8?B?Y3duZEwramg5YnhsZUFHOW1sRlZLS1ZCd1BBT0V6Y1FTdU1xTzhpcCt3YVFn?= =?utf-8?B?cUN0OTJjekg3a2VqaW5aOTJLRm9vOEJmNVZFVktLYmtGUVQ4SWhOVkpxWERp?= =?utf-8?B?UkhVNXNmTlFZcTZMN3dRRXJmeFp1NDB4MlYrMG9lTG14QmJhMmJrNDhrWTZX?= =?utf-8?B?WGFGZXRhQTd6U0drTE1TUTkrcjB5NGlKS0xMa0ZQTjB3UHhNZXBjZTdSWnlp?= =?utf-8?B?d1MwSi93Qm42c1M0Y1FhTmhlS3owc0NXQ29kZzV2djZXWFJZa2ZzYW9wY3lT?= =?utf-8?B?TWhCYTJoSEFlUG9EZFJKK21UWDlJaTZ5bTE2MG5CbE5NT3M3dm02cUJEaEEw?= =?utf-8?B?cmI3NERYSjJwQTJDWm94YXR4TVdpcWVSeU1VWDFRY2t3emMvbUdyblhyOVN5?= =?utf-8?B?SGNWcE1EbzNzVUFKUnlweGlSQ0xYVXBVR1Q4ekRvTDhaUnBvaTBQL05Sd0JY?= =?utf-8?B?elI0cVZOK21CTVB6MnJkRklYdVJGN3FJekpUWDRRMzJkem5DU1Z3N0lyblpq?= =?utf-8?B?UzJRR3RsbFRaZXZ2SU9uRUlBUWhWUW12WHorVmdWeUdlbGdvNnd3WWdFY2tV?= =?utf-8?B?WTVhL3RJRTcwRFBMVG85bG9EekJrMFd5TEV6dWcvSDZGclM4eDlhbU9TeVRy?= =?utf-8?B?VHQvbGR1TEwxUzNpcVlucStVM08yMjNDSVdoN3J3Vk1QTmZyaE9wTHZ5QUVM?= =?utf-8?B?VGsyK05NMXZwdU51Q3RuWGZVb3VrVGpuRVE1eTdSVjhVV3FhemRsbk1ORnZm?= =?utf-8?B?VmM3YkJ5VlBpWUNRaFZaVDJsTk55UDNrdlNpZk5ybnlWdUpROU5xNElUSUNn?= =?utf-8?B?WDczKzkrR2crUW5Jcm1Qbi9KQURSaFBoOHdQTjdack1FUmxwMmFkYzl3UHU0?= =?utf-8?B?REEvNDBPOFl4TUZsNldoWFNBV0c1dzhrbXNhVFBZMDI3MzI2dUhDb3lqcmxP?= =?utf-8?B?UFZVWDBEcEhuYUJod2lOaWV0eDZEaURRRWY5cUU2dS9ybWlBRy9JZ2JjRDJr?= =?utf-8?B?R09PWmVrM0syZWxVbk1QMXdEbmY5cUkrUjQ3V094VmNYSDRBaGdQYWpMS000?= =?utf-8?B?RWkzUm1FOEdnRHdlUlMvb240dHRkbU5oTzgrSVg1TTJ3ODgwQm9BSmU3With?= =?utf-8?B?TmRpZTFOeC9pTXUwUVllSy9rdkFBSnBJZkZTQmVHSm5zR25iazBQbGNEakcy?= =?utf-8?Q?YPwuHU7nvZxXVoa+egyy?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ee2b43c-a646-4294-34b0-08db30b7a5e5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 00:42:32.5355 (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: DU2P250MB0015 Subject: Re: [FFmpeg-devel] [PATCH v2 3/7] avformat/matroskadec: export Dynamic HDR10+ packet side data 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: James Almer: > Signed-off-by: James Almer > --- > libavformat/matroska.h | 3 ++ > libavformat/matroskadec.c | 80 +++++++++++++++++++++++++++++++++++---- > 2 files changed, 76 insertions(+), 7 deletions(-) > > diff --git a/libavformat/matroska.h b/libavformat/matroska.h > index de63cdc7ae..b39517709c 100644 > --- a/libavformat/matroska.h > +++ b/libavformat/matroska.h > @@ -360,8 +360,11 @@ typedef enum { > > typedef enum { > MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, > + MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 = 4, > } MatroskaBlockAddIDType; > > +#define MATROSKA_BLOCK_ADD_ID_ITU_T_T35 4 > + > /* > * Matroska Codec IDs, strings > */ > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 9581b19204..ad8b352f31 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -40,6 +40,7 @@ > #include "libavutil/dict.h" > #include "libavutil/dict_internal.h" > #include "libavutil/display.h" > +#include "libavutil/hdr_dynamic_metadata.h" > #include "libavutil/intfloat.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/lzo.h" > @@ -284,6 +285,7 @@ typedef struct MatroskaTrack { > int needs_decoding; > uint64_t max_block_additional_id; > EbmlList block_addition_mappings; > + int blockaddid_itu_t_t35; > > uint32_t palette[AVPALETTE_COUNT]; > int has_palette; > @@ -423,6 +425,8 @@ typedef struct MatroskaDemuxContext { > > MatroskaCluster current_cluster; > > + int is_webm; > + > /* WebM DASH Manifest live flag */ > int is_live; > > @@ -2378,7 +2382,7 @@ static int mkv_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const MatroskaT > return ff_isom_parse_dvcc_dvvc(s, st, bin->data, bin->size); > } > > -static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, const MatroskaTrack *track) > +static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, MatroskaTrack *track) > { > const EbmlList *mappings_list = &track->block_addition_mappings; > MatroskaBlockAdditionMapping *mappings = mappings_list->elem; > @@ -2388,6 +2392,18 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, c > MatroskaBlockAdditionMapping *mapping = &mappings[i]; > > switch (mapping->type) { > + case MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35: > + if (mapping->value != MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { > + int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT; > + av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING, > + "Invalid Block Addition Value 0x%"PRIx64" for Block Addition Mapping Type " > + "\"ITU T.35 metadata\"\n", mapping->value); > + if (!strict) > + break; > + return AVERROR_INVALIDDATA; > + } > + track->blockaddid_itu_t_t35 = 1; > + break; > case MKBETAG('d','v','c','C'): > case MKBETAG('d','v','v','C'): > if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0) > @@ -2814,10 +2830,12 @@ static int matroska_parse_tracks(AVFormatContext *s) > AV_WL16(extradata, 0x410); > } else if (codec_id == AV_CODEC_ID_PRORES && track->codec_priv.size == 4) { > fourcc = AV_RL32(track->codec_priv.data); > - } else if (codec_id == AV_CODEC_ID_VP9 && track->codec_priv.size) { > + } else if (codec_id == AV_CODEC_ID_VP9) { > /* we don't need any value stored in CodecPrivate. > make sure that it's not exported as extradata. */ > track->codec_priv.size = 0; > + /* Assume BlockAddID 4 is ITU-T T.35 metadata if WebM */ > + track->blockaddid_itu_t_t35 = matroska->is_webm; > } else if (codec_id == AV_CODEC_ID_ARIB_CAPTION && track->codec_priv.size == 3) { > int component_tag = track->codec_priv.data[0]; > int data_component_id = AV_RB16(track->codec_priv.data + 1); > @@ -3081,6 +3099,8 @@ static int matroska_read_header(AVFormatContext *s) > return AVERROR_INVALIDDATA; > } > } > + matroska->is_webm = !strcmp(ebml.doctype, "webm"); > + > ebml_free(ebml_syntax, &ebml); > > matroska->pkt = si->parse_pkt; > @@ -3615,12 +3635,58 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, > } > > static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, > - AVPacket *pkt, > + MatroskaTrack *track, AVPacket *pkt, > const uint8_t *data, int size, uint64_t id) > { > - uint8_t *side_data = av_packet_new_side_data(pkt, > - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, > - size + 8); > + uint8_t *side_data; > + int res; > + > + switch (id) { > + case 4: { > + GetByteContext bc; > + int country_code, provider_code; > + int provider_oriented_code, application_identifier; > + size_t hdrplus_size; > + AVDynamicHDRPlus *hdrplus; > + > + if (!track->blockaddid_itu_t_t35) > + break; //ignore > + > + bytestream2_init(&bc, data, size); > + > + /* ITU-T T.35 metadata */ > + country_code = bytestream2_get_byte(&bc); > + provider_code = bytestream2_get_be16(&bc); This will add implicit overread checks; but you should check size explicitly instead. (The current behaviour of the bytestream2 API is to return 0 upon overreads; yet one should not rely on this and it could e.g. be changed so that bytestream2_get_byte returns 0xB5 and bytestream2_get_be16 0x3C upon overread.) > + > + if (country_code != 0xB5 || provider_code != 0x3C) > + break; // ignore > + > + provider_oriented_code = bytestream2_get_be16(&bc); > + application_identifier = bytestream2_get_byte(&bc); > + > + if (provider_oriented_code != 1 || application_identifier != 4) > + break; // ignore > + > + hdrplus = av_dynamic_hdr_plus_alloc(&hdrplus_size); > + if (!hdrplus) > + return AVERROR(ENOMEM); > + > + if ((res = av_dynamic_hdr_plus_from_t35(hdrplus, bc.buffer, > + bytestream2_get_bytes_left(&bc))) < 0 || > + (res = av_packet_add_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, > + (uint8_t *)hdrplus, hdrplus_size)) < 0) { > + av_free(hdrplus); > + return res; > + } > + > + return 0; > + } > + default: > + break; > + } > + > + side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, > + size + 8); > if (!side_data) > return AVERROR(ENOMEM); > > @@ -3692,7 +3758,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, > if (!more->additional.size) > continue; > > - res = matroska_parse_block_additional(matroska, pkt, more->additional.data, > + res = matroska_parse_block_additional(matroska, track, pkt, more->additional.data, > more->additional.size, more->additional_id); > if (res < 0) { > av_packet_unref(pkt); _______________________________________________ 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".