From 75ff071743d83d55077e454e85406f1d80fbd688 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 5 Aug 2013 18:15:33 +0400
Subject: [PATCH] revert apollo libcoolstream headers to release lib version

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a41572563e47455d0e41ef74f849e8001c29389
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
---
 lib/libcoolstream2/audio_cs.h | 19 ++++++-------------
 lib/libcoolstream2/video_cs.h | 30 +++++++-----------------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/lib/libcoolstream2/audio_cs.h b/lib/libcoolstream2/audio_cs.h
index e15c00c29..a5aa5d866 100644
--- a/lib/libcoolstream2/audio_cs.h
+++ b/lib/libcoolstream2/audio_cs.h
@@ -78,12 +78,15 @@ private:
 	unsigned int		unit;
 	cDemux			*demux;
 	cVideo			*video;
-	CS_AUDIO_PDATA		*privateData;
+	CS_AUDIO_PDATA	*privateData;
+	//unsigned int		cEncodedDataOnSPDIF, cEncodedDataOnHDMI;
 	bool			muted;
 
 	AUDIO_FORMAT		streamType;
 	AUDIO_SYNC_MODE		syncMode;
-	unsigned int		uCurrentPTSDelay;
+	bool			started;
+	unsigned int		uAudioPTSDelay;
+	unsigned int		uAudioDolbyPTSDelay, uAudioMpegPTSDelay;
 	bool			receivedDelay;
 
 	/* internal methods */
@@ -97,10 +100,6 @@ private:
 	bool spdifDD;
 	bool hasMuteScheduled;
 	bool analogOut;
-#ifdef ISAPOLLO
-	bool containerMode;
-	bool hbrMode;
-#endif
 	//
 	cAudio(unsigned int Unit);
 public:
@@ -135,7 +134,7 @@ public:
 	AUDIO_FORMAT GetStreamType(void) { return streamType; }
 	bool ReceivedAudioDelay(void) { return receivedDelay; }
 	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);
 
 	/* stream source */
@@ -163,12 +162,6 @@ public:
 	void SetDemux(cDemux *Demux);
 	void SetVideo(cVideo *Video);
 	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_
diff --git a/lib/libcoolstream2/video_cs.h b/lib/libcoolstream2/video_cs.h
index 70b08c6b8..931de961b 100644
--- a/lib/libcoolstream2/video_cs.h
+++ b/lib/libcoolstream2/video_cs.h
@@ -150,12 +150,6 @@ typedef enum
    VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
 } VIDEO_CONTROL;
 
-typedef enum
-{
-	VIDEO_STREAM_FEED_MODE_LIVE = 0,
-	VIDEO_STREAM_FEED_MODE_PLAYBACK,
-} VIDEO_STREAM_FEED_MODE;
-
 class cDemux;
 class cAudio;
 
@@ -163,7 +157,7 @@ class cVideo {
 friend class cAudio;
 private:
 	static cVideo *instance[CS_MAX_VIDEO_DECODERS];
-	//
+
 	unsigned int		unit;
 	CS_VIDEO_PDATA		*privateData;
 	VIDEO_FORMAT		streamType;
@@ -176,15 +170,14 @@ private:
 	DISPLAY_AR		PictureAR;
 	VIDEO_FRAME_RATE	FrameRate;
 	VIDEO_HDMI_CEC_MODE	hdmiCECMode;
-#ifdef ISAPOLLO
-	VIDEO_STREAM_FEED_MODE	streamFeedMode;
-#endif
 	bool			Interlaced;
-	unsigned int		uCurrentVPPDisplayDelay;
-	unsigned int		uCurrentVideoPTSDelay;
+	unsigned int		uVPPDisplayDelay;
+	unsigned int		uVideoPTSDelay;
 	int			StcPts;
+	bool			started;
 	unsigned int		bStandby;
 	bool			blank;
+	bool			playing;
 	bool			auto_format;
 	int			uFormatIndex;
 	bool			vbi_started;
@@ -230,8 +223,8 @@ public:
 
 	/* get play state */
 	int getPlayState(void);
-	void SetVPPDelay(unsigned int delay) { uCurrentVPPDisplayDelay = delay; }
-	void SetVideoDelay(unsigned int delay) { uCurrentVideoPTSDelay = delay; }
+	void SetVPPDelay(unsigned int delay) { uVPPDisplayDelay = delay;};
+	void SetVideoDelay(unsigned int delay) { uVideoPTSDelay = delay;};
 	/* Notification handlers */
 	void HandleVPPMessage(int Event, void *pData);
 	void HandleVideoMessage(void * hHandle, int Event, void *pData);
@@ -239,9 +232,7 @@ public:
 	VIDEO_DEFINITION   GetVideoDef(void) { return VideoDefinition; }
 
 	/* change video play state */
-#ifndef ISAPOLLO
 	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 Stop(bool Blank = true);
 	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);
 	void SetDemux(cDemux *Demux);
 	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_