From patchwork Thu Apr 15 20:16:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26935 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3900044ACE3 for ; Thu, 15 Apr 2021 23:17:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17CB968A3BD; Thu, 15 Apr 2021 23:17:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2075.outbound.protection.outlook.com [40.92.16.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFC62689884 for ; Thu, 15 Apr 2021 23:17:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kdE4G48oe4aFzvncqNCQeXjuT944ao+7E9m1uXSZbhwck4vVB0KUiHxoA4qG4/aeYc6N/1EWrRUhsEN7/gyS1XgFTKM5+EwnZXHY5gSWS83xsKahkNRCVzHHsT86XjIXemsK+QQA6j2KzyUtgf4xJhMUfI8hpb9Gr8CuFn91aUYAY/52mT8Jul3OosIkiDnyj6fSSBTvKAM26kfIKenLzL4A+GYLjanVFitstaNgW2RhSPKQJr7HW+zJjNR45P4eRjDhj5q96/cAT/1jDAX0GK5zvWGKhx7f9ZwDBwqFm4LHCmiQ8uYO2UI7SApWGXVycTEKqndIxunAil+yVrwNdw== 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-SenderADCheck; bh=KEJKUarirk4wLX0dlsQR7PGP6PQF99BBs4sxU93j1kE=; b=Ar3xB5Q/rw2yEhgh0eYjlO7hNEZ9hdM0Dc+NIcE3FvVeg+eabYxIxsAnHhkQW6mVd+tj1LmvIO+91wCdR2ppjp83SYNFxlzTh/Axm0d8k7t9g7Sm83iBWlMQ7qb5FNMqhzb/JSFNyYv/voywajlrAL3hgSUCR2zx/j121KyT5nQUdJDTXCCoIy5igfjhX/U+hjhphRi9F5LdxEU8GxvotGImAw7/WpeMRgBLxAs9YsVYtbNbLFIKEu9cG2lI3I/KJ1zgqizyF7QWL6t9a1CqHNE0N3Scjer3BiiHJZBELsgDcdVt/uaW64gg1WcBmvRNOs7e5f4TimPulAXG0yxe4A== 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=KEJKUarirk4wLX0dlsQR7PGP6PQF99BBs4sxU93j1kE=; b=RojVPnKu/emgnIYE4mKTJFvT+3si5ZgDDsClwpCE4tzgHaxK/PaPP9BK53/DNUwPEUyojkEACECNKfdIzNgz4f5tavBuTsLCnbIr4M0qkAhpIknOwiQXw69o3BFzV4HuzUvetui/I8EBzN54xjFn+DaxiAvrxlDjFWawEOfJnjjb1EZvPINVF2wzyx7PzHM2HLnS078vBqtnpz6JGqUdJQef7CW9VFtIxtYwjC084a5oCTD7+7XugmIKyFcCY4C2lIoJN4OAALLG5cDtcPtJqnQdVsZGKzPFkbydq1J2IQ0xgKz2AqTQ+3rAMmoCzOi+pfdWgst0KR+M+a9b5qOLsA== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::41) by AM7EUR06HT236.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::279) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 20:17:07 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::53) by AM7EUR06FT022.mail.protection.outlook.com (2a01:111:e400:fc36::388) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 20:17:07 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:18476016F6EDBD737853057C945FF392CC2262379C842F77816A0E3140EEE1DB; UpperCasedChecksum:1F002696C7DB64695841D3164F700E54E408D8B2A6807778C09293A6B72357C1; SizeAsReceived:7580; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 20:17:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:51 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [7Ei9dBStfIW9WgICV8WilRfCXJO16GRP] X-ClientProxiedBy: AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415201659.1810798-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.18 via Frontend Transport; Thu, 15 Apr 2021 20:17:06 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c8acb42d-133b-41e8-2682-08d9004b713a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXFKoSKZyiLYcPwGDHzH9eVdHrr/53rHKpoaw4NCXJ+3iJ7ujRTlscNXbCbFj9oBRHiWlacrrRAsfrLRaYGu0Zrj40pwXEytniANGtvHznjSuuHaWHz7SQXSIBNapK5sw8NMbCZz+UCTX80FOpS6WjWXv3/C5xR2LbAfnpWqBUHygE5KquOKALJTJXBfX0+TFt7On7xWm1RhIuaRSjMADUJn5bJfNH5iUKdlclbidZzbWUHeAMa+Ikzyn0Dp7UBr7ntxvK4TSBJ32s6lJmh5Qh1kH2i2AsjxOJz2c0LQeToADJWqXIQegj//sZZyqnv2Q2PhPxOtAmUKr7GD5gzdjLGLBxsby+05gK35yR9Cwl4H8E6pt9zliljBwU3K0F3lyRa/Wx/9o+/F6s3ggYPbKyj2gZpYL7aPYkLCMJQ+nTSpxClcmUynm9yaTGxUiQeKgerxlWs8xFqvvXn+H8rlEGl8vK33EqRpW+v3S6LvOV4E0eRherDFH3fndTawTzyMyv1MXU2DoW0iFn1mb7lDira29G5gikEPHC4VuB9x6JEmb7j0sYLP/R9G50577IkqQtH9XxwTwPy64yzVH/7Ftk1dowqTcU2Zl5iXd/SvBVnsA+NU8HiQiT3m8VUelCrlOjnMohY+xZI5aWVJ9EJUP4+QqQXiA0VHVktBUnIdLlCku0TfJPKND+9l8Kb5lcyua2+vruYQeeEvH1cx2E+Tzdwrqy/fumyRw4= X-MS-TrafficTypeDiagnostic: AM7EUR06HT236: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ot36rDZf2exY/8n7t8hzWQ4yIj7HawU5x09ugbHljesWsAiwODnzcmZUmhLoO0eUHYez03JAeU4QN1la856c7z8+T3mECdnFzagAVYst4EtHXp2N/hF09BXajOkkuPznLdxly51bYioZiWjLcc9qrr7XATa6sazRMTLapRXdr8gXfN7XMoS4lKlCo4tBrNS2IhEnrA8ujQlrXndYgQRi6C3A4zmILk5L7og9yM9lUppvbwGE94+Et3nrxQh93SNKoVCbaMxReykSN/NgX7OwejN/FmBZ9pazA/rzsJHLQMMpGq8o7Fg050ea5af+qUhOTUMW/Ou56B6soM2j2PesK7HT/7FsIkyuhnQZEl29f1JE6iw1GsEE+OtuSxGMRMmZ X-MS-Exchange-AntiSpam-MessageData: I5P13roFeAzya6TzQUqUakeN5jE75njO5bYghp0D0JqtBJVGSqOHSA9PU2XC8WOk+MMyJdbU3hQrffo3lrRKnFy4BwyGpdRSp/LCad64saKmeNoWJonT0AtsTr5S8Sr2tdnLoEtrGDaxT6wxfrZalw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8acb42d-133b-41e8-2682-08d9004b713a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:07.3738 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT022.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7EUR06HT236 Subject: [FFmpeg-devel] [PATCH 02/10] fate/mov: Add test for muxing cover images X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- tests/fate/mov.mak | 12 ++++++++-- tests/ref/fate/mov-cover-image | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/mov-cover-image diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 957bd5ca4e..4c1014be92 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -37,8 +37,6 @@ FATE_SAMPLES_AVCONV += $(FATE_MOV) FATE_SAMPLES_FFPROBE += $(FATE_MOV_FFPROBE) FATE_SAMPLES_FASTSTART += $(FATE_MOV_FASTSTART) -fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) - # Make sure we handle edit lists correctly in normal cases. fate-mov-1elist-noctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-noctts.mov fate-mov-1elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-1ctts.mov @@ -127,3 +125,13 @@ fate-mov-faststart-4gb-overflow: REF = bc875921f151871e787c4b4023269b29 fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name -select_streams 1 $(TARGET_SAMPLES)/mov/mp4-with-mov-in24-ver.mp4 fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe + +FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ + SCALE_FILTER PNG_ENCODER PNG_DECODER \ + MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-mov-cover-image +fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" + +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) + +fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/mov-cover-image b/tests/ref/fate/mov-cover-image new file mode 100644 index 0000000000..e65e4ee36f --- /dev/null +++ b/tests/ref/fate/mov-cover-image @@ -0,0 +1,43 @@ +4e92f776010bd7a727c11bf8c34cde1e *tests/data/fate/mov-cover-image.mp4 +1011919 tests/data/fate/mov-cover-image.mp4 +#extradata 0: 2, 0x00340022 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: aac +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +#tb 1: 1/90000 +#media_type 1: video +#codec_id 1: mjpeg +#dimensions 1: 600x600 +#sar 1: 96/96 +#tb 2: 1/90000 +#media_type 2: video +#codec_id 2: png +#dimensions 2: 600x600 +#sar 2: 1/1 +0, -2112, -2112, 1024, 6, 0x027e00e8, F=0x5, S=1, 10, 0x02c80048 +0, -1088, -1088, 1024, 6, 0x027e00e8, F=0x5 +0, -64, -64, 1024, 6, 0x027e00e8 +1, 0, 0, 0, 25441, 0xe82503b0 +2, 0, 0, 0, 32657, 0x080255d2 +0, 960, 960, 1024, 6, 0x027e00e8 +0, 1984, 1984, 1024, 6, 0x027e00e8 +0, 3008, 3008, 1024, 6, 0x027e00e8 +0, 4032, 4032, 1024, 6, 0x027e00e8 +[STREAM] +index=0 +codec_name=aac +DISPOSITION:attached_pic=0 +[/STREAM] +[STREAM] +index=1 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +[/STREAM] +[STREAM] +index=2 +codec_name=png +DISPOSITION:attached_pic=1 +[/STREAM]