From 9aa9f8432a3057144aefc4d0a93522c8c05af715 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Thu, 5 Oct 2017 12:52:53 +0200 Subject: [PATCH] adding 4k video settings for armbox Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3b2bb3f3ca936855b549da3720f6174e5691a83b Author: TangoCash Date: 2017-10-05 (Thu, 05 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 21 +++++++++++++++++++++ src/system/settings.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 86a2e30d7..079840f64 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -269,6 +269,27 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, { -1, NONEXISTANT_LOCALE, "Auto" } }; +#elif HAVE_ARM_HARDWARE +CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = +{ + { -1, NONEXISTANT_LOCALE, "SECAM" }, + { VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" }, + { VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" }, + { VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" }, + { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, + { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, + { VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" }, + { -1, NONEXISTANT_LOCALE, "NTSC" }, + { -1, NONEXISTANT_LOCALE, "480p" }, + { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, + { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, + { VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" }, + { VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" }, + { VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" }, + { VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" }, + { VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" }, + { -1, NONEXISTANT_LOCALE, "Auto" } +}; #else /* generic PC -> 4 different resolutions, 480, 576, 720 and 1080 lines */ diff --git a/src/system/settings.h b/src/system/settings.h index 7ad7b3ec2..33ccb0d7e 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -48,6 +48,8 @@ #ifdef BOXMODEL_CS_HD2 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16 +#elif HAVE_ARM_HARDWARE +#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 17 #else #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13 #endif