mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert apollo libcoolstream headers to release lib version

Browse Source
This commit is contained in:
[CST] Focus
2013-08-05 18:15:33 +04:00
parent b2141a8217
commit 7a41572563
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libcoolstream2/audio_cs.h
View File

@@ -79,11 +79,14 @@ private:
cDemux *demux; cDemux *demux;
cVideo *video; cVideo *video;
CS_AUDIO_PDATA *privateData; CS_AUDIO_PDATA *privateData;
//unsigned int cEncodedDataOnSPDIF, cEncodedDataOnHDMI;
bool muted; bool muted;
AUDIO_FORMAT streamType; AUDIO_FORMAT streamType;
AUDIO_SYNC_MODE syncMode; AUDIO_SYNC_MODE syncMode;
unsigned int uCurrentPTSDelay; bool started;
unsigned int uAudioPTSDelay;
unsigned int uAudioDolbyPTSDelay, uAudioMpegPTSDelay;
bool receivedDelay; bool receivedDelay;
/* internal methods */ /* internal methods */
@@ -97,10 +100,6 @@ private:
bool spdifDD; bool spdifDD;
bool hasMuteScheduled; bool hasMuteScheduled;
bool analogOut; bool analogOut;
#ifdef ISAPOLLO
bool containerMode;
bool hbrMode;
#endif
// //
cAudio(unsigned int Unit); cAudio(unsigned int Unit);
public: public:
@@ -135,7 +134,7 @@ public:
AUDIO_FORMAT GetStreamType(void) { return streamType; } AUDIO_FORMAT GetStreamType(void) { return streamType; }
bool ReceivedAudioDelay(void) { return receivedDelay; } bool ReceivedAudioDelay(void) { return receivedDelay; }
void SetReceivedAudioDelay(bool Set = false) { receivedDelay = Set; } void SetReceivedAudioDelay(bool Set = false) { receivedDelay = Set; }
unsigned int GetAudioDelay(void) { return uCurrentPTSDelay; } unsigned int GetAudioDelay(void) { return (streamType == AUDIO_FMT_DOLBY_DIGITAL) ? uAudioDolbyPTSDelay : uAudioMpegPTSDelay; }
void SetSyncMode(AVSYNC_TYPE SyncMode); void SetSyncMode(AVSYNC_TYPE SyncMode);
/* stream source */ /* stream source */
@@ -163,12 +162,6 @@ public:
void SetDemux(cDemux *Demux); void SetDemux(cDemux *Demux);
void SetVideo(cVideo *Video); void SetVideo(cVideo *Video);
static cAudio *GetDecoder(unsigned int Unit); static cAudio *GetDecoder(unsigned int Unit);
bool Started(void);
bool Paused(void);
#ifdef ISAPOLLO
void SetHBRMode(bool Enable = false);
void SetContainerMode(bool Enable = false);
#endif
}; };
#endif //__AUDIO_CS_H_ #endif //__AUDIO_CS_H_

30
lib/libcoolstream2/video_cs.h
View File

@@ -150,12 +150,6 @@ typedef enum
VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
} VIDEO_CONTROL; } VIDEO_CONTROL;
typedef enum
{
VIDEO_STREAM_FEED_MODE_LIVE = 0,
VIDEO_STREAM_FEED_MODE_PLAYBACK,
} VIDEO_STREAM_FEED_MODE;
class cDemux; class cDemux;
class cAudio; class cAudio;
@@ -163,7 +157,7 @@ class cVideo {
friend class cAudio; friend class cAudio;
private: private:
static cVideo *instance[CS_MAX_VIDEO_DECODERS]; static cVideo *instance[CS_MAX_VIDEO_DECODERS];
//
unsigned int unit; unsigned int unit;
CS_VIDEO_PDATA *privateData; CS_VIDEO_PDATA *privateData;
VIDEO_FORMAT streamType; VIDEO_FORMAT streamType;
@@ -176,15 +170,14 @@ private:
DISPLAY_AR PictureAR; DISPLAY_AR PictureAR;
VIDEO_FRAME_RATE FrameRate; VIDEO_FRAME_RATE FrameRate;
VIDEO_HDMI_CEC_MODE hdmiCECMode; VIDEO_HDMI_CEC_MODE hdmiCECMode;
#ifdef ISAPOLLO
VIDEO_STREAM_FEED_MODE streamFeedMode;
#endif
bool Interlaced; bool Interlaced;
unsigned int uCurrentVPPDisplayDelay; unsigned int uVPPDisplayDelay;
unsigned int uCurrentVideoPTSDelay; unsigned int uVideoPTSDelay;
int StcPts; int StcPts;
bool started;
unsigned int bStandby; unsigned int bStandby;
bool blank; bool blank;
bool playing;
bool auto_format; bool auto_format;
int uFormatIndex; int uFormatIndex;
bool vbi_started; bool vbi_started;
@@ -230,8 +223,8 @@ public:
/* get play state */ /* get play state */
int getPlayState(void); int getPlayState(void);
void SetVPPDelay(unsigned int delay) { uCurrentVPPDisplayDelay = delay; } void SetVPPDelay(unsigned int delay) { uVPPDisplayDelay = delay;};
void SetVideoDelay(unsigned int delay) { uCurrentVideoPTSDelay = delay; } void SetVideoDelay(unsigned int delay) { uVideoPTSDelay = delay;};
/* Notification handlers */ /* Notification handlers */
void HandleVPPMessage(int Event, void *pData); void HandleVPPMessage(int Event, void *pData);
void HandleVideoMessage(void * hHandle, int Event, void *pData); void HandleVideoMessage(void * hHandle, int Event, void *pData);
@@ -239,9 +232,7 @@ public:
VIDEO_DEFINITION GetVideoDef(void) { return VideoDefinition; } VIDEO_DEFINITION GetVideoDef(void) { return VideoDefinition; }
/* change video play state */ /* change video play state */
#ifndef ISAPOLLO
int Prepare(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL); int Prepare(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL);
#endif
int Start(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL); int Start(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL);
int Stop(bool Blank = true); int Stop(bool Blank = true);
bool Pause(void); bool Pause(void);
@@ -279,13 +270,6 @@ 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 Started(void);
bool Playing(void);
bool Paused(void);
void SyncSTC(void);
#ifdef ISAPOLLO
void SetStreamFeedMode(VIDEO_STREAM_FEED_MODE Mode);
#endif
}; };
#endif // __VIDEO_CS_H_ #endif // __VIDEO_CS_H_