Revert "osd_helpers.cpp: remove unneeded #ifdef conditions"

This reverts commit d7fdaaa400.
This commit is contained in:
Markus Volk
2020-03-10 00:12:56 +01:00
parent 0e1af4c81b
commit 5f613f49c0

View File

@@ -144,16 +144,27 @@ int COsdHelpers::isVideoSystem1080(int res)
(res == VIDEO_STD_1080I50) || (res == VIDEO_STD_1080I50) ||
(res == VIDEO_STD_1080P30) || (res == VIDEO_STD_1080P30) ||
(res == VIDEO_STD_1080P24) || (res == VIDEO_STD_1080P24) ||
(res == VIDEO_STD_1080P25) || (res == VIDEO_STD_1080P25))
(res == VIDEO_STD_1080P50) || return true;
#ifdef BOXMODEL_CS_HD2
if ((res == VIDEO_STD_1080P50) ||
(res == VIDEO_STD_1080P60) || (res == VIDEO_STD_1080P60) ||
(res == VIDEO_STD_1080P2397) || (res == VIDEO_STD_1080P2397) ||
(res == VIDEO_STD_1080P2997) || (res == VIDEO_STD_1080P2997))
return true;
#endif
#if HAVE_ARM_HARDWARE
if ((res == VIDEO_STD_1080P50) ||
(res == VIDEO_STD_1080P60) ||
(res == VIDEO_STD_2160P24) || (res == VIDEO_STD_2160P24) ||
(res == VIDEO_STD_2160P25) || (res == VIDEO_STD_2160P25) ||
(res == VIDEO_STD_2160P30) || (res == VIDEO_STD_2160P30) ||
(res == VIDEO_STD_2160P50)) (res == VIDEO_STD_2160P50))
return true; return true;
#endif
#if 0 #if 0
/* for testing only */ /* for testing only */
if (res == VIDEO_STD_720P50) if (res == VIDEO_STD_720P50)