dm900 added, not yet ready

limes007 · May 25, 2024 · 37cd5ab · 37cd5ab
1 parent c7f040e
commit 37cd5ab
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -191,7 +191,7 @@ AC_ARG_WITH(boxtype,
 			BOXTYPE="duckbox"
 			BOXMODEL="$withval"
 		;;
-		hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus)
+		hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm900)
 			BOXTYPE="armbox"
 			BOXMODEL="$withval"
 		;;
@@ -209,7 +209,7 @@ AC_ARG_WITH(boxmodel,
 	AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi])
 AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, tf7700])
 AS_HELP_STRING([], [valid for spark: spark, spark7162])
-AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, hd60, hd61, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7, osmio4k, osmio4kplus, e4hdultra])
+AS_HELP_STRING([], [valid for armbox: bre2ze4k, hd51, hd60, hd61, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuzero4k, vuuno4kse, vuuno4k, h7, osmio4k, osmio4kplus, e4hdultra, dm900])
 AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm8000]),
 	[case "${withval}" in
 		ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|tf7700)
@@ -226,7 +226,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2, vuuno, vuultimo, dm820, dm
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus)
+		hd51|hd60|hd61|bre2ze4k|e4hdultra|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuzero4k|vuuno4kse|vuuno4k|h7|osmio4k|osmio4kplus|dm900)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
@@ -299,6 +299,7 @@ AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2")
 AM_CONDITIONAL(BOXMODEL_VUUNO, test "$BOXMODEL" = "vuuno")
 AM_CONDITIONAL(BOXMODEL_VUULTIMO, test "$BOXMODEL" = "vuultimo")
 AM_CONDITIONAL(BOXMODEL_DM820, test "$BOXMODEL" = "dm820")
+AM_CONDITIONAL(BOXMODEL_DM900, test "$BOXMODEL" = "dm900")
 AM_CONDITIONAL(BOXMODEL_DM8000, test "$BOXMODEL" = "dm8000")
 AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
 AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
@@ -310,6 +311,8 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL"
 AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$BOXMODEL" = "vusolo4k" -o "$BOXMODEL" = "vuduo4k" -o "$BOXMODEL" = "vuduo4kse" -o "$BOXMODEL" = "vuultimo4k" -o "$BOXMODEL" = "vuzero4k" -o "$BOXMODEL" = "vuuno4kse" -o "$BOXMODEL" = "vuuno4k")
 AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$BOXMODEL" = "vuduo" -o "$BOXMODEL" = "vuduo2" -o "$BOXMODEL" = "vuuno" -o "$BOXMODEL" = "vuultimo")
 
+AM_CONDITIONAL(BOXMODEL_DREAMBOX_ALL, test "$BOXMODEL" = "dm8000" -o "$BOXMODEL" = "dm820" -o "$BOXMODEL" = "dm900")
+
 if test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 	AC_DEFINE(HAVE_SH4_HARDWARE, 1, [building for a sh4 box])
@@ -397,6 +400,8 @@ elif test "$BOXMODEL" = "vuultimo"; then
 	AC_DEFINE(BOXMODEL_VUULTIMO, 1, [vuultimo])
 elif test "$BOXMODEL" = "dm820"; then
 	AC_DEFINE(BOXMODEL_DM820, 1, [dm820])
+elif test "$BOXMODEL" = "dm900"; then
+	AC_DEFINE(BOXMODEL_DM900, 1, [dm900])
 elif test "$BOXMODEL" = "dm8000"; then
 	AC_DEFINE(BOXMODEL_DM8000, 1, [dm8000])
 elif test "$BOXMODEL" = "h7"; then
@@ -429,6 +434,13 @@ case "$BOXMODEL" in
 		AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips])
 	;;
 esac
+
+# all dreambox BOXMODELs
+case "$BOXMODEL" in
+	dm8000|dm820|dm900)
+		AC_DEFINE(BOXMODEL_DREAMBOX_ALL, 1, [dreambox_all])
+	;;
+esac
 ])
 
 dnl backward compatiblity

diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c
@@ -221,6 +221,24 @@ hw_caps_t *get_hwcaps(void)
 	strcpy(caps.boxvendor, "AXAS");
 	strcpy(caps.boxname, "E4HD 4K ULTRA");
 	strcpy(caps.boxarch, "BCM7252S");
+#elif BOXMODEL_DM900
+	initialized = 1;
+	caps.has_CI = 1;
+	caps.can_cec = 1;
+	caps.can_shutdown = 1;
+	caps.display_xres = 400;
+	caps.display_yres = 240;
+	caps.display_type = HW_DISPLAY_GFX;
+	caps.display_can_deepstandby = 0;	// 0 because we use graphlcd/lcd4linux
+	caps.display_can_set_brightness = 0;	// 0 because we use graphlcd/lcd4linux
+	caps.display_has_statusline = 0;	// 0 because we use graphlcd/lcd4linux
+	caps.display_has_colon = 0;
+	caps.has_button_timer = 1;
+	caps.has_HDMI = 1;			// 2
+	caps.has_HDMI_input = 0;		// 1
+	strcpy(caps.boxvendor, "DM");
+	strcpy(caps.boxname, "900 UHD");
+	strcpy(caps.boxarch, "BCM7252S");
 #else // generic arm box
 	initialized = 1;
 	caps.has_CI = 1;

diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp
@@ -206,7 +206,11 @@ static const char *vid_modes[] =
 #define VIDEO_STREAMTYPE_MPEG4_Part2 4
 #define VIDEO_STREAMTYPE_VC1_SM 5
 #define VIDEO_STREAMTYPE_MPEG1 6
+#if BOXMODEL_DREAMBOX_ALL
+#define VIDEO_STREAMTYPE_H265_HEVC 22
+#else
 #define VIDEO_STREAMTYPE_H265_HEVC 7
+#endif
 #define VIDEO_STREAMTYPE_AVS 16
 
 ssize_t write_all(int fd, const void *buf, size_t count)