Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit

lib/hardware/coolstream/Makefile.am

@@ -1,12 +1,9 @@
-noinst_LIBRARIES = libhwcaps.a
-
 AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
 
-if BOXMODEL_CS_HD2
-AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream
-else
-AM_CPPFLAGS = -I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream
-endif
+AM_CPPFLAGS = \
+	@HWLIB_CFLAGS@
+
+noinst_LIBRARIES = libhwcaps.a
 
 libhwcaps_a_SOURCES = \
 	hardware_caps.cpp

lib/hardware/coolstream/hardware_caps.cpp

@@ -18,6 +18,7 @@ hw_caps_t *get_hwcaps(void) {
 	if (initialized)
 		return ∩︀
 	int rev = cs_get_revision();
+	int chip = cs_get_chip_type();
 	caps.has_fan = (rev < 8);
 	caps.has_HDMI = 1;
 	caps.has_SCART = (rev != 10);
@@ -33,7 +34,6 @@ hw_caps_t *get_hwcaps(void) {
 	caps.can_ps_14_9 = 1;
 	caps.force_tuner_2G = 0;
 	strcpy(caps.boxvendor, "Coolstream");
-	/* list of boxnames from neutrinoyparser.cpp */
 	strcpy(caps.boxarch, "Nevis");
 	switch (rev) {
 	case 6:
@@ -41,7 +41,7 @@ hw_caps_t *get_hwcaps(void) {
 		strcpy(caps.boxname, "HD1");
 		caps.force_tuner_2G = 1;
 		break;
-	case 8:
+	case 8: // TODO: Neo2 - Twin
 		strcpy(caps.boxname, "Neo");
 		caps.force_tuner_2G = 1;
 		break;
@@ -54,13 +54,29 @@ hw_caps_t *get_hwcaps(void) {
 		caps.force_tuner_2G = 1;
 		break;
 	case 11:
-		strcpy(caps.boxname, "Trinity");
-		strcpy(caps.boxarch, "Shiner");
+		if (chip == CS_CHIP_SHINER)
+		{
+			strcpy(caps.boxname, "Trinity");
+			strcpy(caps.boxarch, "Shiner");
+		}
+		else
+		{
+			strcpy(caps.boxname, "Trinity V2");
+			strcpy(caps.boxarch, "Kronos");
+		}
 		break;
 	case 12:
 		strcpy(caps.boxname, "Zee2");
 		strcpy(caps.boxarch, "Kronos");
 		break;
+	case 13:
+		strcpy(caps.boxname, "Link");
+		strcpy(caps.boxarch, "Kronos");
+		break;
+	case 14:
+		strcpy(caps.boxname, "Trinity Duo");
+		strcpy(caps.boxarch, "Kronos");
+		break;
 	default:
 		strcpy(caps.boxname, "UNKNOWN_BOX");
 		strcpy(caps.boxarch, "Unknown");
@@ -69,4 +85,3 @@ hw_caps_t *get_hwcaps(void) {
 	initialized = 1;
 	return &caps;
 }
-

lib/hardware/coolstream/hd1/libcoolstream/cs_api.h

@@ -17,6 +17,13 @@
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
 
+#define CS_CHIP_APOLLO			0x8490
+#define CS_CHIP_SHINER			0x8470
+#define CS_CHIP_KRONOS_S		0x7540
+#define CS_CHIP_KRONOS_C		0x7550
+#define CS_CHIP_KRONOS_IP		0x7530
+#define CS_CHIP_NEVIS			0x0000	/* workaround for nonexistant nevis chiptype */
+
 enum CS_LOG_MODULE {
 	CS_LOG_CI	= 0,
 	CS_LOG_HDMI_CEC,
@@ -71,6 +78,29 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config);
 // Serial nr and revision accessors
 unsigned long long cs_get_serial(void);
 unsigned int cs_get_revision(void);
+/* Dummy function for compatibility with hd2 */
+unsigned int cs_get_chip_type(void);
 
 
+// library version functions
+typedef struct cs_libversion_t
+{
+    int    vMajor;
+    int    vMinor;
+    int    vPatch;
+    char   vStr[16];
+    char   vGit[41];
+    char   vGitDescribe[64];
+    time_t vGitTime;
+} cs_libversion_struct_t;
+
+void cs_get_lib_version(cs_libversion_t *ver);
+
+/* return value:
+   -------------
+   1 Library version newer than given version
+   0 library version equals given version
+  -1 Library version older than given version */
+int  cs_compare_lib_versions(int Major, int Minor, int Patch);
+
 #endif //__CS_API_H_

lib/hardware/coolstream/hd2/libcoolstream/cs_api.h

@@ -26,6 +26,7 @@ typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
 #define CS_CHIP_KRONOS_S		0x7540
 #define CS_CHIP_KRONOS_C		0x7550
 #define CS_CHIP_KRONOS_IP		0x7530
+#define CS_CHIP_NEVIS			0x0000	/* workaround for nonexistant nevis chiptype */
 
 enum CS_LOG_MODULE {
 	CS_LOG_CI	= 0,
@@ -49,6 +50,7 @@ enum CS_LOG_MODULE {
 // Initialization
 void cs_api_init(void);
 void cs_api_exit(void);
+/* Preliminary function (for compatibility with older neutrino sources) */
 void cs_new_auto_videosystem();
 
 // Memory helpers
@@ -90,4 +92,25 @@ bool cs_box_has_ci(void);
 unsigned int cs_get_chip_id(void);
 unsigned int cs_get_chip_rev_id(void);
 
+// library version functions
+typedef struct cs_libversion_t
+{
+    int    vMajor;
+    int    vMinor;
+    int    vPatch;
+    char   vStr[16];
+    char   vGit[41];
+    char   vGitDescribe[64];
+    time_t vGitTime;
+} cs_libversion_struct_t;
+
+void cs_get_lib_version(cs_libversion_t *ver);
+
+/* return value:
+   -------------
+   1 Library version newer than given version
+   0 library version equals given version
+  -1 Library version older than given version */
+int  cs_compare_lib_versions(int Major, int Minor, int Patch);
+
 #endif //__CS_API_H_

lib/hardware/coolstream/hd2/libcoolstream/video_cs.h

@@ -152,6 +152,12 @@ typedef enum
    VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
 } VIDEO_CONTROL;
 
+typedef struct cs_vs_format_t
+{
+	char formatHD[16];
+	char formatSD[16];
+} cs_vs_format_struct_t;
+
 class cDemux;
 class cAudio;
 
@@ -244,8 +250,12 @@ public:
 	int64_t GetPTS(void);
 	int Flush(void);
 
-	/* set video_system */
+	/* get video system infos */
 	int GetVideoSystem();
+	/* when system = -1 then use current video system */
+	void GetVideoSystemFormatName(cs_vs_format_t* format, int system = -1);
+
+	/* set video_system */
 	int SetVideoSystem(int video_system, bool remember = true);
 	int SetStreamType(VIDEO_FORMAT type);
 	void SetSyncMode(AVSYNC_TYPE mode);