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 545F140EE8 for ; Sat, 1 Jan 2022 07:24:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0EBC68B0B9; Sat, 1 Jan 2022 09:24:40 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2101.outbound.protection.outlook.com [40.92.90.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 849D368B058 for ; Sat, 1 Jan 2022 09:24:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iJrMQHEja/e6cCRbCs44LWnnlevDnKU6RUCPEos83OSEvbXI8WJQJZM5060N6YclUAZo9Me/Jj1OyBF6wCPk2HKJoN9fm8OLS/iwRBvQGLDtMwnJuH5/Wr9PsOnlCynfWI9KBmGG9qD8xqQPjY3uOEOs8YeVRMtQWtTHqOdk8ZRguSviDJ9auhyUp9ML88VDBMQqxGsoCGSC1HNoLat1wT6RnT6Mj+iV/2yHzaN/B/yfN3vBXGMBsJDgQsoxpEepdrDXbbIylPVzLgFiju/N3E7n2q71bLGH7IXmYTajKlsEbVmHC+0RKZbFVhmSjG1xgvVAGzr+leCe+3R7JaxlLA== 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=XiwvTPlWo8fw7mCBIXkO7J7bVM2AQ4t/Y2k8sZIF2iI=; b=YPT5aYh0+RAiR5uKrpxLwAWOmx6V1Hqp+R1mTUhKWg4kiAPLpJTydcADX9umQEY2vhEG92T+dZuTXYWnyebFaPryncIyeN+IiwCYaJ0QwqpoDa3NtnArJ3lb1xmJC+6q/jkk69umO763nJf/6sSvVaM1mch13E9zwWowoRfFIcrLUR6Kmf6HSoeR+RuDvX9zkCjtbv7jZASbjWcjlU3HYxdDcHynQJIWT+P/x1SU1LFUwfJQ7MWJRO5gSXGUyfFhMw8bosvWjxFlPMnYGhHzfdMyzFh607H/N6QKDhMVYNNS0BP6GVOfPlFQGcBGEEXgWxqfGtePa30LWdjx5BH97Q== 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=XiwvTPlWo8fw7mCBIXkO7J7bVM2AQ4t/Y2k8sZIF2iI=; b=bDvdwV3Llg8NdR1um3ycwEP8wbDFLeH+ILOefwFKu3DGFK4QAAvx5Oy5XehdS0q4RDY2nzxqNFQfetI5TtIrfrqAmHgWFScf/XFzCrhIQwVGC0dPZ04N3ZmNSDlTxjWd2wguhD3bdkAggpRFAXFL3HfTBbcBq6pBSqZWM/ES7DrALvF8kd55WYzM6sSnVEZ7tCYaHGeAdFz5DpFFyil880dxAS50Svgw/yNUBAOklScOVtxCNQ9zXqm5+VP9GCbft4u4vRILBjOqRQLb9fVx9ILPEQGkb+cJ3OdKS71OnpmValhFWBRyWWOO/ve51Ff5d4aep2KeHu3Ltl8YcSSHjQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4534.eurprd03.prod.outlook.com (2603:10a6:20b:a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Sat, 1 Jan 2022 07:24:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%6]) with mapi id 15.20.4844.015; Sat, 1 Jan 2022 07:24:31 +0000 Message-ID: Date: Sat, 1 Jan 2022 08:24:29 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211214153001.2610297-1-tcChlisop0@gmail.com> <20211214153001.2610297-2-tcChlisop0@gmail.com> From: Andreas Rheinhardt In-Reply-To: X-TMN: [ZxpbbEZs4TCw3+8ZVHZEg6C06oQ5JI97] X-ClientProxiedBy: AM6P192CA0101.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::42) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 036706d3-540f-413e-fe31-08d9ccf7c0b3 X-MS-TrafficTypeDiagnostic: AM6PR03MB4534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xp1wzou2g5dnEOZbKxzHyUOFBKG8YOeK8YioaDYydWzu6vyxzUA8JZz7U7sjRbX5f+ybRzyFFu/qEgWSOGz+xO0xCAzY5QmgseZ3dWhNf6GqKkHhkqsdK+y91CiTnh+L9HthaGCfGs8OvWGSJRwpaDBSd0C/yfehZ5x4/mXLXuldDWT0qONbP1BZ4AdfuloswIXHRJMPoVtf//bXDG1sc9NAiPJsYPD2C1P1+FejwCcu0nQ2Dw36Py3gKac3geYz80t6h0gzFZ1r+iTrrcCOM+VdNdYpXy/w9+PGPzlWh/B8OuvSIjeSwEh8NXYYCwQ/6PWdezb9g+dVcGMeV8ucJhSrCSSn36pY1XNABhJY1ZiZVkqcdS8VmqPU+AUeeDZLAC54TCPSXbfrJghS8YrnU0CjS8ve/jlPsovQy+iEt/OI/wDLUhNmXFAoypQXeBsnwVW6cUHdGQfMPcd8Is9tqGvfBae5hYoCRdMSDSpIaJjqN87+gln5i0fmjyYXJk1cCjof8hF5vkUsZBe4tdXAyJ3yyZ4e3J2I8nSVODwzH15KLGZDUPAp/1AsAISRcxFD8X5Ju3P8ImA/K9agffyl6A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cE9KMkttVndhMTNMV3lYSmJSWlRQR0FXK3Z1MlBKTTJXYmFFSWJpVng3QlZB?= =?utf-8?B?YU92UlpNdU8rMWtuVWVlU1dpMWRTMXpvOWJRVmRveklyWDNpV01JTU9vUHQw?= =?utf-8?B?S1VlYVlYYUpHSW5LbVZLaDRjZ1BuVDdCdzJQV1k2Tm54Ynk0ZFBMb1ZyMlYr?= =?utf-8?B?U29RU0Q3amxQWkZYRkRlak5sTWhwM2hpZGJWVC84cUxwODgzbFJ1bWl3aEVr?= =?utf-8?B?UHVtc0RmZWRCT2dnOVR6WFdJU1F0SFJiV0NwRDIwUWc2ZVNjQVFIZGFhMUov?= =?utf-8?B?K1NCS0lQMkQvcENCaGc3NHVPcjlRdEtVSWh0ZVlLZDJvOXB4NFY0RHFyMFZv?= =?utf-8?B?QTI0N1B3eVBmNTdqUG5tNkREdTZud3dNOE0zamtLSnRTdkVrRVhPaDZxaEFK?= =?utf-8?B?TitkSGEyckdmcEZPYVhzQWxaVHBxM3cwS0hWYm4zNFlrSEMwUlI1SGZsNkxv?= =?utf-8?B?T3dkS1BNWVd3ckdVWVFaZWdlZTZVbGdneTMreDlFNkZTcDQ4U3RaQXU5cmVF?= =?utf-8?B?c2F0K1RhOXo0YTVvSUVqRlRpbEdoWjVDVmtjZlp1SlpXT1U5NlpPb0VkVEQv?= =?utf-8?B?SGY2M0dhZlFXTEFYRllTcWhTM1B6bWtXTHBLL2Rpb1JlUzN5V29tUGlGc0d1?= =?utf-8?B?ZXRlOGdnWFFlbTN3ek1iaHhESWZDaXduY3k5NWlXdFNwQjVEVThyS216aWlV?= =?utf-8?B?eHdoYlE5MCtxQ3QreUNGOXYrMTBqNWlxdkVBWVVXZVF4ZngrQlJYVkRrZkdW?= =?utf-8?B?Y0ZybFFkNmVXUDBiNGM1YzNMQWRrYnZMaS9Rb1lJQ1IyQVNmK0R4MjFoMHpt?= =?utf-8?B?M1IwNGhQVG1TTU1LbDUwdUpub2tidTVFRjZmd2VDdjRNYkdnWkJGUUhCSUVZ?= =?utf-8?B?YW1FMnpsN05UZ1JXNTNWTVFoVGNRc1J6bVVVSzJDc3ZYNXIrdm5LOFZXcUpC?= =?utf-8?B?a2RTYTZ4NWVqZ2owM21kamEvSDlKeFliUVZsNnIyeXVEUlNMbFZwZHcrT3A3?= =?utf-8?B?Y3lsU21GREtKRWNZQUhWNFdmZXlqYzlTL1hJNmhiSFZZQUE1WGFXbXpkMU9v?= =?utf-8?B?ZllkWnplZVRodmZLaXVrUU42R2VNaVdXMHJKM2x1VGxmazRLVnlPdFluRlJI?= =?utf-8?B?a3RNY1EwNElDbElVQ3pUQW0rYjZkdXowTWhJcTIvUFBOSm9XUGhWM1h5V1lK?= =?utf-8?B?Z2JBZVQ0RGpJa1E4bGgxZ0RVZS9USy8rWWZaeVhBQ0l0MTNGVzZlRkpvZ09W?= =?utf-8?B?OGxoVWhJT3JVSW5qZ2t2MzBDWUV0aHRvQXNWL1FGK3ZrMkk0Zz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 036706d3-540f-413e-fe31-08d9ccf7c0b3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jan 2022 07:24:31.3832 (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: AM6PR03MB4534 Subject: Re: [FFmpeg-devel] [PATCH v10 1/5] avformat/dovi_isom: Implement Dolby Vision configuration parsing/writing 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: quietvoid: > On Fri, Dec 31, 2021 at 9:16 PM Andreas Rheinhardt > wrote: >> >> quietvoid: >>> Both parse/write implementations are based on mov/movenc. >>> >>> This only adds support for the "Dolby Vision configuration box". >>> Other configuration boxes, such as >>> "Dolby Vision enhancement layer configuration box" are not supported. >>> >>> The new functions will be used to implement parsing/writing the DOVI config >>> for Matroska, as well as to refactor both mov/movenc to use dovi_isom functions. >>> >>> Signed-off-by: quietvoid >>> --- >>> libavformat/dovi_isom.c | 118 ++++++++++++++++++++++++++++++++++++++++ >>> libavformat/dovi_isom.h | 35 ++++++++++++ >>> 2 files changed, 153 insertions(+) >>> create mode 100644 libavformat/dovi_isom.c >>> create mode 100644 libavformat/dovi_isom.h >>> >>> diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c >>> new file mode 100644 >>> index 0000000000..262d7e37ba >>> --- /dev/null >>> +++ b/libavformat/dovi_isom.c >>> @@ -0,0 +1,118 @@ >>> +/* >>> + * DOVI ISO Media common code >>> + * >>> + * Copyright (c) 2020 Vacing Fang >>> + * Copyright (c) 2021 quietvoid >>> + * >>> + * This file is part of FFmpeg. >>> + * >>> + * FFmpeg is free software; you can redistribute it and/or >>> + * modify it under the terms of the GNU Lesser General Public >>> + * License as published by the Free Software Foundation; either >>> + * version 2.1 of the License, or (at your option) any later version. >>> + * >>> + * FFmpeg is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>> + * Lesser General Public License for more details. >>> + * >>> + * You should have received a copy of the GNU Lesser General Public >>> + * License along with FFmpeg; if not, write to the Free Software >>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA >>> + */ >>> + >>> +#include "libavutil/dovi_meta.h" >>> + >>> +#include "libavcodec/put_bits.h" >>> + >>> +#include "avformat.h" >>> +#include "dovi_isom.h" >>> + >>> +int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size) >>> +{ >>> + uint32_t buf; >>> + AVDOVIDecoderConfigurationRecord *dovi; >>> + size_t dovi_size; >>> + int ret; >>> + >>> + if (size > (1 << 30) || size < 4) >>> + return AVERROR_INVALIDDATA; >>> + >>> + dovi = av_dovi_alloc(&dovi_size); >>> + if (!dovi) >>> + return AVERROR(ENOMEM); >>> + >>> + dovi->dv_version_major = *buf_ptr++; // 8 bits >>> + dovi->dv_version_minor = *buf_ptr++; // 8 bits >>> + >>> + buf = *buf_ptr++ << 8; >>> + buf |= *buf_ptr++; >>> + >>> + dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits >>> + dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits >>> + dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit >>> + dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit >>> + dovi->bl_present_flag = buf & 0x01; // 1 bit >>> + >>> + // Has enough remaining data >>> + if (size >= 5) { >>> + dovi->dv_bl_signal_compatibility_id = ((*buf_ptr++) >> 4) & 0x0f; // 4 bits >>> + } else { >>> + // 0 stands for None >>> + // Dolby Vision V1.2.93 profiles and levels >>> + dovi->dv_bl_signal_compatibility_id = 0; >>> + } >>> + >>> + ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, >>> + (uint8_t *)dovi, dovi_size); >>> + if (ret < 0) { >>> + av_free(dovi); >>> + return ret; >>> + } >>> + >>> + av_log(s, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " >>> + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", >>> + dovi->dv_version_major, dovi->dv_version_minor, >>> + dovi->dv_profile, dovi->dv_level, >>> + dovi->rpu_present_flag, >>> + dovi->el_present_flag, >>> + dovi->bl_present_flag, >>> + dovi->dv_bl_signal_compatibility_id); >>> + >>> + return 0; >>> +} >>> + >>> +void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], >>> + AVDOVIDecoderConfigurationRecord *dovi) >>> +{ >>> + PutBitContext pb; >>> + >>> + init_put_bits(&pb, out, ISOM_DVCC_DVVC_SIZE); >>> + >>> + put_bits(&pb, 8, dovi->dv_version_major); >>> + put_bits(&pb, 8, dovi->dv_version_minor); >>> + put_bits(&pb, 7, dovi->dv_profile); >>> + put_bits(&pb, 6, dovi->dv_level); >>> + put_bits(&pb, 1, dovi->rpu_present_flag); >>> + put_bits(&pb, 1, dovi->el_present_flag); >>> + put_bits(&pb, 1, dovi->bl_present_flag); >>> + put_bits(&pb, 4, dovi->dv_bl_signal_compatibility_id); >> >> There is a slight problem with the last six values: They come from the >> user and therefore must not be trusted to be within the range they are >> supposed to be. (The put_bits API uses an av_assert2 to check that >> the values to be written actually fit into the amount of bits that is >> used to write them.) So I suggest you use !! for the flags and >> appropriate masks for dv_profile, dv_level and >> dv_bl_signal_compatibility_id. > > Thanks. I used the same masks as in the read function. > The current code is also dangerous (just a bit less than this version of your patchset): If dv_profile & 128 is set (which it mustn't), then the avio_wb16() will run into the av_assert2 in avio_w8() (if assert-level is >=2). (And dovi->dv_bl_signal_compatibility_id << 28 would be UB in case dv_bl_signal_compatibility_id & 0xF8 is != 0.) - Andreas _______________________________________________ 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".