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 93E06429CB for ; Fri, 10 Jun 2022 17:33:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5809368B3A1; Fri, 10 Jun 2022 20:33:23 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2033.outbound.protection.outlook.com [40.92.89.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 283E768A8E7 for ; Fri, 10 Jun 2022 20:33:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DE+qvAsno2jpHosH15mPmmYi5lbO05EDixC5AnN1CjYRgYCG5YL9d29cpcOZA5p5/WWINqNr5CsC7/2DMPuPJEAkNbzlD3PF9iW9sJBTwPEbBR0nu7VEVM0YU57+kYABFkhkpqpRGGnvkKZEi2ysJBqv/Qk/C8iFZABbCTrIYQN46mRvAXf/mSBoy6HC5BSskvyyccNb9PBKQajiLEMj+3Vz442zHQDJ3/FHrASUmzKPOxaHyMsXKzmsOakCN8r+hjsmwXgjEiHxbDzVpMPTLoWeWDoDTU7e07X6dtKtGpMWCOUC2CybFMDMm9RWoOFDBOl4XKWw1UlLjY+T6jr8UQ== 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=d9kk7lVUQXBc+rJ7qgdzmk5efo5uxGTJbhgMk3ODC2Y=; b=ahtFk7sL4H9m02NWCOy8fcAyD2o4SEnEFa8n2TK8Y/lLVu2MK5YNDliBXbpZXVVvIj2X9vx4vJZuILA3fkXXWCu/1lQOYkARmFT3FAQiXyHkzh+/u4rJG/PjRGpo4iC80s2nCWjiPCCBrSNlP7dg7yhB16m7SVPRN0qMj7LydENWM+VcE8nFwubzLPWivhcDrcGMsbXJm56FpP6+FK7c7rX9YVKXEKt8qzg015uat/CxuzVmHUoVOw94aZl6bUJClEHQIPhm6nkfldsymEP/YNt7JILxkgJ5mfn5HqRiNdsSEgYqgRGDlAntSLr/KsYnud3FujpdkJsputb0a4jbUQ== 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=d9kk7lVUQXBc+rJ7qgdzmk5efo5uxGTJbhgMk3ODC2Y=; b=neqnEwPh6UNBeo7/YEjqTtW2OzQTV7Y2aOrluK3erp0g2FzXT0ZM81HzRTCZgaje32bIP/QnRkk5M5DZ0qJialun0IKZfyVsmgZZDZFbu1FDI4ntN0SC4nfUoUOhOIYKH3jqspXruA0ULm2HnJeUOgrFX3R6ylxhHdOU/0cuxTizy4do3vmUcmM2x064njDsnreCYQssJ2MFIAUneCKawk4piMGbI2GTCs181rPaIlXqk3NqEoEsjt3IIk0EBUlRMZMnADCLNZypoHjwKG/a4CLqBKqyTai15BvriesGKlu1C/95yQ7wuyAU2vMJRkFIDyUPtYftmYewUXJ+LPHsGQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM7PR01MB7121.eurprd01.prod.exchangelabs.com (2603:10a6:20b:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.11; Fri, 10 Jun 2022 17:33:14 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.013; Fri, 10 Jun 2022 17:33:14 +0000 Message-ID: Date: Fri, 10 Jun 2022 19:33:12 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <085f0277-e678-4d20-f2bf-fbf55ed959d8@gyani.pro> <20220610173012.3573186-1-vigneshv@google.com> From: Andreas Rheinhardt In-Reply-To: <20220610173012.3573186-1-vigneshv@google.com> X-TMN: [JokIJQ35N5cYhTU6EET+NnZy3vbdXE1m] X-ClientProxiedBy: ZRAP278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::19) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <5ae87f2f-101e-6cfb-a608-25c0d583410d@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13157901-db26-4d34-8576-08da4b074c50 X-MS-TrafficTypeDiagnostic: AM7PR01MB7121:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QUTrGMXKunXp+rmOIyMg/X+ZJxgSolpYaeCzsmA91SlOrO9nj004tI7usuZGY6Gsr2TohF1qbV1X2jYkdjsIzwXDG3JtxtdMX2cIwp11EkcTgSzLmr6IYFUVcSAXApIDvy3tnm72m6LkaPbu2mm1fp69esPx6cy/6n0Ksht9KL+rri456NI45Hmft2ilcQHTgjUSpGs/JzqsFfQ9HSC9O2jiz6MmUnOu9+j25VMJT6EF/pV4z4SoD7N+HoQIjOKbG86puGY9+JMsLeyzKvcUT4K2EY3gUsnVyZOgs3Uc4rP2tvDn/BTLcgcElxq2UTeO5Cpu2ZO8/QJY22nf0eI8DY+V4kiqCeg44HZSYnx2BPuEv7icmpfu3QKi5t1EUKEqHvc1CqtSbBhm8ScZq0WsoL8cxTNRdBC4jKlAGDyOutka60msVLQP1TSzMEyQJRhquKLQUIchytHp2dI3lCHeWB7B0ix2190GzrNmRyAJnLJuTH3d/uAFuqoIxk1OQaM6HCaqmpsC7oE96r4P01xPoOp1Ouje76IQgSTJp7C2KBaWA/TSv4g/l4hxB9gqsWMhd1H7kD067CVYlsHEcC5rYfysyeVS8XuWQINkCjZAawCbBR7QcMsN7IHtNH2GtTbg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NXduQ2k3K2N1eGNWRmVmM0h4eTM2dTQ5UkoxRGV1TllnOEpoUTNoN0NlTitm?= =?utf-8?B?Z2dncnYrdHR0eDhkMkUyd1ZyZ1BCK3VGbHVaNFRRS3JHNXh1NlVrM1BtU0dC?= =?utf-8?B?UmxFd0dIWHhSMW55czA0b1hXUUttQWxRemt6alRkM0ZJM0t5dkxBcm5taUVj?= =?utf-8?B?dmQ2UlY3QUJCVVBLdW8vMkdXUmNFL1Z4UXlXMks5ZUdVbStETHMwaWlzcEpo?= =?utf-8?B?ZmVLVlVveUsvU0ljMnJCVTNiUmFpWUltaEQrazkyMU9BQ1BqckQvY280cndW?= =?utf-8?B?Z0ZZdXJWbXFOTithNGIrOEhzYmhWSU9CU3dnNzFWWS9GalVJbVFTcGNHS1R6?= =?utf-8?B?bWg5MWRVRGN2SmVIbmxBME5MejdwSU11aUk4YXJ1WW1BejZxYzVyMTJhUkdI?= =?utf-8?B?M3JuTzZLcmlPMmFFcEozRjlUNDljQVlEdjVmMU5JeWdNZ1NyaDdGakxyK2tB?= =?utf-8?B?YVZXZFlTRjhlOFR5QitxNEtmd0FQd0hadm1nS1VVM2Z6RWJMU2UyVGZQWllF?= =?utf-8?B?VGo3ZjBrM1RwN3FTa3RGcFVwVDlQY1hWVmpVRGF2aHNwajVzSUVhTmdGWmlV?= =?utf-8?B?MjNSbittRTR5U2NmRjFzM0kwVi9qRHczLzEzSXI1WUJNMmRKV2l4UHFMMm0w?= =?utf-8?B?OEtwYmM5WkJvUHFaeTNMQXFESGhyamNTRmMrRzBnTjZxYzZsU1RNZTV5Sktl?= =?utf-8?B?N2IvZG8yNzNzV3M4QzJMSE9md2o1U25qUC9kQzZ4bVJmbitRRFB2QjZBQlNa?= =?utf-8?B?bVJRL3FpL2tjcTVlM2svVllGajVDWTBDWjBRMG1oZjF4OXFwQlFPSE5WTnJL?= =?utf-8?B?MXBibGJLNXZnbU5KUjVCdHRqT1BVNHFMQUk3amZrYmFvay93RFFYblRrcnJF?= =?utf-8?B?N0ZGMXh2NzY3QXVHdGxGQlhQeHZyeFYwSS9TVElOayttQ2IwdkdnMGZVZHVz?= =?utf-8?B?Y09LWWxJOEFEWldudzVrK3lLRm1VdHVNbTVFZHRwQk53aVNzTWJZUjhZd0RY?= =?utf-8?B?dE5ub3hKNmRIWUNxWlpVRDNMZ3E5QmNBdGZFUG9pRHYzbFR6K2RBcmJZUEFE?= =?utf-8?B?Rk14U3Evd3Zwc0FhNUJkaGpnWFRCSzEzdHpNeFNSQmgzaHBxOGRTL3B3aEhh?= =?utf-8?B?amhNNzU5T1I0TXg4QmJtd1czWEhsMWlmVTZrLzYxczltV3c1K0owUTRIT1Jm?= =?utf-8?B?MTJGMzErRHJQZkRmUUtWNFo1ZjZRV1RyWnJSczJHRlNrTUM3d3k1VWo4Tld6?= =?utf-8?B?QUFIMGNuOFdQQ3hFL2VRSFlNYVVCSnpQZkFhSktXOXd0MEt5ekZmczJkd1JV?= =?utf-8?B?MVFuaHBRVjNMRnRHYTMyNTg1RU9Nbkg3aWg4YTc5RFFTTStmTXJNcVZCZmh5?= =?utf-8?B?KzY5bzNZQS9SS2J6bDhUQ09pZEVxSlUxY3JpVEgvQ0xiM1VvQnlTODhRT3pZ?= =?utf-8?B?OVczUkh6OFByVkNDTXY5OXI1SGFuVi9RamlHUHV1WFJtSkpPejhEbldwUkVt?= =?utf-8?B?cC84YUZvOWpnTUE4WFVGOVpET2g2R082VjRRbWMvYVhZa3IrZmpINmUwTXhT?= =?utf-8?B?ZXhMMVZzNXFlejVHR2FmcFoyQnM3RkQ4RnJkcFNqRGI5MzBxbnJZSE5aRTl4?= =?utf-8?B?V0l2NGhVQlhLYzZyL2hHUkVKUVRTelR1NG1hOHNsaEFlS0FTUXBYZU9icUs1?= =?utf-8?B?WGhwbXdOYmNVRjJjbHBnTG9JSkdEejUyYmZkc05TZE9aTGdUd1VlazZZLzVY?= =?utf-8?B?UXRWMUNNSHdPRE4zcFRiVUREQXV0SmpyQnV4UXN6V2VsWDZ6Z3FISllSU1Ri?= =?utf-8?B?MjFOa1IyWS84TjlXT09Yc2tvRjdkOHd1aWp0U0ExRjJiNVA1U0NlTWtucFlV?= =?utf-8?B?TWJ5UzMxUVdvWm45Q1l2ZmlRTEFIZkFvdnoxaGZkcGZpSk0xMHZITk5wZ0lw?= =?utf-8?B?MFB0UFpHU1lURVNvSGRVOTUrTmV4V1ZIYnZjTlVZNFlLaDVRbm1hMmN1dGdZ?= =?utf-8?B?aER5T0VpT1BRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13157901-db26-4d34-8576-08da4b074c50 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 17:33:14.6358 (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: AM7PR01MB7121 Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: Only read the primary item for AVIF 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: > Update the still AVIF parser to only read the primary item. With this > patch, AVIF still images with exif/icc/alpha channel will no longer > fail to parse. > > For example, this patch enables parsing of files in: > https://github.com/AOMediaCodec/av1-avif/tree/master/testFiles/Microsoft > > Adding two fate tests: > 1) demuxing of still image with 1 item - this test will pass regardlesss > of this patch. > 2) demuxing of still image with 2 items - this test will fail without > this patch and will pass with patch applied. > > Partially fixes trac ticket #7621 > > Signed-off-by: Vignesh Venkatasubramanian > --- > libavformat/isom.h | 1 + > libavformat/mov.c | 41 ++++++++++--------- > tests/fate/mov.mak | 9 ++++ > .../fate/mov-avif-demux-still-image-1-item | 11 +++++ > .../mov-avif-demux-still-image-multiple-items | 11 +++++ > 5 files changed, 53 insertions(+), 20 deletions(-) > create mode 100644 tests/ref/fate/mov-avif-demux-still-image-1-item > create mode 100644 tests/ref/fate/mov-avif-demux-still-image-multiple-items > > diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak > index 2fae054423..842c7f9aa1 100644 > --- a/tests/fate/mov.mak > +++ b/tests/fate/mov.mak > @@ -17,6 +17,8 @@ FATE_MOV = fate-mov-3elist \ > fate-mov-bbi-elst-starts-b \ > fate-mov-neg-firstpts-discard-frames \ > fate-mov-stream-shorter-than-movie \ > + fate-mov-avif-demux-still-image-1-item \ > + fate-mov-avif-demux-still-image-multiple-items \ > > FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ > fate-mov-neg-firstpts-discard-vorbis \ > @@ -138,6 +140,13 @@ FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML > fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" > fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" > > +# avif demuxing - still image with 1 item. > +fate-mov-avif-demux-still-image-1-item: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image.avif -c:v copy > + > +# avif demuxing - still image with multiple items. only the primary item will be > +# parsed. > +fate-mov-avif-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image_exif.avif -c:v copy Can we create such files with our muxer? In this case one could use a remux test, i.e. a test that creates the file and the demuxes the just created file. > + > # Resulting remux should have: > # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED > # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS > diff --git a/tests/ref/fate/mov-avif-demux-still-image-1-item b/tests/ref/fate/mov-avif-demux-still-image-1-item > new file mode 100644 > index 0000000000..93773afd4e > --- /dev/null > +++ b/tests/ref/fate/mov-avif-demux-still-image-1-item > @@ -0,0 +1,11 @@ > +#format: frame checksums > +#version: 2 > +#hash: MD5 > +#extradata 0, 13, b52ae298d37128862ef1918cf916239c > +#tb 0: 1/1 > +#media_type 0: video > +#codec_id 0: av1 > +#dimensions 0: 352x288 > +#sar 0: 1/1 > +#stream#, dts, pts, duration, size, hash > +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 > diff --git a/tests/ref/fate/mov-avif-demux-still-image-multiple-items b/tests/ref/fate/mov-avif-demux-still-image-multiple-items > new file mode 100644 > index 0000000000..93773afd4e > --- /dev/null > +++ b/tests/ref/fate/mov-avif-demux-still-image-multiple-items > @@ -0,0 +1,11 @@ > +#format: frame checksums > +#version: 2 > +#hash: MD5 > +#extradata 0, 13, b52ae298d37128862ef1918cf916239c > +#tb 0: 1/1 > +#media_type 0: video > +#codec_id 0: av1 > +#dimensions 0: 352x288 > +#sar 0: 1/1 > +#stream#, dts, pts, duration, size, hash > +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 _______________________________________________ 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".