From 9314e58cd201cf9179db8d485d9ba9de4f649449 Mon Sep 17 00:00:00 2001 From: max_10 Date: Mon, 20 Dec 2021 16:23:02 +0100 Subject: [PATCH] - vuplus_arm: color profile (auto/bt709/bt470) added --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/videosettings.cpp | 14 ++++++++++++++ src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 18 insertions(+) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c37e57c8e..4cc1560fd 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2852,6 +2852,7 @@ videomenu.hdmi_colorimetry_auto auto videomenu.hdmi_colorimetry_bt2020ncl BT 2020 ncl videomenu.hdmi_colorimetry_bt2020cl BT 2020 cl videomenu.hdmi_colorimetry_bt709 BT 709 +videomenu.hdmi_colorimetry_bt470 BT 470 videomenu.hue Farbton videomenu.letterbox Letterbox videomenu.panscan Pan & Scan diff --git a/data/locale/english.locale b/data/locale/english.locale index 9463e56f1..d85101f32 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2852,6 +2852,7 @@ videomenu.hdmi_colorimetry_auto auto videomenu.hdmi_colorimetry_bt2020ncl BT 2020 NCL videomenu.hdmi_colorimetry_bt2020cl BT 2020 CL videomenu.hdmi_colorimetry_bt709 BT 709 +videomenu.hdmi_colorimetry_bt470 BT 470 videomenu.hue Hue videomenu.letterbox Letterbox videomenu.panscan Pan & Scan diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 113e0347a..9090a653f 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -362,6 +362,15 @@ CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_O { 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD } }; +#if BOXMODEL_VUPLUS_ARM +#define VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT 3 +const CMenuOptionChooser::keyval VIDEOMENU_HDMI_COLORIMETRY_OPTIONS[VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT] = +{ + { HDMI_COLORIMETRY_AUTO, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_AUTO }, + { HDMI_COLORIMETRY_BT709, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT709 }, + { HDMI_COLORIMETRY_BT470, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT470 } +}; +#else #define VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT 4 const CMenuOptionChooser::keyval VIDEOMENU_HDMI_COLORIMETRY_OPTIONS[VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT] = { @@ -371,6 +380,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_COLORIMETRY_OPTIONS[VIDEOMENU_HD { HDMI_COLORIMETRY_BT709, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT709 } }; #endif +#endif int CVideoSettings::showVideoSetup() { @@ -539,7 +549,11 @@ int CVideoSettings::showVideoSetup() videosetup->addItem(zm); } +#if BOXMODEL_VUPLUS_ARM + if (file_exists("/proc/stb/video/hdmi_colorspace")) +#else if (file_exists("/proc/stb/video/hdmi_colorimetry")) +#endif { CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_COLORIMETRY, &g_settings.hdmi_colorimetry, VIDEOMENU_HDMI_COLORIMETRY_OPTIONS, VIDEOMENU_HDMI_COLORIMETRY_OPTION_COUNT, true, this); hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_COLORIMETRY); diff --git a/src/system/locals.h b/src/system/locals.h index 467c759b2..98903da7c 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2879,6 +2879,7 @@ typedef enum LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020NCL, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020CL, LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT709, + LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT470, LOCALE_VIDEOMENU_HUE, LOCALE_VIDEOMENU_LETTERBOX, LOCALE_VIDEOMENU_PANSCAN, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 07ec7e094..b1e9cbe82 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2879,6 +2879,7 @@ const char * locale_real_names[] = "videomenu.hdmi_colorimetry_bt2020ncl", "videomenu.hdmi_colorimetry_bt2020cl", "videomenu.hdmi_colorimetry_bt709", + "videomenu.hdmi_colorimetry_bt470", "videomenu.hue", "videomenu.letterbox", "videomenu.panscan",