From patchwork Thu Mar 30 02:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp949463pzb; Wed, 29 Mar 2023 19:06:23 -0700 (PDT) X-Google-Smtp-Source: AKy350bCyzGDmwiDYk2yDWjmWu35zN3A4KOmyJmEXywgtZbobtb+WVau+ckCeymrVWliTZf7P1sN X-Received: by 2002:a17:906:3c56:b0:92b:e3f0:275f with SMTP id i22-20020a1709063c5600b0092be3f0275fmr19145866ejg.40.1680141982961; Wed, 29 Mar 2023 19:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680141982; cv=none; d=google.com; s=arc-20160816; b=VhBrqIxLugVB1shI6AdVgLElXwRLhifoaiZ1YiotfvyPg5j5dW14lUxLhY33A3HmRA hExb6+IzZaRRmIPSVPKfFus3U4JcLz0G4cChOKQz1ehfFgw8Lqhg7kwmmpgOxw0j5Pf8 aYRNNIZ4NcwKRNqT+Ql6iltDwkx+SzOZufjBi5vLjf+c4L61qRlRexMaObZzj4VHgs6h /A4+QPvOHQXzX5uT2doLHGCH1tdihEF2VXPFZPoj8nuJ4wJatHmQUyoKzOGk2wDQpw2p 4I+Q0aJ1NrehepotKWmC1LuZcIPbiGScjQzCHkKlsL5SsM8Y+ybURGBCCht4/u6Xwr7F mwwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=rQYbW78wLZIpT1ViZ0m+kPDGZSXkQNhqsHgo0E3maOg=; b=UC87vZySHcNUIGKGgqa/l2lLsWPBPmfmsdBXdh1cqsdvgqcHxmnfZ816twS5ek/KkI tZ7cTJ/e8HNwLHLHZrQX92YTe29vlfSc8dfSr5wQSgP7Mxg7MhLp2wZGoCk5JT8fNwpH NdEOAa8HsC+jak0E0DdwSqlIxofPlaUg5eDdj0MyeX3+g0Dro8tufeiEJDKVkD8SFXKe K+PZE8hZFpB5W8/IS28mq1n6peQs36aJ78nP6YKio8Gabk8wCQZdVYxLmgtizBbUK8oI k44kKsfSuQ1+lyDxjU1pEgSuVOCqle4MkKYD1W1Qz4L0qKLqwYUGPX7ztIAbcXWBV2kz SvOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EX8dAnmG; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f20-20020a17090624d400b00933260c6385si31995140ejb.230.2023.03.29.19.06.22; Wed, 29 Mar 2023 19:06:22 -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=@gmail.com header.s=20210112 header.b=EX8dAnmG; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E96E68C4CA; Thu, 30 Mar 2023 05:05:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7656D68C496 for ; Thu, 30 Mar 2023 05:05:28 +0300 (EEST) Received: by mail-ot1-f50.google.com with SMTP id 6-20020a9d0106000000b006a177038dfeso104028otu.7 for ; Wed, 29 Mar 2023 19:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680141926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LJI+0OcuPjREt0neNq/Tq8A/dSxYx9VxkorsjRpShfE=; b=EX8dAnmG5tY7EtrE2zmSLba5HKZ86l84SFxvpvr/LxM41X4BjCs1hKA5r8JlLBONQG 9SuhKoAkvEMMuYSoYE1N3B/gLJCox3o02Rczt1M6nXODiuufOuWZ+HR+ZMcCMXp/LoVH yn+Jgml+So/8D7o/7lIGokialtOwoz0cFICVsVZHZGAYmIpUrs599zsCNv+K42EewpEf i2s6C21X2+pOWvCcS/nK8Cr3MOtYrfSFxSwEGROHooS/eBGquXPlJ9aham6A4wmykB5y 3D67zf+v9TVtBmxTtrA8EJHu6rSuksbFEuNGEhWfA8yUInpBMghOr26+KBp7ntLv/E2v DkVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680141926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LJI+0OcuPjREt0neNq/Tq8A/dSxYx9VxkorsjRpShfE=; b=Xb3usLBrrsSK/+SE4jT1w6jZEH0BYPYoSRbm912FYfvYTab7APFRaNDETC/kK7Bziy xceoPLQ4H3qtzqm1854ox3p+7JrjcXz9WffQ3FJxaiHA+O6iF9DE2ISkKMQd4eoFXL/e RgkALkVQLbmMIZP0hDKSR0ACxZaqG2PmrVtXG+UzUWIKgbx+Opsb7C22FIr55mWFEnBn oLTWraMpWypp4X+evu0cbk+OVdTgftXT2m34ll1kt0I0YorXlcDBdc0NdhvWC+egaXoY GSoWeLWtVghxuHgOUuxdkasZmLig+SSFWB8nsS/abVOBMlAgR9uS7U/VDdslAtiq89pd fZyQ== X-Gm-Message-State: AO0yUKWHTvoN3iSc/u0ejOSkvGi12dCGdXimeZZuYNJufW+f49t9GXoa 4Yjedx/n9wDjHw8EYArr4Ia2cHq/2Gw= X-Received: by 2002:a9d:6ac9:0:b0:69f:abf3:ae8a with SMTP id m9-20020a9d6ac9000000b0069fabf3ae8amr9507148otq.3.1680141926542; Wed, 29 Mar 2023 19:05:26 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f23-20020a9d5e97000000b00684152e9ff2sm14221540otl.0.2023.03.29.19.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 19:05:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2023 23:04:48 -0300 Message-Id: <20230330020448.9146-7-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230330020448.9146-1-jamrial@gmail.com> References: <20230330020448.9146-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 7/7] fate/matroska: add HDR10+ muxing tests 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 63VO6/eTD5TL Signed-off-by: James Almer --- tests/fate/matroska.mak | 8 +++ tests/ref/fate/matroska-hdr10-plus-remux | 63 ++++++++++++++++++++++++ tests/ref/fate/webm-hdr10-plus-remux | 63 ++++++++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 tests/ref/fate/matroska-hdr10-plus-remux create mode 100644 tests/ref/fate/webm-hdr10-plus-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 39137ad4be..a2e43c7c3a 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -217,6 +217,14 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \ += fate-webm-webvtt-remux fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32" +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, VP9_PARSER) \ + += fate-webm-hdr10-plus-remux +fate-webm-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.mkv webm "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets" + +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP9_PARSER) \ + += fate-matroska-hdr10-plus-remux +fate-matroska-hdr10-plus-remux: CMD = transcode webm $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.mkv matroska "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets" + FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MATROSKA_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/matroska-hdr10-plus-remux b/tests/ref/fate/matroska-hdr10-plus-remux new file mode 100644 index 0000000000..bb0580db33 --- /dev/null +++ b/tests/ref/fate/matroska-hdr10-plus-remux @@ -0,0 +1,63 @@ +0f941512f69b1cc0ac27f3375e56a0cc *tests/data/fate/matroska-hdr10-plus-remux.matroska +13892 tests/data/fate/matroska-hdr10-plus-remux.matroska +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: vp9 +#dimensions 0: 1280x720 +#sar 0: 1/1 +0, 0, 0, 40, 13350, 0x5f64e443, S=1, 11304 +[PACKET] +codec_type=video +stream_index=0 +pts=0 +pts_time=0.000000 +dts=0 +dts_time=0.000000 +duration=40 +duration_time=0.040000 +size=13350 +pos=436 +flags=K__ +[SIDE_DATA] +side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) +application version=1 +num_windows=1 +targeted_system_display_maximum_luminance=400/1 +maxscl=3340/100000 +maxscl=2870/100000 +maxscl=2720/100000 +average_maxrgb=510/100000 +num_distribution_maxrgb_percentiles=9 +distribution_maxrgb_percentage=1 +distribution_maxrgb_percentile=30/100000 +distribution_maxrgb_percentage=5 +distribution_maxrgb_percentile=2940/100000 +distribution_maxrgb_percentage=10 +distribution_maxrgb_percentile=255/100000 +distribution_maxrgb_percentage=25 +distribution_maxrgb_percentile=70/100000 +distribution_maxrgb_percentage=50 +distribution_maxrgb_percentile=1340/100000 +distribution_maxrgb_percentage=75 +distribution_maxrgb_percentile=1600/100000 +distribution_maxrgb_percentage=90 +distribution_maxrgb_percentile=1850/100000 +distribution_maxrgb_percentage=95 +distribution_maxrgb_percentile=1950/100000 +distribution_maxrgb_percentage=99 +distribution_maxrgb_percentile=2940/100000 +fraction_bright_pixels=1/1000 +knee_point_x=0/4095 +knee_point_y=0/4095 +num_bezier_curve_anchors=9 +bezier_curve_anchors=102/1023 +bezier_curve_anchors=205/1023 +bezier_curve_anchors=307/1023 +bezier_curve_anchors=410/1023 +bezier_curve_anchors=512/1023 +bezier_curve_anchors=614/1023 +bezier_curve_anchors=717/1023 +bezier_curve_anchors=819/1023 +bezier_curve_anchors=922/1023 +[/SIDE_DATA] +[/PACKET] diff --git a/tests/ref/fate/webm-hdr10-plus-remux b/tests/ref/fate/webm-hdr10-plus-remux new file mode 100644 index 0000000000..d8dbb93598 --- /dev/null +++ b/tests/ref/fate/webm-hdr10-plus-remux @@ -0,0 +1,63 @@ +30923c8d916f5719f62727f24957974f *tests/data/fate/webm-hdr10-plus-remux.webm +13843 tests/data/fate/webm-hdr10-plus-remux.webm +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: vp9 +#dimensions 0: 1280x720 +#sar 0: 1/1 +0, 0, 0, 40, 13350, 0x5f64e443, S=1, 11304 +[PACKET] +codec_type=video +stream_index=0 +pts=0 +pts_time=0.000000 +dts=0 +dts_time=0.000000 +duration=40 +duration_time=0.040000 +size=13350 +pos=393 +flags=K__ +[SIDE_DATA] +side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) +application version=1 +num_windows=1 +targeted_system_display_maximum_luminance=400/1 +maxscl=3340/100000 +maxscl=2870/100000 +maxscl=2720/100000 +average_maxrgb=510/100000 +num_distribution_maxrgb_percentiles=9 +distribution_maxrgb_percentage=1 +distribution_maxrgb_percentile=30/100000 +distribution_maxrgb_percentage=5 +distribution_maxrgb_percentile=2940/100000 +distribution_maxrgb_percentage=10 +distribution_maxrgb_percentile=255/100000 +distribution_maxrgb_percentage=25 +distribution_maxrgb_percentile=70/100000 +distribution_maxrgb_percentage=50 +distribution_maxrgb_percentile=1340/100000 +distribution_maxrgb_percentage=75 +distribution_maxrgb_percentile=1600/100000 +distribution_maxrgb_percentage=90 +distribution_maxrgb_percentile=1850/100000 +distribution_maxrgb_percentage=95 +distribution_maxrgb_percentile=1950/100000 +distribution_maxrgb_percentage=99 +distribution_maxrgb_percentile=2940/100000 +fraction_bright_pixels=1/1000 +knee_point_x=0/4095 +knee_point_y=0/4095 +num_bezier_curve_anchors=9 +bezier_curve_anchors=102/1023 +bezier_curve_anchors=205/1023 +bezier_curve_anchors=307/1023 +bezier_curve_anchors=410/1023 +bezier_curve_anchors=512/1023 +bezier_curve_anchors=614/1023 +bezier_curve_anchors=717/1023 +bezier_curve_anchors=819/1023 +bezier_curve_anchors=922/1023 +[/SIDE_DATA] +[/PACKET]