From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9652E49919 for ; Fri, 23 Feb 2024 14:36:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28B5368CC01; Fri, 23 Feb 2024 16:32:10 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32ACE68C6DE for ; Fri, 23 Feb 2024 16:31:36 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=TYpOJa5+; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 85BBA4D4D for ; Fri, 23 Feb 2024 15:31:34 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id gmv5o3E1-U5B for ; Fri, 23 Feb 2024 15:31:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698688; bh=9p74uk0jUyw7jc0XsOnbNDz1r7FUWlA/h6Jb10KQ9Pg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TYpOJa5++1PZ6a/DKM2CUotjJCxVbnsfFgNyB1+dh1Id2uGaNXqAwkDQE3Zyq3ofU A6tnnAH6+YVOj+cNJDogk8JC8DLZcP1Bod07Ymvf23Tf69YrIADS1GZoyFvm59oWpD +H3zfZcSGbuzOnCHUpt8w2k4YCYql/vlaNYx4MxCN9hva9Fl1LmMQ8xRg+GV0+gXNl TWYfbW0+zfO6JYJQlcY7efOqUXEC+AM5mYb6DjQRt/lMR7RZwxDDNvitABu0Uj7UHX +pJfORaPPthtSUX0oxtx8twYfMJLlyoncNb0TLbMcGa8ouSvQPTtk+ZnhZip4HW7m7 sSmB1hsEFU/AA== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 48E804D68 for ; Fri, 23 Feb 2024 15:31:28 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9B07E3A2767 for ; Fri, 23 Feb 2024 15:31:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:59:00 +0100 Message-ID: <20240223143115.16521-39-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 38/38] tests/fate/matroska: add tests for side data preference 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Cf. #10857 --- tests/fate/matroska.mak | 6 + tests/ref/fate/matroska-side-data-pref-codec | 255 ++++++++++++++++++ tests/ref/fate/matroska-side-data-pref-global | 255 ++++++++++++++++++ 3 files changed, 516 insertions(+) create mode 100644 tests/ref/fate/matroska-side-data-pref-codec create mode 100644 tests/ref/fate/matroska-side-data-pref-global diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 9ab747184a..e9433ce730 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -264,6 +264,12 @@ 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.webm matroska "-map 0 -c:v copy" "-map 0 -c:v copy" "-show_packets" +fate-matroska-side-data-pref-codec: CMD = run ffprobe$(PROGSSUF)$(EXESUF) $(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \ + -show_streams -show_frames -show_entries stream=stream_side_data:frame=frame_side_data_list +fate-matroska-side-data-pref-global: CMD = run ffprobe$(PROGSSUF)$(EXESUF) $(TARGET_SAMPLES)/mkv/hdr10tags-both.mkv \ + -show_streams -show_frames -show_entries stream=stream_side_data:frame=frame_side_data_list -side_data_prefer_global mastering_display_metadata,content_light_level +FATE_MATROSKA_FFPROBE-$(call ALLYES MATROSKA_DEMUXER HEVC_DECODER) += fate-matroska-side-data-pref-codec fate-matroska-side-data-pref-global + 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-side-data-pref-codec b/tests/ref/fate/matroska-side-data-pref-codec new file mode 100644 index 0000000000..d27134d0c9 --- /dev/null +++ b/tests/ref/fate/matroska-side-data-pref-codec @@ -0,0 +1,255 @@ +[FRAME] +[SIDE_DATA] +side_data_type=H.26[45] User Data Unregistered SEI message +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=35400/50000 +red_y=14599/50000 +green_x=8500/50000 +green_y=39850/50000 +blue_x=6550/50000 +blue_y=2300/50000 +white_point_x=15634/50000 +white_point_y=16450/50000 +min_luminance=10/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/FRAME] +[STREAM] +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:BPS=216040 +TAG:BPS-eng=216040 +TAG:DURATION=00:00:00.400000000 +TAG:DURATION-eng=00:00:00.400000000 +TAG:NUMBER_OF_FRAMES=10 +TAG:NUMBER_OF_FRAMES-eng=10 +TAG:NUMBER_OF_BYTES=10802 +TAG:NUMBER_OF_BYTES-eng=10802 +TAG:_STATISTICS_WRITING_APP=mkvmerge v9.0.1 ('Mask Machine') 64bit +TAG:_STATISTICS_WRITING_APP-eng=mkvmerge v9.0.1 ('Mask Machine') 64bit +TAG:_STATISTICS_WRITING_DATE_UTC=2019-02-14 12:53:10 +TAG:_STATISTICS_WRITING_DATE_UTC-eng=2019-02-14 12:53:10 +TAG:_STATISTICS_TAGS=BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES +TAG:_STATISTICS_TAGS-eng=BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[/STREAM] diff --git a/tests/ref/fate/matroska-side-data-pref-global b/tests/ref/fate/matroska-side-data-pref-global new file mode 100644 index 0000000000..4ff0c2d9db --- /dev/null +++ b/tests/ref/fate/matroska-side-data-pref-global @@ -0,0 +1,255 @@ +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=H.26[45] User Data Unregistered SEI message +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[FRAME] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[/FRAME] +[STREAM] +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:BPS=216040 +TAG:BPS-eng=216040 +TAG:DURATION=00:00:00.400000000 +TAG:DURATION-eng=00:00:00.400000000 +TAG:NUMBER_OF_FRAMES=10 +TAG:NUMBER_OF_FRAMES-eng=10 +TAG:NUMBER_OF_BYTES=10802 +TAG:NUMBER_OF_BYTES-eng=10802 +TAG:_STATISTICS_WRITING_APP=mkvmerge v9.0.1 ('Mask Machine') 64bit +TAG:_STATISTICS_WRITING_APP-eng=mkvmerge v9.0.1 ('Mask Machine') 64bit +TAG:_STATISTICS_WRITING_DATE_UTC=2019-02-14 12:53:10 +TAG:_STATISTICS_WRITING_DATE_UTC-eng=2019-02-14 12:53:10 +TAG:_STATISTICS_TAGS=BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES +TAG:_STATISTICS_TAGS-eng=BPS DURATION NUMBER_OF_FRAMES NUMBER_OF_BYTES +[SIDE_DATA] +side_data_type=Content light level metadata +max_content=1000 +max_average=300 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=11408507/16777216 +red_y=5368709/16777216 +green_x=2222981/8388608 +green_y=11576279/16777216 +blue_x=5033165/33554432 +blue_y=16106127/268435456 +white_point_x=10492471/33554432 +white_point_y=689963/2097152 +min_luminance=5368709/536870912 +max_luminance=1000/1 +[/SIDE_DATA] +[/STREAM] -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".