From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6CC334DC80 for ; Wed, 4 Jun 2025 12:16:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9845D68D20B; Wed, 4 Jun 2025 15:15:47 +0300 (EEST) Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 308B668CA77 for ; Wed, 4 Jun 2025 15:15:41 +0300 (EEST) Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a5232c6ae8so193055f8f.3 for ; Wed, 04 Jun 2025 05:15:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749039340; x=1749644140; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gCqp6Hp3Woro8Ybr9iFBUDTu6Yw9SdBvHWSTUUZexZw=; b=cB6k/wOe9gF+MWszem58363jxJdndf3gFCZXbEcw63+BZidaOe9LVnwkhR73FSOaMt 6ZrZwnJ/I//NylH27cGuHcbOn4q6jfxikxVJ0kBfVTCprFjbcyfC8P43uQBYpMKtDCdv 1fC3210WsnjhsNfPes6wJLEMJIN8QD5ibHoutWOQKUsoOtsFlvbpJ07N69UmEPlUHCAS /xjLm4EsanIWsBkLACBsBsqFlgSPiFB2yfpU05TBlgI3g4lsBqH905MstzmILwu8jnTR gHO7DOgbnyr+63ZEg7mMibK8r82x4fRnA6lAjcQqQ8Q04jBS+CzmlPUF8Ia2b75Sms5U 9czw== X-Gm-Message-State: AOJu0YyUBj6O1R4B+xrQcK+XcmLd9jSxsHfrmrgqsCDypiUCRjrQbGEY XgfcBrbeiPi6NZIF9ttMmZuNprEI17mndG/Jw7YFJrpwieM4GFQl32tHCqKbLpQMQHDmjAoXLfZ ngIJStLmQP4Sob6z+uK2Mb5COYOYOip/WCXnOlAyxbiCwVIB+LVjDF3aeIxCqkZC4vs8Yi03/2X aOVTLEYz9dW/pRXFarGE9sJDAc4huSIlLgudSXtw== X-Google-Smtp-Source: AGHT+IF5HVtwPOpcjr74Xy+sqxdCV2+j14qtswtUUzEWi0psiJndC9kHn8vjcANQU/XKrvLps4LN0KTYwzs= X-Received: from wmsr8.prod.google.com ([2002:a05:600c:8b08:b0:43d:56fa:9b95]) (user=maryla job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:25c3:b0:3a5:14e1:d9ec with SMTP id ffacd0b85a97d-3a51d98a7b1mr2039300f8f.51.1749039340390; Wed, 04 Jun 2025 05:15:40 -0700 (PDT) Date: Wed, 4 Jun 2025 14:15:36 +0200 In-Reply-To: <20250604121536.2941354-1-maryla@google.com> Mime-Version: 1.0 References: <20250604121536.2941354-1-maryla@google.com> X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250604121536.2941354-2-maryla@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/libaom: Add tests for HDR10+ metadata support 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: , From: Maryla Ustarroz-Calonge via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Maryla Ustarroz-Calonge 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: The new fate sample av1/metadata_hdr10_plus.ivf used in the second test is the output of the first test. Signed-off-by: Maryla Ustarroz-Calonge --- tests/Makefile | 1 + tests/fate-run.sh | 3 +- tests/fate/av1.mak | 11 +++++++ tests/ref/fate/libaom-hdr10-plus | 44 ++++++++++++++++++++++++++ tests/ref/fate/libaom-write-hdr10-plus | 44 ++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tests/fate/av1.mak create mode 100644 tests/ref/fate/libaom-hdr10-plus create mode 100644 tests/ref/fate/libaom-write-hdr10-plus diff --git a/tests/Makefile b/tests/Makefile index 505d7f9c6d..7e3812f1bd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -159,6 +159,7 @@ include $(SRC_PATH)/tests/fate/apng.mak include $(SRC_PATH)/tests/fate/apv.mak include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak +include $(SRC_PATH)/tests/fate/av1.mak include $(SRC_PATH)/tests/fate/bmp.mak include $(SRC_PATH)/tests/fate/build.mak include $(SRC_PATH)/tests/fate/caf.mak diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 5d904ab8bf..40fe07683f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -319,11 +319,12 @@ enc_external(){ enc_fmt=$2 enc_opt=$3 probe_opt=$4 + enc_opt_in=$5 srcfile=$(target_path $srcfile) encfile=$(target_path "${outdir}/${test}.${enc_fmt}") - ffmpeg -i $srcfile $enc_opt -f $enc_fmt -y $encfile || return + ffmpeg $enc_opt_in -i $srcfile $enc_opt -f $enc_fmt -y $encfile || return run ffprobe${PROGSUF}${EXECSUF} -bitexact $probe_opt $encfile || return } diff --git a/tests/fate/av1.mak b/tests/fate/av1.mak new file mode 100644 index 0000000000..7456ffd6de --- /dev/null +++ b/tests/fate/av1.mak @@ -0,0 +1,11 @@ +# Tests that transcoding VP9 WEBM to AV1 (libaom-av1) keeps HDR10+ metadata. +FATE_AV1_FFMPEG_FFPROBE-$(call ENCDEC, LIBAOM_AV1 VP9, IVF MATROSKA) += fate-libaom-write-hdr10-plus +fate-libaom-write-hdr10-plus: CMD = enc_external $(TARGET_SAMPLES)/mkv/hdr10_plus_vp9_sample.webm ivf "-map 0 -c:v libaom-av1 -cpu-used 8" "-show_frames -show_entries frame=side_data_list" + +# Tests that transcoding AV1 (libaom-av1) to AV1 (libaom-av1) keeps HDR10+ metadata. +FATE_AV1_FFMPEG_FFPROBE-$(call ENCDEC, LIBAOM_AV1, IVF) += fate-libaom-hdr10-plus +fate-libaom-hdr10-plus: CMD = enc_external $(TARGET_SAMPLES)/av1/metadata_hdr10_plus.ivf ivf "-map 0 -c:v libaom-av1 -cpu-used 8" "-show_frames -show_entries frame=side_data_list" "-c:v libaom-av1" + +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_AV1_FFMPEG_FFPROBE-yes) + +fate-av1: $(FATE_AV1_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/libaom-hdr10-plus b/tests/ref/fate/libaom-hdr10-plus new file mode 100644 index 0000000000..c03dda7e7f --- /dev/null +++ b/tests/ref/fate/libaom-hdr10-plus @@ -0,0 +1,44 @@ +[FRAME] +[SIDE_DATA] +side_data_type=HDR Dynamic Metadata SMPTE2094-40 (HDR10+) +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] +[/FRAME] \ No newline at end of file diff --git a/tests/ref/fate/libaom-write-hdr10-plus b/tests/ref/fate/libaom-write-hdr10-plus new file mode 100644 index 0000000000..c03dda7e7f --- /dev/null +++ b/tests/ref/fate/libaom-write-hdr10-plus @@ -0,0 +1,44 @@ +[FRAME] +[SIDE_DATA] +side_data_type=HDR Dynamic Metadata SMPTE2094-40 (HDR10+) +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] +[/FRAME] \ No newline at end of file -- 2.49.0.1204.g71687c7c1d-goog _______________________________________________ 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".