From patchwork Thu Feb 29 16:43:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 46670 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp720674pzb; Thu, 29 Feb 2024 08:45:39 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+d1BLcu4e2eeQvOxZUNdt6rqlLMEjRJn10MDXWJMJe28M6PGGaZKSQBpHT6CmIQEFgvZ4vanY1yc/tGelrJcFWhQN2EJEETZbBQ== X-Google-Smtp-Source: AGHT+IGoEr4oA1n4WEP+YkoSchvXI4SoRGuuzcGfUSPau1nm4zcM33G9LO85W2qDg/aPfQhX4B01 X-Received: by 2002:a17:906:f198:b0:a42:e079:f94d with SMTP id gs24-20020a170906f19800b00a42e079f94dmr2078033ejb.57.1709225139402; Thu, 29 Feb 2024 08:45:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709225139; cv=none; d=google.com; s=arc-20160816; b=V24fCiJ02+ZQiYI60NZfRpRCSd+9GWoFYLL6pwoAoj3U/eqmpIvU0pVtCV1q5t29AH a3dK6V64p+ZfK7q7D1NJAjrSJW0tuCIBx+qqnzyOh7Uj39EFhDWcVI6M8NpLT9DadoM1 zW43d8gFuajmwtLGsI3B7ksNxd+ZoubHBDEEBhZ0YBGywYOMgDUkH51NVIbcAn8ju0R8 GxJVKbljoCILjy9SqN7fpZOqnRCdIj382IRtvg70PJwaH6YmrPXarjb+jXLY7MD5Q8bP JScAND557r1YrbZYRJSm3fJJ9C3cLP7p7UfcXUS27Rk3oNFjBZOpqf67pnJdXBWBmxSK ViBw== 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=CylftrrC2nqwNvkUuTRnoeZlQvZ5hCChETg35ikNcx4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=vnF3ve2DLPL3xSplJijRaSlGR0g2s281V4AzeywWexKrRf3aTxtyEcitewno03uSUA 5GUj+86ebJKB+p0s2rx9jVFzaWJWqBho/hRxjD1Rz9VrC75vh832WuGjGLfuRLW8KFNk Ck6OknVhmll4ebGDkuh6qXy+M7/f4XNcdT5AKWSecmZkzk7qsi0zqJlLGVOXrWs5m3qo YntGi/HgvjqM0kx8K26kEjo1dfQsC482F70y54anq8iqzcAg5bGsKUzLSJVnkUOMs3+C Mxkwlamu1oLrETuTjya/q+XV2ea2Xs5kQqblSRFnhBO9Rc05wnJ9arQQENoTFtlc+8df IfbA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=K11IhXcy; 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 lj24-20020a170906f9d800b00a3eb466c344si699524ejb.697.2024.02.29.08.45.39; Thu, 29 Feb 2024 08:45:39 -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=@gmail.com header.s=20230601 header.b=K11IhXcy; 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 F11C468D226; Thu, 29 Feb 2024 18:43:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83C4F68D1E7 for ; Thu, 29 Feb 2024 18:43:24 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-513173e8191so1242545e87.1 for ; Thu, 29 Feb 2024 08:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709225004; x=1709829804; darn=ffmpeg.org; 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=hq3ogBtwGZYp2y5VBOgPMbIDSflrPRg/QPTX+SQjC+g=; b=K11IhXcyBVt+6Fquc+r3ZITrMYlnKRS6rIixKbI1Ahd2Y18p/KMOevynBnJiz33xOB 0Luut+XkXWTgxeJE59VzZqGxa09246mW4iYU5RrJM4KGrfcVeOrrMoUi+zLwBk/Tg0/X IAq6dI7M0C8LzxqmRE/cyduupRTq3WAZyEeUm5pXHlwvaNTfLYDghFkBK32pI63GvLRb wXgKtH8fycxCoCLJ0aviJoJgs0w8NmFfc0gaIYKfEnOwyXGu5dm6QjU5w+A9L8vrAOea AGRw+knN34RLbGOwEwv6cUF15U9d49Zj9jwxrOb9tej09OkQOZFkFOQb6M6ClALJdbzo Z7sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709225004; x=1709829804; 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=hq3ogBtwGZYp2y5VBOgPMbIDSflrPRg/QPTX+SQjC+g=; b=se4yjTotqxU8j1Y+j9tOloZQ6P/hyETZyyIA84YpFeQvX/aunqGGxFR4fh0ouBIqIK WGmzHj+fI/uAeS4E+x8aK/Nsybu3rOI+ARlnDALZRQkktpitLdDoWjzjh0Ibn/9u5YBy Nr2UI5JmQ5DV+ZvEje7Db2Jk1hPAusisFqg7Wpj0htkZUi5DSwOSzqaFLUd0JMnyhec4 BcdBUx/3qswOASxtUh0KZpKUm3/HfCMl9flcn/AiddjVBoAFym0yL4KZmNAQwlO6PetV flVKisM63eOjV5rs+zOitypZu3CW+8uYkcRa0T4SSl+iNl4k3OEIuezTxpj2nqcYRogT ujgQ== X-Gm-Message-State: AOJu0YwAOZe7ImRgRJdFJGHsp41b22yV0ntCWpXuseH9EQI3K94LJauY kOBVNpzT9khy8uF/XoDL3yH4EYKA+WDIiCnnAgie4HVpqbNP9ZHpQkjCVBAM X-Received: by 2002:a19:381c:0:b0:513:1ff9:2bb4 with SMTP id f28-20020a19381c000000b005131ff92bb4mr2000599lfa.30.1709225003743; Thu, 29 Feb 2024 08:43:23 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k6-20020ac24566000000b00513290734cbsm206248lfm.292.2024.02.29.08.43.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:43:23 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:43:00 +0200 Message-ID: <20240229164307.3535613-14-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240229164307.3535613-1-jeebjp@gmail.com> References: <20240229164307.3535613-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 13/14] avcodec/libx264: add support for writing out CLL and MDCV 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: PkMpUisXI23p Both of these two structures were first available with X264_BUILD 163, so make relevant functionality conditional on the version being at least such. Keep handle_side_data available in all cases as this way X264_init does not require additional version based conditions within it. Finally, add a FATE test which verifies that pass-through of the MDCV/CLL side data is working during encoding. --- configure | 2 + libavcodec/libx264.c | 79 ++++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libx264-hdr10 | 15 +++++++ 4 files changed, 101 insertions(+) create mode 100644 tests/ref/fate/libx264-hdr10 diff --git a/configure b/configure index bb5e630bad..f48cf46ffe 100755 --- a/configure +++ b/configure @@ -2527,6 +2527,7 @@ CONFIG_EXTRA=" jpegtables lgplv3 libx262 + libx264_hdr10 llauddsp llviddsp llvidencdsp @@ -6927,6 +6928,7 @@ enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && + check_cpp_condition libx264_hdr10 x264.h "X264_BUILD >= 163" && check_cpp_condition libx262 x264.h "X264_MPEG2" enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && require_cpp_condition libx265 x265.h "X265_BUILD >= 89" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 10d646bd76..effdcfdb37 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -25,6 +25,7 @@ #include "libavutil/eval.h" #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" @@ -871,6 +872,82 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) return AVERROR(EINVAL);\ } +#if CONFIG_LIBX264_HDR10 +static void handle_mdcv(x264_param_t *params, + const AVMasteringDisplayMetadata *mdcv) +{ + if (!mdcv->has_primaries && !mdcv->has_luminance) + return; + + params->mastering_display.b_mastering_display = 1; + + if (mdcv->has_primaries) { + int *const points[][2] = { + { + ¶ms->mastering_display.i_red_x, + ¶ms->mastering_display.i_red_y + }, + { + ¶ms->mastering_display.i_green_x, + ¶ms->mastering_display.i_green_y + }, + { + ¶ms->mastering_display.i_blue_x, + ¶ms->mastering_display.i_blue_y + }, + }; + + for (int i = 0; i < 3; i++) { + const AVRational *src = mdcv->display_primaries[i]; + int *dst[2] = { points[i][0], points[i][1] }; + + *dst[0] = av_rescale_q(1, src[0], (AVRational){ 1, 50000 }); + *dst[1] = av_rescale_q(1, src[1], (AVRational){ 1, 50000 }); + } + + params->mastering_display.i_white_x = + av_rescale_q(1, mdcv->white_point[0], (AVRational){ 1, 50000 }); + params->mastering_display.i_white_y = + av_rescale_q(1, mdcv->white_point[1], (AVRational){ 1, 50000 }); + } + + if (mdcv->has_luminance) { + params->mastering_display.i_display_max = + av_rescale_q(1, mdcv->max_luminance, (AVRational){ 1, 10000 }); + params->mastering_display.i_display_min = + av_rescale_q(1, mdcv->min_luminance, (AVRational){ 1, 10000 }); + } +} +#endif // CONFIG_LIBX264_HDR10 + +static void handle_side_data(AVCodecContext *avctx, x264_param_t *params) +{ +#if CONFIG_LIBX264_HDR10 + const AVFrameSideData *cll_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->frame_side_data, + avctx->nb_frame_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->frame_side_data, + avctx->nb_frame_side_data, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + + if (cll_sd) { + const AVContentLightMetadata *cll = + (AVContentLightMetadata *)cll_sd->data; + + params->content_light_level.i_max_cll = cll->MaxCLL; + params->content_light_level.i_max_fall = cll->MaxFALL; + + params->content_light_level.b_cll = 1; + } + + if (mdcv_sd) { + handle_mdcv(params, (AVMasteringDisplayMetadata *)mdcv_sd->data); + } +#endif // CONFIG_LIBX264_HDR10 +} + static av_cold int X264_init(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; @@ -1171,6 +1248,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) x4->params.vui.i_chroma_loc = avctx->chroma_sample_location - 1; + handle_side_data(avctx, &x4->params); + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak index d787941c16..4095a4b51a 100644 --- a/tests/fate/enc_external.mak +++ b/tests/fate/enc_external.mak @@ -7,5 +7,10 @@ FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER LIBDAV1D_DECO fate-libsvtav1-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of flat" +# test for x264 MDCV and CLL passthrough during encoding +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 HEVC, MOV, LIBX264_HDR10 HEVC_DEMUXER H264_DECODER) += fate-libx264-hdr10 +fate-libx264-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ + mp4 "-c:v libx264" "-show_frames -show_entries frame=side_data_list -of flat" + FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ENC_EXTERNAL-yes) fate-enc-external: $(FATE_ENC_EXTERNAL-yes) diff --git a/tests/ref/fate/libx264-hdr10 b/tests/ref/fate/libx264-hdr10 new file mode 100644 index 0000000000..99c11677f0 --- /dev/null +++ b/tests/ref/fate/libx264-hdr10 @@ -0,0 +1,15 @@ +frames.frame.0.side_data_list.side_data.0.side_data_type="H.26[45] User Data Unregistered SEI message" +frames.frame.0.side_data_list.side_data.1.side_data_type="Mastering display metadata" +frames.frame.0.side_data_list.side_data.1.red_x="13250/50000" +frames.frame.0.side_data_list.side_data.1.red_y="34500/50000" +frames.frame.0.side_data_list.side_data.1.green_x="7500/50000" +frames.frame.0.side_data_list.side_data.1.green_y="3000/50000" +frames.frame.0.side_data_list.side_data.1.blue_x="34000/50000" +frames.frame.0.side_data_list.side_data.1.blue_y="16000/50000" +frames.frame.0.side_data_list.side_data.1.white_point_x="15635/50000" +frames.frame.0.side_data_list.side_data.1.white_point_y="16450/50000" +frames.frame.0.side_data_list.side_data.1.min_luminance="50/10000" +frames.frame.0.side_data_list.side_data.1.max_luminance="10000000/10000" +frames.frame.0.side_data_list.side_data.2.side_data_type="Content light level metadata" +frames.frame.0.side_data_list.side_data.2.max_content=1000 +frames.frame.0.side_data_list.side_data.2.max_average=200