From patchwork Wed Mar 31 19:19:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26673 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 6900544B150 for ; Wed, 31 Mar 2021 22:20:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44528687F87; Wed, 31 Mar 2021 22:20:04 +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-am7eur06olkn2076.outbound.protection.outlook.com [40.92.16.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19CD8680279 for ; Wed, 31 Mar 2021 22:19:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BBwuGTW/ref5QsCWDKkjhBhhA2BVMB3AnawGGP447VWTZqv3NxshRTzE4Fv71Q/ERygpFHZL3uoUNvcUbh62ObYUZpeHfyP0xbdK3j9ev4FES/hSUkzzG6EV6OHE4HIXv07/0txBpGxMDUeIEUB29FezRJiWfTKLpWRxsPiITds8NSxXTy0h3ps8md9kHdNXLM0WgCGIhnqZt3CmvdQCDwkwvP710eu8gwvnJNxk4Cy/Yr0gUICy2DjR50uLQrw8ReZvslypLgruPOYY6vWIKqhoBcZrYe7cYqB9ADZJ2TAHaEpJ1v6TK7IyDPaj7JoLmpYNA2g4zUdsuKNCo2Vokw== 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=fJI9isB+8xG/e5WaCY+UKctVi1vtgDdI2ZEZieGugYg=; b=LIEPoe673l6y07zrznOHtGy7Rdaz4mFwF6+PinDvkdT+fZ0qXnVNWXuboLa0hAbrgPOR1Ga6NXjbsbNEuII14yT2x2d83AqDGdGwqcMIfa2CZ4QeurhNqMOfdh5518AHzyTTJk/X5eTyzWvk+IxbslYO9cgT2pwyjZQ/7aeWsZEttUR9bfI0m0XmjlJBPPHVgAEkBkKgYcgDjIpkCBZgxlNc/dP44Izd9ESHn/mGhERZ/78CJD2j1gLxOQjVFVqHEqKFJs3rDyZJ/VJgZ00r5sAmnUVal+wVP3eRZwTOIcKFxGugRe9X6dvTCC/7JA8PCKyk9SLcx8SX1PbTSzdw4A== 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=fJI9isB+8xG/e5WaCY+UKctVi1vtgDdI2ZEZieGugYg=; b=Oijd7TQVVifmH9IxZJ+pFKbeCfTOM5IqSEEhiIdpIyg6K8TCUF0E907hM5egV3qT/h77Sv7VeZZRjtLhf4cs9Qfy7odqMcrvJCQvsduyQWk1yBPPXniAlUO3rWcEMltz6uMJ+oPTezljaRLAZBsZ6uB8SoUkYjwFgXViLJQgHlkOM1H02LCcmZmAqYf6wOKW+mvrkDGIn70jfQVDZVwdATIP7u6hxgnoOoa6gHZ5PAdm4exmh9Joko3zMWE6XZG+6w0FTsiUtPAKMf4bEYEgnj1qQ0VjtBQs2LtLYc+NwFTH1xQMf4YCOcen+SEDdWaI4WYT/hGZ6LPjXlMdhdVm0w== Received: from VI1EUR06FT048.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::52) by VI1EUR06HT055.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::279) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Wed, 31 Mar 2021 19:19:56 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc37::40) by VI1EUR06FT048.mail.protection.outlook.com (2a01:111:e400:fc37::110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Wed, 31 Mar 2021 19:19:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:326FD462C66CCA9976FEE354035626E090E9469F38F487E58FF80A6FF698EB02; UpperCasedChecksum:0821EE2AC09D94967C9DD4E810314D57AEB553CB6383E8376BD0136BFB59FDC0; SizeAsReceived:7407; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3977.033; Wed, 31 Mar 2021 19:19:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Mar 2021 21:19:45 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [GV+IFS5eergpLqTmyDEG1y7igrx+CkZ9] X-ClientProxiedBy: AM0PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:208:ac::33) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210331191945.1548820-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:208:ac::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.8 via Frontend Transport; Wed, 31 Mar 2021 19:19:54 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d4bc5be3-0d7f-4bf6-ae3a-08d8f479f76f X-MS-Exchange-SLBlob-MailProps: c5DxU4rKaXkb7HZKalzt6OFIAkeDM2pEfYfuFzlVOEEaXWLUI5FQivVCQQHLqEZiuPsHmgFyKGCqwPXrMF0Yd6HZWAXeYxghVSKQfLzziXLpfS7PG7a0tNA1GFvh5Kl2cGSVUVapVMRUyMTgKAuu13zSB3vjxOGD5evlAvfFT+BhT7TVFaD6P3xjpKk9/7oStfw5h8+SgNC7WxbDi0t9w6684xEeMIQziyU4ZkDFZack7mmHDrGjpDW5KDAPlT5jcYW0UmYcRLX/47MKK8pR8xWjs2KSpwwGrSghd44IexR1fSSR0J0586affl5rMiGmQiAH66A6NsCFswuVoUIR1CcFmn0HFrZW/wksHPabuOZ6cJJMbJF3VRjYbvTf82F5CMHlbAbzeiI3zGWYQNlzydZe/YQLSBfr5HACDDRQj35WyoTFMM7Ln+VHo73AQf5ETBV3KyaSVdtUV4pkdCe0PNuYV12HsOxL0dgP0gXd9WUj+UAE/9THXYd7VdTT3Ga5uW6r4OFSbn+XTOX3XhyVEo42oa+WoN1QISw4KOOP9MDkwgAsCh3ZH6HrpnfJDUNC/3X26IOEX6FGV7TlWPCR84FeFggepZNy/GNEcuNs2aBIK9aageUGdseiXeCIabBI6QTpBoN7KyGtLFPsUv8cv5LadAB8XxeZzUrTc+Qw9H0OLCMBmNnxAYDWzWx/yNtUJCim4JTQbqMC441xqgHFRYwG9ZS2zpvcXpDUcKojIojHlO+B1wQMtk1Zhk/pDZ2dMNauRvPxXq5cNPObdBr4KQvWs7cy0CYeVQSVmfRhF6fmyLk6uJ9KslEcmstcbl4Y5/oJGt+k//DxDb/D5uAJUOOHEB/ukE58 X-MS-TrafficTypeDiagnostic: VI1EUR06HT055: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cex2w+l5C4ye3vEQKFVcfsVp1P1/pEPpq8yX7N5ieD1x6oAdA8vFzOa0pA+YoQ0v3lLRmln5vWpWHWxlays4VdvqLkFQYdJgt2Hw0OpkUpqylK56ftKTp5BU6s131wIE4zYx2PQKNXpCSgwQRfaAn7zFhiQbw2KTsBlOKq6fZ6/v+CH983DpTyAD1ypuiM4XosaJd9TIT/YoPLCjkVUs21e62Awtv/hoKeLkD/9rEWhOPXzVDI/QwYY/+QBwkwCqePXPyf916N+Z+7gZHQdRrfRhsz/6RtCOL5/qm4wiW/IICW82sPGOmg//aXGkRnJ6SAh3pzzdWvvJXzlMHyrrOkDKzehUBkA6dmuoDMMt06f/sif7PECLLxmSLjAbW1FUci9W7bizDtMHUYkj3DNQPQ== X-MS-Exchange-AntiSpam-MessageData: T/x64Y7SINDMcERRs/C7go/Ds+uv+HZfiplisiLri3umb7KEsaRbgHzRk1stebTlgBhsw11oxkoFhW3r8nNeZLkUE42bRN3L5PbQh/VIu7YZWyB3IM2ICMk4rqwGUIinphhS6fFLmvjramotEGaR2g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4bc5be3-0d7f-4bf6-ae3a-08d8f479f76f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2021 19:19:56.4311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT048.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: VI1EUR06HT055 Subject: [FFmpeg-devel] [PATCH] tests/matroska: Add test for remuxing annex B H.264 into Matroska 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 --- Will apply this patch tomorrow unless there are objections. tests/fate/matroska.mak | 17 ++++++++ tests/ref/fate/matroska-h264-remux | 65 ++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 tests/ref/fate/matroska-h264-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index f6d4bd1199..becca28e1a 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -90,6 +90,23 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ += fate-matroska-mastering-display-metadata fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=dropamount=4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" +# This test tests remuxing annex B H.264 into Matroska. It also tests writing +# the correct interlaced flags and overriding the sample aspect ratio, leading +# to anamorphic video. Given that the input file has lots of filler material, +# the h264_metadata filter is used to remove it as well as the H.264 AUD. +# The video is decoded twice to show that this did not change the decoded +# output. Furthermore, this also tests writing PCM with bitdepth 32. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ + H264_PARSER MPEGAUDIO_PARSER \ + EXTRACT_EXTRADATA_BSF MP2_DECODER \ + H264_METADATA_BSF ARESAMPLE_FILTER \ + RAWVIDEO_ENCODER PCM_S32LE_ENCODER \ + PCM_S32BE_ENCODER MATROSKA_MUXER \ + MATROSKA_DEMUXER H264_DECODER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-matroska-h264-remux +fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "" "-show_entries stream=index,codec_name:stream_tags=title,language" + # Tests writing BlockAdditional and BlockGroups with ReferenceBlock elements; # it also tests setting a track as suitable for hearing impaired. # It also tests the capability of the VP8 parser to set the keyframe flag diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux new file mode 100644 index 0000000000..14e6758fa0 --- /dev/null +++ b/tests/ref/fate/matroska-h264-remux @@ -0,0 +1,65 @@ +ded6da7e46ce7df1232b116afb0b2f0a *tests/data/fate/matroska-h264-remux.matroska +2036083 tests/data/fate/matroska-h264-remux.matroska +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 3/4 +#tb 1: 1/25 +#media_type 1: video +#codec_id 1: rawvideo +#dimensions 1: 1920x1080 +#sar 1: 1/1 +0, 45, 45, 1, 3110400, 0xa426f15d +1, 45, 45, 1, 3110400, 0xa426f15d +0, 46, 46, 1, 3110400, 0x7066003b +1, 46, 46, 1, 3110400, 0x7066003b +0, 47, 47, 1, 3110400, 0x7691f2c5 +1, 47, 47, 1, 3110400, 0x7691f2c5 +0, 48, 48, 1, 3110400, 0x1bc501d2 +1, 48, 48, 1, 3110400, 0x1bc501d2 +0, 49, 49, 1, 3110400, 0xb616ecf1 +1, 49, 49, 1, 3110400, 0xb616ecf1 +0, 50, 50, 1, 3110400, 0xa334fb27 +1, 50, 50, 1, 3110400, 0xa334fb27 +0, 51, 51, 1, 3110400, 0x1097ea90 +1, 51, 51, 1, 3110400, 0x1097ea90 +0, 52, 52, 1, 3110400, 0xbc25f438 +1, 52, 52, 1, 3110400, 0xbc25f438 +0, 53, 53, 1, 3110400, 0xcab4f0d9 +1, 53, 53, 1, 3110400, 0xcab4f0d9 +0, 54, 54, 1, 3110400, 0xa740f58c +1, 54, 54, 1, 3110400, 0xa740f58c +0, 55, 55, 1, 3110400, 0x597de7df +1, 55, 55, 1, 3110400, 0x597de7df +0, 56, 56, 1, 3110400, 0x3b79f58d +1, 56, 56, 1, 3110400, 0x3b79f58d +0, 57, 57, 1, 3110400, 0x3705eb68 +1, 57, 57, 1, 3110400, 0x3705eb68 +0, 58, 58, 1, 3110400, 0x2292f7de +1, 58, 58, 1, 3110400, 0x2292f7de +0, 59, 59, 1, 3110400, 0x2171e805 +1, 59, 59, 1, 3110400, 0x2171e805 +0, 60, 60, 1, 3110400, 0x14a9f258 +0, 61, 61, 1, 3110400, 0xa545ef91 +1, 61, 61, 1, 3110400, 0xa545ef91 +[STREAM] +index=0 +codec_name=h264 +[/STREAM] +[STREAM] +index=1 +codec_name=h264 +[/STREAM] +[STREAM] +index=2 +codec_name=pcm_s32le +TAG:language=swe +TAG:title=swedish_silence +[/STREAM] +[STREAM] +index=3 +codec_name=pcm_s32be +TAG:language=nor +TAG:title=norwegian_silence +[/STREAM]