From patchwork Fri Jan 21 22:40:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp869839iog; Fri, 21 Jan 2022 14:40:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqIlN9LPjy27nXzYtIXEIgtn92MrSbjrWGrKXew88E8kDij1SLDTdxKDsk17+1yqE1bjCg X-Received: by 2002:a17:907:86a9:: with SMTP id qa41mr4813473ejc.548.1642804824921; Fri, 21 Jan 2022 14:40:24 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn2si2508123ejc.927.2022.01.21.14.40.24; Fri, 21 Jan 2022 14:40:24 -0800 (PST) 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=Tty3B0AX; 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 2F7F9680500; Sat, 22 Jan 2022 00:40:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E9EA68AFE7 for ; Sat, 22 Jan 2022 00:40:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aF2f+mojDHjP0CWFzkwVLN1eFWc32przaxlDfWTt2iZMtzrWxavYcr6NWutANKBom0qbzl+gCqT88YWgP088nelyK+EOdDLUFwTtawN2Gq3RxtDN1r9/q5q2YzENjwwzW6Du7LI7i9PTq8Et0xnGNpakXFux7l/lqKW8qMbWRwZQHcXAR8Qa8p3VLJtiolxXnMzNu3XbBK2Z2OjDggc8JO1R/fVhJAZAOy9v+EgqSZeEfktxsu5TQ4bSWIFvru2VsUi4ywQ2aUlZvhRG7f7Hcud190xVD+EPZPDT0BFf8Gwx/0herxcC06u96ZDsJsPpPt59b9c71iuTNJWm1VUm+A== 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=vS2Vq3AzZ9Wf0ELV7j+KcVnxa30ZbtXTEo/bTAFeIh4=; b=l0SidffzrzL7m4T8oTNIsXOAW1Gne++qaD1VEBzHvsKDpVuO5m8IuI5s7A5Xs/vTP8vaJDGEAm/RcefINHPPk2S5GdA6Y/OwTY76ltvlskMJCnSi2+MwDzN238erBJiKIGxqY56vU0H1zLEWxBHiUdg7s9hPszsUiqkNBxu1diojM/CI531fwMwHQKl/sl0KLG9t/Gg9BTVoynscTy/E2aPfPOKTsURplve4+WHwx8LJlHK8qeO4nkwmsqMWFZrB5Rc33hG5yMqt1G6SNHkF0CE06FfPW0phh2vcAplekxi6kVjqGNMtREePUyLLxn0tQb2QrQLMPQo/u26O7rgKBw== 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=vS2Vq3AzZ9Wf0ELV7j+KcVnxa30ZbtXTEo/bTAFeIh4=; b=Tty3B0AXSoPrtb3day2i8rh+sCqBKkFzedVWvPs2E+nQWgKenkKlsDzLTE84rH6ua6UleHzO9vNVBxrgd6WxgxUKIubvX//RSTH82IHbKJ5/6c1BKvls4oiCyZBllA87uYz3lbQ5aBbkBY6xvmC6QEEjZ/wx2NuDe81ASrXiKlif8eqFrsh3h84MDgjAhLl2fd00hFFz/bGcYQtjYvH7UzRFdfLw02afOpVqp82nwggDonrqXU+8FrSPpHus7JNVz34maEL5c8i5t8KE8ezZ0p+r64iAQt9HxPH/QDQFs7gXryRMuG53R1kP8JI8F0Oh1Ym20BqCBJ2s4fH5lqwChw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4124.eurprd03.prod.outlook.com (2603:10a6:5:3c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.13; Fri, 21 Jan 2022 22:40:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Fri, 21 Jan 2022 22:40:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jan 2022 23:40:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [mRofEcCIrp2zsJ0b0DNoSG91NkMIzjC7] X-ClientProxiedBy: AM6P193CA0047.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220121224002.1616749-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d81ea069-f8f3-4016-966f-08d9dd2efaa5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSV0TCwkppgUFRWy0piiKpM4FfEoPmCMOwBWtnye+W3wOVCSMpDML04ir0H4qUHtF+Ciu5wpvIxGduPvAkS5xYobieBiffyNhbxMOsVa9frz9YMBddLxdzy/eCDi0d/Fl3wVyJbVPcyNM+vIcGZlFSWmnniBrYdyf1jSV5qFSPW0HOGqFh8yTc4nvyAzAfSlHJPxP3vF2dV8gf5BULlrxAZbP29QzSxUtaft0/Df5fHcbKCqZrr2KWVnJpP8HT40hHJcWLrlZys7T30ZCBOzAjZ2O6ZRMQiR6tQnRbRMcFbgpjP72QCeDaA4c0IXDNYa0sLjtg/aTT7JcJh8nDR7lL3DxmNxavU/eRo5o7MxL2VCo9xazweQjKYxWS3NcQAKD3bONc7pxFR0lPF7o324x3vwwDldoT7pqDKyuBWusfyb1o60hnk1YZ73hlGLS6a0FJt/CIin0bNeCEe90cMCmxOj/c2MK5bkWZYSTchJPOroHH1AWQCCWatyDyboQ9MPDZsYA2S8NyU1XjfiKioy9OrgzNb3cS5wLiyu+Py/YweIYydk/x9aYXFm+IOAjFUAkCQUrRIXaxO8O1A66LhIL8sSbP6rzSH4OmEALP9LAEEJgGN8ZvDxKVk0lLp5wLgaPKzwayHJPxCW2C45UfHJ8axfoGbE4+7FPaWU/KE66ZiWWr6Pny5I3v0xZ774/G4XBL1Fl1OpHxY5QAPMiy9e/uLAg8fVr4A205w1LWbifbrSjQf/i4IcOvblsgKqDgj02Q= X-MS-TrafficTypeDiagnostic: DB7PR03MB4124:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7CXWEoK5agy8dvSdYXGxpHOYjAL88hCpZLYW5TtJgzFUkhf8rgctS9djkO28s8+oTMXEQqDta/8xmRi1ZOEitZ12nYOr9f1q8UJPSEgfCrnjyz8agsvklCC3e5g75MWtBJlzgzleEPFQ/JJxa+Do0sxNEjsAU9yB0CocG2EDTOOaHcNspyI9keLjNyPcXOEgz+mo5T9QHT5yPKi46mjICfv6IeAjVra9JUyfbT2y0nVqFhIUzJNSE0QqPhPdifctNUMk3H28Rhohj81dlGxfkgW/6LyqXfREd+0+UapiLbtTpBKcYEwc4OITrCsdsF4dQN/4ta4ZkdwTTadcya4NRESYNa9knA9WgmBVK2Xj2E1I6dDJvBaQpbVT5uOWUNbhm9xG/HuUlIpuqTdARPcR7BNAq0iJOQLPFDmwbfVKviCfTFEjsO7NG+HEef2VEdx7a1uOHtSVmjiw5k3qNLgovyfy+cv1KuLy9MPmF/FvO5VTkDCamC5DZi1+oANloHZeEu07TyxURGiT02wxqpG5SIYs1kjshbMZZm0K5z2e2eXdPx8LH/g/JtdB8WVXZFeLlaIwjHCGX1UNecaELfk2Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N4ZEgPmflob59rECBoLyniraUA9xffrTWlqFy4rTraRibgWMDpAUsxhUpn/nAlF2JYfoGVHKZypjI3V+/1xBM7J1WzH9af5Ry9XesbnF1MDeblBsx6mprcpyIRHotfCMVP5d82s8vnfsI6IqAjmnsfAGzwKsE+ckg/sVlqjliKyAr04YtsME8rBbZDYPTtCm5cpI1cvfQ1YwDXGdypso1T/ud5vCxSerZMuZhSbauE/gINo7V+8WL81UYwvYp5dasTWPg/Fk8kzDTeeDwukYaivzk77al48jFvNF9dpjXfTRoDOq0p+xw9KxqrGwNePRiW485k6zxJ4DyTszJv+w1fmwVVaDi2WB1Lj+yaMaaizu26w3qZN9TaTirKivm172Ms3byxhptZqWsgWaGHB2fEAGostBjhAi2JLW2QFG+hVKS/sIBuAluuA/g136GExbudrucZA3H9zDWfbOWudLliWzd1XaFEgh2ZWgSVsMmrAm9OnhV/4EO01VI0P2UDj6cyj5/yH058N1HmW37eutzeeKKIyTHV7U34e7MiQxVhwKThfUAxXjJEll9uNA5Qo+qQc4NVtUO5pk9CGy5xIE1jgOyP1JMp91A0mSnUCmPD05pflQDTR/pJWtyAUpAbDGzhMGNVs6c2CobBujkjXn6DJqisyhiTcPmFtHuUuB9orem4FnY01nsLQtxYJutrbUugEZ+UvdpyIwOTn3H1/lLtS+2GBxEuEPBzkla1BYk8YPYBJ58maX80v5eWxke41g55lu/v0J3OQRmwA2w3aRJ72VS0JcExuJ3nkr0eDpTaPxnOFse1twfjmRigtJPO0fVFMsmCS3V1bZD2xHBOIBu+OXbNqSUgvQ5RCkRsW6+F2EHsnBgdsMcNoxp14fVxLiR5GktzmpWCnfaNQ1udq26HQuML5hwss1G/tmWeF+AqeLQg/VsgxGQ4OOuoDKUIxN1zGRHbBc0uvaSCNmHUguoQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d81ea069-f8f3-4016-966f-08d9dd2efaa5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 22:40:09.5837 (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: DB7PR03MB4124 Subject: [FFmpeg-devel] [PATCH] fate/ffmpeg: Add test for autorotating video 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: HnwSewBh0Ssk Signed-off-by: Andreas Rheinhardt --- tests/fate/ffmpeg.mak | 6 ++++ tests/ref/fate/autorotate | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 tests/ref/fate/autorotate diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index b80467d02e..b48dd25a3b 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -48,6 +48,12 @@ fate-force_key_frames: CMD = enc_dec \ avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \ framecrc "" "" "-skip_frame nokey" +# Tests that the video is properly autorotated using the contained +# display matrix and that the generated file does not contain +# a display matrix any more. +FATE_SAMPLES_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER MPEG2VIDEO_ENCODER AC3_FIXED_ENCODER MOV_MUXER MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF PIPE_PROTOCOL FRAMECRC_MUXER) += fate-autorotate +fate-autorotate: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c:v mpeg2video -c:a ac3_fixed" "-c copy -t 0.5" "" "-show_entries stream_side_data_list" + FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video fate-sub2video: tests/data/vsynth_lena.yuv fate-sub2video: CMD = framecrc -auto_conversion_filters \ diff --git a/tests/ref/fate/autorotate b/tests/ref/fate/autorotate new file mode 100644 index 0000000000..df8eaf26f9 --- /dev/null +++ b/tests/ref/fate/autorotate @@ -0,0 +1,61 @@ +eaeb2b429cadcfd3d0984e2270126564 *tests/data/fate/autorotate.mov +197358 tests/data/fate/autorotate.mov +#extradata 0: 34, 0x9d7d073f +#tb 0: 1/15360 +#media_type 0: video +#codec_id 0: mpeg2video +#dimensions 0: 272x480 +#sar 0: 1/1 +#tb 1: 1/44100 +#media_type 1: audio +#codec_id 1: ac3 +#sample_rate 1: 44100 +#channel_layout 1: 4 +#channel_layout_name 1: mono +0, -512, 0, 512, 6997, 0x55c700f6, S=1, 40 +1, -256, -256, 1536, 416, 0x92ddc529, S=2, 10, 4 +0, 0, 512, 512, 4847, 0xe74f522e, F=0x0 +1, 1280, 1280, 1536, 418, 0xc96bce7b +0, 512, 1024, 512, 5281, 0xbd4a5dac, F=0x0 +1, 2816, 2816, 1536, 418, 0xaeffcf21 +0, 1024, 1536, 512, 3521, 0x0c07249d, F=0x0 +1, 4352, 4352, 1536, 418, 0xcd37cd04 +0, 1536, 2048, 512, 5128, 0xce8bfa02, F=0x0 +0, 2048, 2560, 512, 2759, 0x2369d21d, F=0x0 +1, 5888, 5888, 1536, 418, 0x2f80bc7d +0, 2560, 3072, 512, 2057, 0x5d7ea97b, F=0x0 +1, 7424, 7424, 1536, 418, 0xb290c6ea +0, 3072, 3584, 512, 2114, 0x91d1f369, F=0x0 +1, 8960, 8960, 1536, 418, 0xa862cc5b +0, 3584, 4096, 512, 1883, 0x3dd68028, F=0x0 +1, 10496, 10496, 1536, 418, 0xb148cc5e +0, 4096, 4608, 512, 2025, 0xcf3dc34f, F=0x0 +1, 12032, 12032, 1536, 418, 0xcf34cb00 +0, 4608, 5120, 512, 1586, 0x3977edf0, F=0x0 +1, 13568, 13568, 1536, 418, 0x4665c882 +0, 5120, 5632, 512, 1633, 0x64c5e315, F=0x0 +1, 15104, 15104, 1536, 418, 0x8e4fc865 +0, 5632, 6144, 512, 3894, 0x32306d8d +1, 16640, 16640, 1536, 418, 0x80bccbc8 +0, 6144, 6656, 512, 1490, 0xa541a35a, F=0x0 +1, 18176, 18176, 1536, 418, 0x84eaca12 +0, 6656, 7168, 512, 1253, 0x7e93302b, F=0x0 +1, 19712, 19712, 1536, 418, 0xc3b6cbd8 +0, 7168, 7680, 512, 1573, 0x58fcd6b2, F=0x0 +1, 21248, 21248, 1536, 418, 0xa345cb53 +[STREAM] +[SIDE_DATA] +side_data_type=CPB properties +max_bitrate=0 +min_bitrate=0 +avg_bitrate=0 +buffer_size=49152 +vbv_delay=-1 +[/SIDE_DATA] +[/STREAM] +[STREAM] +[SIDE_DATA] +side_data_type=Audio Service Type +service_type=0 +[/SIDE_DATA] +[/STREAM]