From 5e50fcbfe7229fc07adff55172d1531b84185188 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 5 Dec 2021 21:54:59 +0100 Subject: [PATCH] rename hdmi_mode -> hdmi_colorimetry Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/91225e1e36e27789e110cd1a2aeebd2c4f2b3493 Author: TangoCash Date: 2021-12-05 (Sun, 05 Dec 2021) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 12 ++++++------ libarmbox/video_lib.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index e148727..a9372a4 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -1238,21 +1238,21 @@ void cVideo::SetColorFormat(COLOR_FORMAT color_format) proc_put("/proc/stb/video/hdmi_colorspace", p, strlen(p)); } -void cVideo::SetHdmiMode(HDMI_MODE hdmi_mode) +void cVideo::SetHDMIColorimetry(HDMI_COLORIMETRY hdmi_colorimetry) { const char *p = NULL; - switch (hdmi_mode) + switch (hdmi_colorimetry) { - case HDMI_MODE_AUTO: + case HDMI_COLORIMETRY_AUTO: p = "auto"; break; - case HDMI_MODE_BT2020NCL: + case HDMI_COLORIMETRY_BT2020NCL: p = "bt2020ncl"; break; - case HDMI_MODE_BT2020CL: + case HDMI_COLORIMETRY_BT2020CL: p = "bt2020cl"; break; - case HDMI_MODE_BT709: + case HDMI_COLORIMETRY_BT709: p = "bt709"; break; } diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index c5fc60f..a1fa0bd 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -38,11 +38,11 @@ typedef enum typedef enum { - HDMI_MODE_AUTO, - HDMI_MODE_BT2020NCL, - HDMI_MODE_BT2020CL, - HDMI_MODE_BT709 -} HDMI_MODE; + HDMI_COLORIMETRY_AUTO, + HDMI_COLORIMETRY_BT2020NCL, + HDMI_COLORIMETRY_BT2020CL, + HDMI_COLORIMETRY_BT709 +} HDMI_COLORIMETRY; typedef enum { @@ -284,8 +284,8 @@ class cVideo int StartVBI(unsigned short) { return 0; }; int StopVBI(void) { return 0; }; void SetDemux(cDemux *dmx); + void SetHDMIColorimetry(HDMI_COLORIMETRY hdmi_colorimetry); void SetColorFormat(COLOR_FORMAT color_format); - void SetHdmiMode(HDMI_MODE hdmi_mode); bool GetScreenImage(unsigned char *&data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false); };