From patchwork Sun Aug 29 21:27:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3402131iov; Sun, 29 Aug 2021 14:28:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVT9+b90jl5pkbMBd/4UTvJ2NTP1+2dwC4c1VRIfyB3DEw62yeq2dkNIHn4l/iuVcSFcEz X-Received: by 2002:a17:906:34ca:: with SMTP id h10mr21684326ejb.137.1630272486011; Sun, 29 Aug 2021 14:28:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho42si10426094ejc.342.2021.08.29.14.28.05; Sun, 29 Aug 2021 14:28:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=XJmdjvhS; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35ABE68A1C3; Mon, 30 Aug 2021 00:28:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075083.outbound.protection.outlook.com [40.92.75.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C49976802B6 for ; Mon, 30 Aug 2021 00:27:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GfCuXhTljxI2GhpLFrooyxfZt5C1S62ZtRw5iAD+PZnAVgi6JsfPuby7rbVXDi3LMgxS7twLWwmz1tTYQxSJvmOJu3STzBn30pUIy7N2MmO99doROzaOI08iEL53YwaxgtXUAd7/cJZo4DqTcfQHCSn2d5qb3usN/Svdl4PSSlWODjLgJi56I6v//Q4XB8W30tQuyUWngeUJv7Bq+7HwdvbVaxN9m1zeF1+1QC3hNvTbF9W9JsQcQjfEzs+pXQz+ojdtVxdRCP0sUxXHexzGAoBjjJimsNneprgraLymQU6sROiDHtEOF4XWN9w43d7YBAQH4PK2wdDvvy2eJqeYsQ== 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=/ATsKvBb5x9ryt47RjuTCK2wDdzSqICf5N3n21zrhDk=; b=fkauF5T/bSaVIMW+LnOSnVeayzh181DlmU6XsCE+5x2I9XYVVpFUpSaf31e3ulotbyT7wZu8mw04yQfrpceFMIEX96blpe6Lq488YFbuzEFZqmNMEKwf25+h0+mrguVWBk9B8d6TnjwKmAwM0tXVQAnzuZwGgiSl2vixC3sE/7ZwnEOF/PpeVrImkrKQlp3QR+XDG8OW4oTaNvqyxwbbkdLa418suq865QlFvc+ksTEt6Z2lO+e/wE6YSVHVmm0yzyWQymcHGxIwds6r2oeTBlThrvN3V6T7PN6mym31eylpsS2p/ubQYSmGS6eGAygLlNDuYNXlSVPpRrrexaoJLw== 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=/ATsKvBb5x9ryt47RjuTCK2wDdzSqICf5N3n21zrhDk=; b=XJmdjvhSezEHf8NeG3JT2vsDTdCoK04y1/az6dtq6mvXFTswYAmDtvrt9NzQB4ggo9W5n6Vt/TMBBjlg9gTv2e16XJsr+O2jLUf41oP5rBgE8eEcF407gaKFT2bImx+Ao3J3wMYdMmAhR/1akMcxQTcqqwIRfj+pBBfPt+HEYesBiEABuONnzU6ISjsAzxzwicIbbQUIjVOUxIriKpCr13FvHauqm0Dc6K5zGkmL95qq4HT6K1QOspRa2DRtKqTCfji4IKiWgDra4TYAuptG83Vdwpry5QLqdye2lhpa7VCevYwZ3iRlV7nq0wSw3wZDDQdU3qtJY/jcBa9XuK5G7A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5927.eurprd03.prod.outlook.com (2603:10a6:20b:e3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sun, 29 Aug 2021 21:27:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Sun, 29 Aug 2021 21:27:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 23:27:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1cDEqvpDHsTsHYX48PHCIfkZ2eqmJGxZ] X-ClientProxiedBy: PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210829212744.1505779-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.19 via Frontend Transport; Sun, 29 Aug 2021 21:27:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33b56194-67e0-4075-4b4f-08d96b33dcc4 X-MS-Exchange-SLBlob-MailProps: LhCMoOy5BnkzEw+GMKqQ98t8nW/0L9Hg11/qiiOz15nCIEt7k9+CzBLzCCZUONrZcuV/etR1gh/hV2jblybsy37h4VtWNVzpiaUdfPhLfUuF+azICcyvu9CgxSt+esGhIcHt1TJobYCi+EYeqTD+4t2TImD1gT/B0sL0aQMKyeZlJaqCaxFtKtLzfs6mGUA32eB2r0zT5jNO6eLQT3QqkZbUI0E+J9XrrbONT1kLv6D6YMVFxaVnMFSv433nU6qa3GgvAr6cGimgFjAd7KPYHw56vWwSKD6FL/oeBGnjzb4ppSFH55txIpQro42ebSMfgC+3JP4Ghen1h2PrGsUeSgO9YHy6hmiTWsAL+lRbv5tqRHtYHcJMvRUqGcSk/VF5LKcumYKwAuZEbvb2K0kKu21cFBqwW5nBEFrxruwpMwgwODSZvWhOaaZOnLN5XEPAI0jeiWlUjeItsWxkRUEKT0ST3SJ1zDXzxC5cx8U+9CNjAbDYOdHpO41NuGe75+z05nrxVgr2gu++7L+3grZK36ikM6cy4dsJ2fBhgwp6fsymPATmBeucMJoEOCrN7OT5FPonsaqzufDROAXrfGIf1XtyIu3qkIzgV9fisM1Sj1yjQryM7M08mW2hydIvPqJ+acvygxFHWX0NvLvUM/RhCbDcf06EvtdvZVkYCSlscl6HeWDLwOWH53Mt99B3DbaZp19slaGj3+kVacVrvxV1JPBe4htbpbkqczSnIMDDpmkcOCEPZxHbU+iRnLdftbDM3cYMFSNjkJJzgpOngTWAntXJ+BBlnOChS5V5a9AFicU+x0C8n7bbZX790sf4bCULbTeugOi8KuKxTmThfLBiioR2RSqecXkBVMG74qJYGY+cF5XTsoId1D1kOVvSNE5iEywZKqShe2iPn6wbbqzjs/HoZvAw7RoCnigx2seURkDltk3nb/lNLSedlI/VKjt/e6yazDDKg6obJTacZJOZIBFbgVsx076VUXrecTOWKKBHW7HIk/A8UpsSI3D3258tMAspWrE7oJuqHkw+UAdX2w== X-MS-TrafficTypeDiagnostic: AM6PR03MB5927: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7i5XkY8nvXF5fRrn+kpGf9DVJBniMqZzZccxke5stse06Wsst/bseZugyWOO9+76qxJv6tPOi96PdTgy4DcI/Ac8D1I95O4KwHdEgN8lyMG/Wf9+ufjuBGG1HYTw/D+3xPpWrsux+hgym7ApK1QhBuV8WHMk1lqp/r481u1cei4/DPZDHnC/aQEzvgsQlTJs94z3kWPjiSG/aL72g9ojPW7S31oVuDgLAtHTe0NStBHw0+4DMctwhy9+PSZzYeUx/0LHEI5uP3wM+YeVL+8+nMmMQdGZYa2AqzTEFUZa+puyq8crb7ARmQxu8N5I3qFt2MOQp5/JZ9XKdtRHiUI5TnmXfnbhynlQip7Ad9MvIPQK0SksD64qD65r0k4WlqH9lRV8m9Bqd0yReDESHdyXPWfPsdc7KA5IxymiVwl46SBHkvoff96K5npoEfkywTbk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FluYzyjDODe8fIZ72LuqKX0kVVAcTEV61+uOPFfTY9WU+/uIYFrsV1pAdl6wi/b7Pr945VazRHvg4FzSuqfVT9lSnVV7L+E0SAETakx6wlfWqIX8y/hWsCMj9LYrITA84vPeTRg5giA8NypsDC2yuA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33b56194-67e0-4075-4b4f-08d96b33dcc4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2021 21:27:54.3062 (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: AM6PR03MB5927 Subject: [FFmpeg-devel] [PATCH 03/11] fate/cover-art: Add test for muxing cover arts to FLAC 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wauGEcJvG0QD Also covers muxing and demuxing of nonstandard FLAC channel layouts and the multi-dim-quant option of the FLAC encoder (all of which was hitherto uncovered). Signed-off-by: Andreas Rheinhardt --- tests/fate/cover-art.mak | 10 +++ tests/ref/fate/cover-art-flac-remux | 111 ++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 tests/ref/fate/cover-art-flac-remux diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index c42a4bc499..cbcc03fabf 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -46,6 +46,16 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MJPEG_DECODER \ += fate-cover-art-mp3-id3v2-remux fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name" +# Also covers muxing and demuxing of nonstandard channel layouts into FLAC. +FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER OGG_DEMUXER \ + ALAC_DECODER MJPEG_DECODER SCALE_FILTER \ + CHANNELMAP_FILTER ARESAMPLE_FILTER \ + FLAC_ENCODER BMP_ENCODER PNG_ENCODER \ + FLAC_MUXER FLAC_DEMUXER FLAC_DECODER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-cover-art-flac-remux +fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.5" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus" + FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes) FATE_COVER_ART = $(FCA_TEMP-yes) $(FATE_COVER_ART): CMP = oneline diff --git a/tests/ref/fate/cover-art-flac-remux b/tests/ref/fate/cover-art-flac-remux new file mode 100644 index 0000000000..07a8400128 --- /dev/null +++ b/tests/ref/fate/cover-art-flac-remux @@ -0,0 +1,111 @@ +26a0d04dadbdd2703a78c603f7901bc9 *tests/data/fate/cover-art-flac-remux.flac +1103460 tests/data/fate/cover-art-flac-remux.flac +#extradata 0: 34, 0x92060af7 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: flac +#sample_rate 0: 44100 +#channel_layout 0: 5 +#channel_layout_name 0: 2 channels (FL+FC) +#tb 1: 1/90000 +#media_type 1: video +#codec_id 1: png +#dimensions 1: 200x200 +#sar 1: 2834/2834 +#tb 2: 1/90000 +#media_type 2: video +#codec_id 2: png +#dimensions 2: 485x359 +#sar 2: 1/1 +#tb 3: 1/90000 +#media_type 3: video +#codec_id 3: mjpeg +#dimensions 3: 199x300 +#sar 3: 72/72 +#tb 4: 1/90000 +#media_type 4: video +#codec_id 4: bmp +#dimensions 4: 485x359 +#sar 4: 0/1 +#tb 5: 1/90000 +#media_type 5: video +#codec_id 5: mjpeg +#dimensions 5: 199x300 +#sar 5: 72/72 +#tb 6: 1/44100 +#media_type 6: audio +#codec_id 6: pcm_s16le +#sample_rate 6: 44100 +#channel_layout 6: 5 +#channel_layout_name 6: 2 channels (FL+FC) +0, 0, 0, 4608, 14, 0x242b036d +1, 0, 0, 0, 66888, 0x1fd72743 +2, 0, 0, 0, 438706, 0x8bcb753b +3, 0, 0, 0, 21671, 0x7d1c6030 +4, 0, 0, 0, 522758, 0x7a63572f +5, 0, 0, 0, 21671, 0x7d1c6030 +6, 0, 0, 4608, 18432, 0x00000000 +0, 4608, 4608, 4608, 7636, 0xc3775d85 +6, 4608, 4608, 4608, 18432, 0xaaab4d62 +0, 9216, 9216, 4608, 5700, 0x8b9a3cc7 +6, 9216, 9216, 4608, 18432, 0x49410f52 +0, 13824, 13824, 4608, 5375, 0x1fa6c33b +6, 13824, 13824, 4608, 18432, 0x2d52e439 +0, 18432, 18432, 3618, 4060, 0x59fd7219 +6, 18432, 18432, 3618, 14472, 0xd2d47505 +[STREAM] +index=0 +codec_name=flac +DISPOSITION:attached_pic=0 +[/STREAM] +[STREAM] +index=1 +codec_name=png +DISPOSITION:attached_pic=1 +TAG:comment=Illustration +TAG:title=OpenMusic +[/STREAM] +[STREAM] +index=2 +codec_name=png +DISPOSITION:attached_pic=1 +TAG:comment=Cover (front) +TAG:title=landscape +[/STREAM] +[STREAM] +index=3 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +TAG:comment=Publisher/Studio logotype +TAG:title=portrait +[/STREAM] +[STREAM] +index=4 +codec_name=bmp +DISPOSITION:attached_pic=1 +TAG:comment=Conductor +TAG:title=White King Granulated Soap +[/STREAM] +[STREAM] +index=5 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +TAG:comment=Publisher/Studio logotype +TAG:title=White King Granulated Soap +[/STREAM] +[FORMAT] +TAG:major_brand=M4A +TAG:minor_version=0 +TAG:compatible_brands=M4A mp42isom +TAG:disc=1 +TAG:title=Inside +TAG:compilation=1 +TAG:gapless_playback=0 +TAG:track=5/13 +TAG:Encoding Params=vers +TAG:iTunNORM= 000004DF 000004C2 00001E64 00001AB3 00000FB9 00000FB9 00006480 00006480 00000FB9 00000B52 +TAG:artist=Maxwell Strait +TAG:album_artist=Maxwell Strait +TAG:album=OpenMusic +TAG:genre=Rock +[/FORMAT]