Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



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

lib/libcoolstream/audio_cs.h

@@ -56,6 +56,7 @@ typedef enum
 	HDMI_AUDIO_FMT_ATRAC
 } HDMI_AUDIO_FORMAT;
 
+#define CS_MAX_AUDIO_DECODERS	1
 #define CS_MAX_AUDIO_FORMATS 10
 
 typedef struct cs_audio_format {
@@ -68,8 +69,15 @@ typedef struct cs_audio_caps {
 	cs_audio_format_t formats[CS_MAX_AUDIO_FORMATS];
 } cs_audio_caps_t;
 
+class cDemux;
+class cVideo;
+
 class cAudio {
 private:
+	static cAudio		*instance[CS_MAX_AUDIO_DECODERS];
+	unsigned int		unit;
+	cDemux			*demux;
+	cVideo			*video;
 	CS_AUDIO_PDATA	*privateData;
 	//unsigned int		cEncodedDataOnSPDIF, cEncodedDataOnHDMI;
 	bool			muted;
@@ -92,6 +100,8 @@ private:
 	bool spdifDD;
 	bool hasMuteScheduled;
 	bool analogOut;
+	//
+	cAudio(unsigned int Unit);
 public:
 	/* construct & destruct */
 	cAudio(void *hBuffer, void *encHD, void *encSD);
@@ -149,6 +159,9 @@ public:
 	bool IsHdmiAudioFormatSupported(HDMI_AUDIO_FORMAT format);
 	void SetHdmiDD(HDMI_ENCODED_MODE type);
 	bool IsHdmiDTSSupported(void);
+	void SetDemux(cDemux *Demux);
+	void SetVideo(cVideo *Video);
+	static cAudio *GetDecoder(unsigned int Unit);
 };
 
 #endif //__AUDIO_CS_H_

lib/libcoolstream/ca_cs.h

@@ -11,8 +11,8 @@
 #define __CA_CS_H_
 
 #include <OpenThreads/Thread>
-#include "cs_types.h"
 #include <vector>
+#include "cs_types.h"
 
 enum CA_INIT_MASK {
 	CA_INIT_SC	= 1,
@@ -23,7 +23,7 @@ enum CA_INIT_MASK {
 enum CA_SLOT_TYPE {
 	CA_SLOT_TYPE_SMARTCARD,
 	CA_SLOT_TYPE_CI,
-	CA_SLOT_TYPE_ALL
+	CA_SLOT_TYPE_ALL,
 };
 
 enum CA_MESSAGE_FLAGS {
@@ -49,7 +49,7 @@ enum CA_MESSAGE_FLAGS {
 	CA_MESSAGE_HAS_PARAM1_LONG	= (1 << 19),
 	CA_MESSAGE_HAS_PARAM2_LONG	= (1 << 20),
 	CA_MESSAGE_HAS_PARAM3_LONG	= (1 << 21),
-	CA_MESSAGE_HAS_PARAM4_LONG	= (1 << 22)
+	CA_MESSAGE_HAS_PARAM4_LONG	= (1 << 22),
 };
 
 enum CA_MESSAGE_MSGID {
@@ -72,7 +72,7 @@ enum CA_MESSAGE_MSGID {
 	CA_MESSAGE_MSG_EMM_ARRIVED,
 	CA_MESSAGE_MSG_CHANNEL_CHANGE,
 	CA_MESSAGE_MSG_GUI_READY,
-	CA_MESSAGE_MSG_EXIT
+	CA_MESSAGE_MSG_EXIT,
 };
 
 typedef struct CA_MESSAGE {

lib/libcoolstream/dmx_cs.h

@@ -36,8 +36,12 @@ typedef enum {
 } DMX_CHANNEL_TYPE;
 
 class cDemuxData;
+class cVideo;
+class cAudio;
 
 class cDemux {
+friend class cVideo;
+friend class cAudio;
 private:
 	DMX_CHANNEL_TYPE	type;
 	int			timeout;

lib/libcoolstream/playback_cs.h

@@ -11,6 +11,7 @@
 #define __PLAYBACK_CS_H_
 
 #include <string>
+#include <stdint.h>
 
 typedef enum {
 	PLAYMODE_TS = 0,

lib/libcoolstream/record_cs.h

@@ -14,6 +14,10 @@
 
 class cRecordData;
 
+#define REC_STATUS_OK 0
+#define REC_STATUS_SLOW 1
+#define REC_STATUS_OVERFLOW 2
+
 class cRecord {
 private:
 	cRecordData * rd;
@@ -29,6 +33,8 @@ public:
 	bool Start(int fd, unsigned short vpid, unsigned short * apids, int numapids, uint64_t chid);
 	bool Stop(void);
 	bool AddPid(unsigned short pid);
+	int  GetStatus();
+	void ResetStatus();
 };
 
 #endif // __RECORD_CS_H_

lib/libcoolstream/video_cs.h

@@ -10,11 +10,13 @@
 #ifndef __VIDEO_CS_H_
 #define __VIDEO_CS_H_
 
-#include <coolstream/cs_vfd.h>
+#include <coolstream/cs_frontpanel.h>
 #include <coolstream/control.h>
 
 #include "cs_types.h"
 
+#define CS_MAX_VIDEO_DECODERS 16
+
 #ifndef CS_VIDEO_PDATA
 #define CS_VIDEO_PDATA void
 #endif
@@ -33,26 +35,26 @@ typedef enum {
 
 typedef enum
 {
-   VIDEO_FORMAT_MPEG2 = 0,
-   VIDEO_FORMAT_MPEG4, /* H264 */
-   VIDEO_FORMAT_VC1,
-   VIDEO_FORMAT_JPEG,
-   VIDEO_FORMAT_GIF,
-   VIDEO_FORMAT_PNG,
-   VIDEO_FORMAT_DIVX,/* DIVX 3.11 */
-   VIDEO_FORMAT_MPEG4PART2,/* MPEG4 SVH, MPEG4 SP, MPEG4 ASP, DIVX4,5,6 */
-   VIDEO_FORMAT_REALVIDEO8,
-   VIDEO_FORMAT_REALVIDEO9,
-   VIDEO_FORMAT_ON2_VP6,
-   VIDEO_FORMAT_ON2_VP8,
-   VIDEO_FORMAT_SORENSON_SPARK,
-   VIDEO_FORMAT_H263,
-   VIDEO_FORMAT_H263_ENCODER,
-   VIDEO_FORMAT_H264_ENCODER,
-   VIDEO_FORMAT_MPEG4PART2_ENCODER,
-   VIDEO_FORMAT_AVS,  
-   VIDEO_FORMAT_VIP656,
-   VIDEO_FORMAT_UNSUPPORTED
+	VIDEO_FORMAT_MPEG2 = 0,
+	VIDEO_FORMAT_MPEG4, /* H264 */
+	VIDEO_FORMAT_VC1,
+	VIDEO_FORMAT_JPEG,
+	VIDEO_FORMAT_GIF,
+	VIDEO_FORMAT_PNG,
+	VIDEO_FORMAT_DIVX,/* DIVX 3.11 */
+	VIDEO_FORMAT_MPEG4PART2,/* MPEG4 SVH, MPEG4 SP, MPEG4 ASP, DIVX4,5,6 */
+	VIDEO_FORMAT_REALVIDEO8,
+	VIDEO_FORMAT_REALVIDEO9,
+	VIDEO_FORMAT_ON2_VP6,
+	VIDEO_FORMAT_ON2_VP8,
+	VIDEO_FORMAT_SORENSON_SPARK,
+	VIDEO_FORMAT_H263,
+	VIDEO_FORMAT_H263_ENCODER,
+	VIDEO_FORMAT_H264_ENCODER,
+	VIDEO_FORMAT_MPEG4PART2_ENCODER,
+	VIDEO_FORMAT_AVS,
+	VIDEO_FORMAT_VIP656,
+	VIDEO_FORMAT_UNSUPPORTED
 } VIDEO_FORMAT;
 
 typedef enum {
@@ -138,10 +140,17 @@ typedef enum
    VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
 } VIDEO_CONTROL;
 
+class cDemux;
+class cAudio;
+
 class cVideo {
+friend class cAudio;
 private:
+	static cVideo *instance[CS_MAX_VIDEO_DECODERS];
+
+	unsigned int		unit;
 	CS_VIDEO_PDATA		*privateData;
-	u32			streamType;
+	VIDEO_FORMAT		streamType;
 	VIDEO_DEFINITION	VideoDefinition;
 	DISPLAY_AR		DisplayAR;
 	VIDEO_PLAY_MODE		playMode;
@@ -167,13 +176,16 @@ private:
 	int			cfd; // control driver fd
 	analog_mode_t		analog_mode_cinch;
 	analog_mode_t		analog_mode_scart;
-	vfd_icon		mode_icon;
+	fp_icon			mode_icon;
+	cDemux			*demux;
 	//
 	int SelectAutoFormat();
 	void ScalePic();
+	cVideo(unsigned int Unit);
 public:
 	/* constructor & destructor */
 	cVideo(int mode, void * hChannel, void * hBuffer);
+
 	~cVideo(void);
 
 	void * GetVPP(void);
@@ -247,6 +259,8 @@ public:
 	int  StartVBI(unsigned short pid);
 	int  StopVBI(void);
 	bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
+	void SetDemux(cDemux *Demux);
+	static cVideo *GetDecoder(unsigned int Unit);
 };
 
 #endif // __VIDEO_CS_H_