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 237B743C6E for ; Wed, 27 Jul 2022 19:40:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AEB568B903; Wed, 27 Jul 2022 22:40:53 +0300 (EEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067093.outbound.protection.outlook.com [40.92.67.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05B9768B8A6 for ; Wed, 27 Jul 2022 22:40:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sqa+Ii4ERmFTy87JCGHXa2Qd1f6fml5gTSCWYV4nePW6/OW5UkfhHxi3M6jZvx0+ZgUe+eCMlo58XiG8okJ6klPfpEZNldp9r8O10ZsA3WFO0GM/rdIGIuSvIRtzMghOcl2NfcIQtLZ5ocGt+6pUXyorfXffa2afpZ4XaFLcbzLfVnwpUbbz6vUifcx0VBrJ05BByll0wb3OxMj9Y25bY1NFZgsSYoRy0qD/m+l6Rn60ISmT1WgFKylo7TMsaRXcvu4lWh9BTMu90ONFdII+AY2J3NB1kjjb89NAv0YA/swgaqReDlhWomC7WukTPLYnDjQiHWJUMXAGVvFeoZhF3g== 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=uoGuNHkoI7ntHfiGoXjPwWL8sgo3Jvgd2QF/X77paCg=; b=n8WRzGT12eVxwwBPqdGWoQre+jRl1ncWAEmyS0rhmXmOoOQyIRh5HtE/PuFOqBgCufPmHKX+hJRC6QIHikfYr40pxgQKbmGv9yCsDlj8Zb1oc/WkIlsY+GHKmi8SCP+Put9I7XT3tpHfSAq7xNhP6ieumx1z1jIVmlcwYjMOznCkZsA8apyvFg+ow9ZutNh4+cfV2ndlsfGWmhBDSNoGDZa4ZBDiLD+HHePyEuuHL+r53Ao6neucL70sMwmllTho4C0XkGD4X7L6USQrLmSG5Ah95LcsVLWab1S1WL33d8OCz/wrBE7gQSxZ6ua/t1X0E2jcB8cjJx/7ITvxIpoSLQ== 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=uoGuNHkoI7ntHfiGoXjPwWL8sgo3Jvgd2QF/X77paCg=; b=KntcH4zoWYqdNTWYAfWDR3qe6Tg8VH545rCLGAcZo5JCTnWuLuRP/hGRLCVSfdKmoTvv5L8aifMA6XnWPbGbXtGwIBsHnQ9V1X7bQJqFxyxh39WZ6lGNUvGYa8g7vicHWHP8AbuzV+A1IRgn+bUqx3ya14yndy4A56IpZ1VbBBzaftjaXjH52N5lgCFhzQtqw7mVD88Z4kXa4/U6kHwO77myoBiAKwjgho/7Jgkr6Y2dbwwl8abGn8X6bH+SQfaCe+9rzn8krNcL0COY4im53aFU+FpPblMH4iVD8EeCrnin8ZLa+cljhmpQV5+56Ac+T9/01sRrzGWfYNo6rmIHaQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB7PR01MB4982.eurprd01.prod.exchangelabs.com (2603:10a6:10:5f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Wed, 27 Jul 2022 19:40:45 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Wed, 27 Jul 2022 19:40:45 +0000 Message-ID: Date: Wed, 27 Jul 2022 21:40:43 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220727161202.2764806-1-vigneshv@google.com> From: Andreas Rheinhardt In-Reply-To: <20220727161202.2764806-1-vigneshv@google.com> X-TMN: [LU6idjbjUbCRRs4mf8ko5vbxG0tcL3c5] X-ClientProxiedBy: ZR0P278CA0167.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ac9dd3d-922f-4c63-e1ad-08da7007e5bb X-MS-TrafficTypeDiagnostic: DB7PR01MB4982:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b90uGiFbb1trdmRGSYQ/zETO2XKWiPKDWdIu/UMvBa9p8dSZ8sMimV7/RO8PUCs7uE9xo/cVWVCz01jKiBpHOKlH44tI/R0Bb6T2y64Mqn9XBn/pdzrahdSyI/rLBtrUlXV+pemXc8rke2bzn6siJ/af96PHt2LgPpPp7RainlhgSbVNpFKeF2efjuKutEgf/R1jvb4EhK8yTCEsl3RaK8pzkwgX4aRHtgHN2H2D70wowloRL5qY3R4Uam1Tl1HtP2lZrWXWS2B4itWFY2UH8FCXr1Rd6/KcHE+Sg0/ZG9QOaxN/royRWiKK0sPwumPsk2xL+9TkdLbx1rQAgvBsG/d3Btiyhc7To7rurjQqjSGyt2EXPqLmuZLSopWGeyr/h/+235rlQJOCXIwozhiinRRvgzYO4uDZuHghtF25QjVaTj3JfJyJ3xI6Cvx7yX9+4LURS0VyEkU346YiCxgR0HchS9YDyQgTWQGYCXg41ncLdhWjzPb+dl9OkSQJGxlW2hPI1NHDw6y8lvx2cs33ZXCzBHBXGu2DeVy+eqctIIutXhasC8zjHyYoICZw73Ym+rcaQsO4/4i7plxdS1i43dyjLVaEtl3LoyL27AmTY9tVZ5nznd77Y//ThXgDq2axyhll69opauBUVivPc5gKrlbZLd5Y2NHCzRnyQdSWyN6D4E1DokkahYOf0Tvf8XUY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dWZYbHNWamRWUE80Ylg2NXVMNi9YTjhDU0YxOVA4bnBVWlgxMyszWHJLNi9N?= =?utf-8?B?T1JNVjZZdnJrS21OUnErR1pmT0lOZVptWVJsT1FzSXNaY3VjazJLNEV5WUZz?= =?utf-8?B?SkdoaDlVOWxrR0prSWQ2RmpBVWp4ZXJWMDl3T3dMdlJHbmZ4RGE4T2ExMThr?= =?utf-8?B?OHBkNURkYzBmVUFPSUhrVXlyTGh1NDRvTTVSSVRsOE85ZWhIRzNhVXhiQWFV?= =?utf-8?B?NDI2Z1lVZ1gxcWtrcDBBVE1Edi83UUtSTGhKbU4rMUt2by91bTVkOXVFN1No?= =?utf-8?B?TXA4SlR5R09tRVlMa3ZRS0F4V1M0aXpSRFhuY3pUVzMweXhUWkxueHM3MFlr?= =?utf-8?B?cmVDbkdmR2QyU3dSNEs2MFBROTMvRWd3biszQnZFdms2U0VBRXNrQ3AxWDAz?= =?utf-8?B?Mml4Y25PdGNvVGV0OXVWbTJ5Q25OdnEwTW1XNm9QNUNGc3dWQ0kvYjJpVlFG?= =?utf-8?B?eVZMT1daSWpsOFJrUi9iTlY2VkVCU21haGNqb3k5MVJjVFg2NzFFUHE4ZlhN?= =?utf-8?B?V2tuVVZQeklVaGVuVHZDSlVLd09PejhSZVo4WTUybFNuZjFJNllNOUtJd3ZO?= =?utf-8?B?ZU5SMnZ5K3cyUXVKV1Nsc0QxS3BqWGIrY2Ewbk1WZUhsWkpMUERHMGhBZzI5?= =?utf-8?B?TVAwWmtUVU5iWXVXSFhNMDBGZU1CUVZ3ZlQ0Ymt2ZTlJdm83QW1MRnZ1Z2RV?= =?utf-8?B?U2pDd1NNWkR5bTlzSS82bFF3V0hiT0ljQmpFd3ZmUXliKzFuWVFqaUg1VkNQ?= =?utf-8?B?TldLZlZ0elR5TGJxUGdPRVczRlVpRFlWS2p1OWE2RXBieFYyVEVLdmEvczly?= =?utf-8?B?cG1UUllUaXlMRHVOVGNNLzgyQ3ZiemxqdUthV2JjdHJIZVFUNTZxNk1UWjM2?= =?utf-8?B?cm5WT2d6N0twc1kwSDYremdFLzNKcnVEMGlsK3dwcEtKL0ZlSWFWVFR3dDVS?= =?utf-8?B?ZFhiaXlTM1NJaXFJcXVGSVJMbEtoRytWTG03RGovdk9KNEh1eE5VOFJibTRp?= =?utf-8?B?R09VbHRONG5yeVlodzkwMzEwVGQxVEIzTEVHTHM5VGFJcGMrSVU0TlNHd3A3?= =?utf-8?B?OCtQbWptQ0pkNWs2UUNVekZrV2R4RVpsUU5JSEh0eEkrR09SZWltVE5wUTBi?= =?utf-8?B?TVZjM3NkWlFiWlhncTc4UjBuOGszdWJzdzZoRmFRZWwwWnBEUmVOYVo2Wm9q?= =?utf-8?B?UStHUnlDSS93WDZXa2kyZHpLbSt1Nnl6ci9WVVNiSkMzWHJLVDRLSkF0c3Vr?= =?utf-8?B?N01YMjNnTUxYTFhuZjRsUm1UcWJjUTdvSWNkMldpSU5SLy93aFAwcjMzVmVD?= =?utf-8?B?cUMwbnJITHBWWXhYeFcrcXBVcWxuUVZEUXVmSVpQNEJRVURPWktVck54QzFS?= =?utf-8?B?Qkh2aHlWcnN5SFd5ZkoyaENLTm91USt1QmUvK1BacVhvRjk5Z3RGOWVuSGxw?= =?utf-8?B?cE1VclZqY0Q5ZE55UnB1N1gvL2NNRldSdEhWUjlJRHJ4N3psN1I0YlpXOGcz?= =?utf-8?B?YTRSYzdHczl6Qlc2dEp6NG9OTmc3MDNxOW5GNFpPMmhEcmhldlZYaldJbysz?= =?utf-8?B?WXJoVkZBQ3E5WUhuaFNsekp2Z3dqK2VQT1ZDV05mSDRycWd4NHZLaWpvNlk4?= =?utf-8?B?STNnRzh5Z1MxLzBCdXlOZVZDVVRNRDhTcE1CQzVjM0tzMjhDNFFyWk9zVnhn?= =?utf-8?B?bzFNS1RBZ3l0ckxIQ0NwRmhtYmc5NVBCaTJMQm5nZkJ1QlRmOEI1TXZHajRq?= =?utf-8?Q?93cjdtfSy9JlpswbH8=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ac9dd3d-922f-4c63-e1ad-08da7007e5bb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2022 19:40:45.1004 (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: DB7PR01MB4982 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Rework the AVIF parser to handle multiple items 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: Vignesh Venkatasubramanian: > Stores the item ids of all the items found in the file and > processes the primary item at the end of the meta box. This patch > does not change any behavior. It sets up the code for parsing > alpha channel (and possibly images with 'grid') in follow up > patches. > > Signed-off-by: Vignesh Venkatasubramanian > --- > libavformat/isom.h | 4 ++ > libavformat/mov.c | 146 ++++++++++++++++++++++++++++----------------- > 2 files changed, 95 insertions(+), 55 deletions(-) > > diff --git a/libavformat/isom.h b/libavformat/isom.h > index f05c2d9c28..d8b262e915 100644 > --- a/libavformat/isom.h > +++ b/libavformat/isom.h > @@ -318,6 +318,10 @@ typedef struct MOVContext { > uint32_t max_stts_delta; > int is_still_picture_avif; > int primary_item_id; > + int *avif_item_ids; > + int avif_item_ids_size; > + int *avif_extent_lengths; > + int64_t *avif_extent_offsets; Why are these three different buffers instead of one buffer of struct { int avif_item_ids; int avif_extent_lengths; int64_t avif_extent_offsets;}? > } MOVContext; > > int ff_mp4_read_descr_len(AVIOContext *pb); > diff --git a/libavformat/mov.c b/libavformat/mov.c > index a09a762d91..fc6a691da4 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -4698,6 +4698,69 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom) > return ret; > } > > +static int avif_add_stream(MOVContext *c, int item_id) > +{ > + MOVStreamContext *sc; > + AVStream *st; > + int item_index = -1; > + for (int i = 0; i < c->avif_item_ids_size; i++) > + if (c->avif_item_ids[i] == item_id) { > + item_index = i; > + break; > + } > + if (item_index < 0) > + return AVERROR_INVALIDDATA; > + st = avformat_new_stream(c->fc, NULL); > + if (!st) > + return AVERROR(ENOMEM); > + st->id = c->fc->nb_streams; > + sc = av_mallocz(sizeof(MOVStreamContext)); > + if (!sc) > + return AVERROR(ENOMEM); > + > + st->priv_data = sc; > + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; > + st->codecpar->codec_id = AV_CODEC_ID_AV1; > + sc->ffindex = st->index; > + c->trak_index = st->index; > + st->avg_frame_rate.num = st->avg_frame_rate.den = 1; > + st->time_base.num = st->time_base.den = 1; > + st->nb_frames = 1; > + sc->time_scale = 1; > + sc = st->priv_data; > + sc->pb = c->fc->pb; > + sc->pb_is_copied = 1; > + > + // Populate the necessary fields used by mov_build_index. > + sc->stsc_count = 1; > + sc->stsc_data = av_malloc_array(1, sizeof(*sc->stsc_data)); > + if (!sc->stsc_data) > + return AVERROR(ENOMEM); > + sc->stsc_data[0].first = 1; > + sc->stsc_data[0].count = 1; > + sc->stsc_data[0].id = 1; > + sc->chunk_count = 1; > + sc->chunk_offsets = av_malloc_array(1, sizeof(*sc->chunk_offsets)); > + if (!sc->chunk_offsets) > + return AVERROR(ENOMEM); > + sc->sample_count = 1; > + sc->sample_sizes = av_malloc_array(1, sizeof(*sc->sample_sizes)); > + if (!sc->sample_sizes) > + return AVERROR(ENOMEM); > + sc->stts_count = 1; > + sc->stts_data = av_malloc_array(1, sizeof(*sc->stts_data)); > + if (!sc->stts_data) > + return AVERROR(ENOMEM); > + sc->stts_data[0].count = 1; > + // Not used for still images. But needed by mov_build_index. > + sc->stts_data[0].duration = 0; > + sc->sample_sizes[0] = c->avif_extent_lengths[item_index]; > + sc->chunk_offsets[0] = c->avif_extent_offsets[item_index]; > + > + mov_build_index(c, st); > + return 0; > +} > + > static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) > { > while (atom.size > 8) { > @@ -4707,9 +4770,23 @@ static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) > tag = avio_rl32(pb); > atom.size -= 4; > if (tag == MKTAG('h','d','l','r')) { > + int ret; > avio_seek(pb, -8, SEEK_CUR); > atom.size += 8; > - return mov_read_default(c, pb, atom); > + if ((ret = mov_read_default(c, pb, atom)) < 0) > + return ret; > + if (c->is_still_picture_avif) { > + int ret; > + // Add a stream for the YUV planes (primary item). > + if ((ret = avif_add_stream(c, c->primary_item_id)) < 0) > + return ret; > + // For still AVIF images, the meta box contains all the > + // necessary information that would generally be provided by the > + // moov box. So simply mark that we have found the moov box so > + // that parsing can continue. > + c->found_moov = 1; > + } > + return ret; > } > } > return 0; > @@ -7478,8 +7555,6 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > int item_count, extent_count; > uint64_t base_offset, extent_offset, extent_length; > uint8_t value; > - AVStream *st; > - MOVStreamContext *sc; > > if (!c->is_still_picture_avif) { > // * For non-avif, we simply ignore the iloc box. > @@ -7493,27 +7568,6 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > return 0; > } > > - st = avformat_new_stream(c->fc, NULL); > - if (!st) > - return AVERROR(ENOMEM); > - st->id = c->fc->nb_streams; > - sc = av_mallocz(sizeof(MOVStreamContext)); > - if (!sc) > - return AVERROR(ENOMEM); > - > - st->priv_data = sc; > - st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; > - st->codecpar->codec_id = AV_CODEC_ID_AV1; > - sc->ffindex = st->index; > - c->trak_index = st->index; > - st->avg_frame_rate.num = st->avg_frame_rate.den = 1; > - st->time_base.num = st->time_base.den = 1; > - st->nb_frames = 1; > - sc->time_scale = 1; > - sc = st->priv_data; > - sc->pb = c->fc->pb; > - sc->pb_is_copied = 1; > - > version = avio_r8(pb); > avio_rb24(pb); // flags. > > @@ -7529,34 +7583,22 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > } > item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); > > - // Populate the necessary fields used by mov_build_index. > - sc->stsc_count = 1; > - sc->stsc_data = av_malloc_array(1, sizeof(*sc->stsc_data)); > - if (!sc->stsc_data) > + c->avif_item_ids = av_malloc_array(item_count, sizeof(*c->avif_item_ids)); > + if (!c->avif_item_ids) > return AVERROR(ENOMEM); > - sc->stsc_data[0].first = 1; > - sc->stsc_data[0].count = 1; > - sc->stsc_data[0].id = 1; > - sc->chunk_count = 1; > - sc->chunk_offsets = av_malloc_array(1, sizeof(*sc->chunk_offsets)); > - if (!sc->chunk_offsets) > + c->avif_item_ids_size = item_count; > + c->avif_extent_lengths = av_malloc_array(item_count, sizeof(*c->avif_extent_lengths)); > + if (!c->avif_extent_lengths) > return AVERROR(ENOMEM); > - sc->sample_count = 1; > - sc->sample_sizes = av_malloc_array(1, sizeof(*sc->sample_sizes)); > - if (!sc->sample_sizes) > + c->avif_extent_offsets = av_malloc_array(item_count, sizeof(*c->avif_extent_offsets)); > + if (!c->avif_extent_offsets) > return AVERROR(ENOMEM); > - sc->stts_count = 1; > - sc->stts_data = av_malloc_array(1, sizeof(*sc->stts_data)); > - if (!sc->stts_data) > - return AVERROR(ENOMEM); > - sc->stts_data[0].count = 1; > - // Not used for still images. But needed by mov_build_index. > - sc->stts_data[0].duration = 0; > > for (int i = 0; i < item_count; i++) { > int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); > if (avio_feof(pb)) > return AVERROR_INVALIDDATA; > + c->avif_item_ids[i] = item_id; > if (version > 0) > avio_rb16(pb); // construction_method. > avio_rb16(pb); // data_reference_index. > @@ -7572,20 +7614,11 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > if (rb_size(pb, &extent_offset, offset_size) < 0 || > rb_size(pb, &extent_length, length_size) < 0) > return AVERROR_INVALIDDATA; > - if (item_id == c->primary_item_id) { > - sc->sample_sizes[0] = extent_length; > - sc->chunk_offsets[0] = base_offset + extent_offset; > - } > + c->avif_extent_lengths[i] = extent_length; > + c->avif_extent_offsets[i] = base_offset + extent_offset; > } > } > > - mov_build_index(c, st); > - > - // For still AVIF images, the iloc box contains all the necessary > - // information that would generally be provided by the moov box. So simply > - // mark that we have found the moov box so that parsing can continue. > - c->found_moov = 1; > - > return atom.size; > } > > @@ -8189,6 +8222,9 @@ static int mov_read_close(AVFormatContext *s) > > av_freep(&mov->aes_decrypt); > av_freep(&mov->chapter_tracks); > + av_freep(&mov->avif_item_ids); > + av_freep(&mov->avif_extent_lengths); > + av_freep(&mov->avif_extent_offsets); > > return 0; > } _______________________________________________ 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".