From 463d5b5a25425e7e6ddfe0c6139bff0d2c9e50b6 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 11 Feb 2024 17:49:36 +0100 Subject: nvidia wayland: add hdr metadata --- include/capture/kms_cuda.h | 1 + src/capture/kms_cuda.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ src/main.cpp | 1 + 3 files changed, 50 insertions(+) diff --git a/include/capture/kms_cuda.h b/include/capture/kms_cuda.h index 14ed333..5691f61 100644 --- a/include/capture/kms_cuda.h +++ b/include/capture/kms_cuda.h @@ -11,6 +11,7 @@ typedef struct { gsr_egl *egl; const char *display_to_capture; /* if this is "screen", then the first monitor is captured. A copy is made of this */ gsr_gpu_info gpu_inf; + bool hdr; } gsr_capture_kms_cuda_params; gsr_capture* gsr_capture_kms_cuda_create(const gsr_capture_kms_cuda_params *params); diff --git a/src/capture/kms_cuda.c b/src/capture/kms_cuda.c index f9a6a11..b3e8361 100644 --- a/src/capture/kms_cuda.c +++ b/src/capture/kms_cuda.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -51,6 +52,10 @@ typedef struct { gsr_color_conversion color_conversion; + AVCodecContext *video_codec_context; + AVMasteringDisplayMetadata *mastering_display_metadata; + AVContentLightMetadata *light_metadata; + gsr_monitor_rotation monitor_rotation; } gsr_capture_kms_cuda; @@ -142,6 +147,8 @@ static void monitor_callback(const gsr_monitor *monitor, void *userdata) { static int gsr_capture_kms_cuda_start(gsr_capture *cap, AVCodecContext *video_codec_context) { gsr_capture_kms_cuda *cap_kms = cap->priv; + cap_kms->video_codec_context = video_codec_context; + gsr_monitor monitor; cap_kms->monitor_id.num_connector_ids = 0; @@ -401,6 +408,44 @@ static gsr_kms_response_fd* find_cursor_drm(gsr_kms_response *kms_response) { return NULL; } +#define HDMI_STATIC_METADATA_TYPE1 0 +#define HDMI_EOTF_SMPTE_ST2084 2 + +static bool hdr_metadata_is_supported_format(const struct hdr_output_metadata *hdr_metadata) { + return hdr_metadata->metadata_type == HDMI_STATIC_METADATA_TYPE1 && + hdr_metadata->hdmi_metadata_type1.metadata_type == HDMI_STATIC_METADATA_TYPE1 && + hdr_metadata->hdmi_metadata_type1.eotf == HDMI_EOTF_SMPTE_ST2084; +} + +static void gsr_capture_kms_vaapi_set_hdr_metadata(gsr_capture_kms_cuda *cap_kms, AVFrame *frame, gsr_kms_response_fd *drm_fd) { + if(!cap_kms->mastering_display_metadata) + cap_kms->mastering_display_metadata = av_mastering_display_metadata_create_side_data(frame); + + if(!cap_kms->light_metadata) + cap_kms->light_metadata = av_content_light_metadata_create_side_data(frame); + + if(cap_kms->mastering_display_metadata) { + for(int i = 0; i < 3; ++i) { + cap_kms->mastering_display_metadata->display_primaries[i][0] = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.display_primaries[i].x, 50000); + cap_kms->mastering_display_metadata->display_primaries[i][1] = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.display_primaries[i].y, 50000); + } + + cap_kms->mastering_display_metadata->white_point[0] = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.white_point.x, 50000); + cap_kms->mastering_display_metadata->white_point[1] = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.white_point.y, 50000); + + cap_kms->mastering_display_metadata->min_luminance = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.min_display_mastering_luminance, 10000); + cap_kms->mastering_display_metadata->max_luminance = av_make_q(drm_fd->hdr_metadata.hdmi_metadata_type1.max_display_mastering_luminance, 1); + + cap_kms->mastering_display_metadata->has_primaries = cap_kms->mastering_display_metadata->display_primaries[0][0].num > 0; + cap_kms->mastering_display_metadata->has_luminance = cap_kms->mastering_display_metadata->max_luminance.num > 0; + } + + if(cap_kms->light_metadata) { + cap_kms->light_metadata->MaxCLL = drm_fd->hdr_metadata.hdmi_metadata_type1.max_cll; + cap_kms->light_metadata->MaxFALL = drm_fd->hdr_metadata.hdmi_metadata_type1.max_fall; + } +} + static vec2i swap_vec2i(vec2i value) { int tmp = value.x; value.x = value.y; @@ -461,6 +506,9 @@ static int gsr_capture_kms_cuda_capture(gsr_capture *cap, AVFrame *frame) { if(!capture_is_combined_plane && cursor_drm_fd && cursor_drm_fd->connector_id != drm_fd->connector_id) cursor_drm_fd = NULL; + if(drm_fd->has_hdr_metadata && cap_kms->params.hdr && hdr_metadata_is_supported_format(&drm_fd->hdr_metadata)) + gsr_capture_kms_vaapi_set_hdr_metadata(cap_kms, frame, drm_fd); + const intptr_t img_attr[] = { //EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_LINUX_DRM_FOURCC_EXT, drm_fd->pixel_format,//cap_kms->params.egl->pixel_format, ARGB8888 diff --git a/src/main.cpp b/src/main.cpp index 9dff159..7277b11 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1477,6 +1477,7 @@ static gsr_capture* create_capture_impl(const char *window_str, const char *scre kms_params.egl = &egl; kms_params.display_to_capture = window_str; kms_params.gpu_inf = gpu_inf; + kms_params.hdr = video_codec_is_hdr(video_codec); capture = gsr_capture_kms_cuda_create(&kms_params); if(!capture) _exit(1); -- cgit v1.2.3