mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/libcoolstream2: apollo headers update

Browse Source
This commit is contained in:
[CST] Focus
2013-11-15 15:55:23 +04:00
parent 5ce5730f84
commit fb6dea6e2d
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/libcoolstream2/audio_cs.h
View File

@@ -44,20 +44,26 @@ typedef enum {
HDMI_ENCODED_FORCED HDMI_ENCODED_FORCED
} HDMI_ENCODED_MODE; } HDMI_ENCODED_MODE;
typedef enum typedef enum {
{
HDMI_AUDIO_FMT_LPCM = 0x1, HDMI_AUDIO_FMT_LPCM = 0x1,
HDMI_AUDIO_FMT_AC3 , HDMI_AUDIO_FMT_AC3,
HDMI_AUDIO_FMT_MPEG1 , HDMI_AUDIO_FMT_MPEG1,
HDMI_AUDIO_FMT_MP3 , HDMI_AUDIO_FMT_MP3,
HDMI_AUDIO_FMT_MPEG2 , HDMI_AUDIO_FMT_MPEG2,
HDMI_AUDIO_FMT_AAC , HDMI_AUDIO_FMT_AAC,
HDMI_AUDIO_FMT_DTS , HDMI_AUDIO_FMT_DTS,
HDMI_AUDIO_FMT_ATRAC HDMI_AUDIO_FMT_ATRAC,
HDMI_AUDIO_FMT_ONE_BIT,
HDMI_AUDIO_FMT_DD_PLUS,
HDMI_AUDIO_FMT_DTS_HD,
HDMI_AUDIO_FMT_MAT,
HDMI_AUDIO_FMT_DST,
HDMI_AUDIO_FMT_WMA_PRO,
HDMI_AUDIO_FMT_LAST = HDMI_AUDIO_FMT_WMA_PRO
} HDMI_AUDIO_FORMAT; } HDMI_AUDIO_FORMAT;
#define CS_MAX_AUDIO_DECODERS 1 #define CS_MAX_AUDIO_DECODERS 1
#define CS_MAX_AUDIO_FORMATS 10 #define CS_MAX_AUDIO_FORMATS HDMI_AUDIO_FMT_LAST
typedef struct cs_audio_format { typedef struct cs_audio_format {
HDMI_AUDIO_FORMAT format; HDMI_AUDIO_FORMAT format;
@@ -73,6 +79,7 @@ class cDemux;
class cVideo; class cVideo;
class cAudio { class cAudio {
friend class cVideo;
private: private:
static cAudio *instance[CS_MAX_AUDIO_DECODERS]; static cAudio *instance[CS_MAX_AUDIO_DECODERS];
unsigned int unit; unsigned int unit;

1
lib/libcoolstream2/playback_cs.h
View File

@@ -12,6 +12,7 @@
#include <string> #include <string>
#include <stdint.h> #include <stdint.h>
#include <sys/types.h>
#include <vector> #include <vector>
typedef enum { typedef enum {

5
lib/libcoolstream2/video_cs.h
View File

@@ -223,10 +223,10 @@ public:
/* get play state */ /* get play state */
int getPlayState(void); int getPlayState(void);
void SetVPPDelay(unsigned int delay) { uVPPDisplayDelay = delay;}; void SetVPPDelay(unsigned int delay) { uVPPDisplayDelay = delay; }
void SetVideoDelay(unsigned int delay) { uVideoPTSDelay = delay;}; void SetVideoDelay(unsigned int delay) { uVideoPTSDelay = delay;};
/* Notification handlers */ /* Notification handlers */
void HandleVPPMessage(int Event, void *pData); void HandleVPPMessage(void *hHandle, int Event, void *pData);
void HandleVideoMessage(void * hHandle, int Event, void *pData); void HandleVideoMessage(void * hHandle, int Event, void *pData);
void HandleEncoderMessage(void *hHandle, int Event, void *pData); void HandleEncoderMessage(void *hHandle, int Event, void *pData);
VIDEO_DEFINITION GetVideoDef(void) { return VideoDefinition; } VIDEO_DEFINITION GetVideoDef(void) { return VideoDefinition; }
@@ -270,6 +270,7 @@ public:
bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false); 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); void SetDemux(cDemux *Demux);
static cVideo *GetDecoder(unsigned int Unit); static cVideo *GetDecoder(unsigned int Unit);
bool SyncSTC(void);
}; };
#endif // __VIDEO_CS_H_ #endif // __VIDEO_CS_H_