Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'

[enigma2.git] / lib / dvb / decoder.h

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 001139e5b190453726e41c1419706516facae7aa..3a0fbac1e58f27c303a7d28202884a6c9de7bc53 100644 (file)
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -8,20 +8,24 @@ class eSocketNotifier;
 
 class eDVBAudio: public iObject
 {
-DECLARE_REF(eDVBAudio);
+       DECLARE_REF(eDVBAudio);
 private:
        ePtr<eDVBDemux> m_demux;
-       int m_fd, m_fd_demux, m_dev;
+       int m_fd, m_fd_demux, m_dev, m_is_freezed;
 public:
-       enum { aMPEG, aAC3, aDTS, aAAC };
+       enum { aMPEG, aAC3, aDTS, aAAC, aAACHE, aLPCM };
        eDVBAudio(eDVBDemux *demux, int dev);
-       int startPid(int pid, int type);
        enum { aMonoLeft, aStereo, aMonoRight };
        void setChannel(int channel);
        void stop();
 #if HAVE_DVB_API_VERSION < 3
-       void start();
-       void stopPid();
+       int setPid(int pid, int type);
+       int startPid();
+       int start();
+       int stopPid();
+       int setAVSync(int val);
+#else
+       int startPid(int pid, int type);
 #endif
        void flush();
        void freeze();
@@ -32,23 +36,29 @@ public:
 
 class eDVBVideo: public iObject, public Object
 {
-DECLARE_REF(eDVBVideo);
+       DECLARE_REF(eDVBVideo);
 private:
        ePtr<eDVBDemux> m_demux;
        int m_fd, m_fd_demux, m_dev;
-       
-       int m_is_slow_motion, m_is_fast_forward;
-       eSocketNotifier *m_sn;
+#if HAVE_DVB_API_VERSION < 3
+       m_fd_video;
+#endif
+       int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
+       ePtr<eSocketNotifier> m_sn;
        void video_event(int what);
        Signal1<void, struct iTSMPEGDecoder::videoEvent> m_event;
+       int m_width, m_height, m_framerate, m_aspect, m_progressive;
 public:
-       enum { MPEG2, MPEG4_H264 };
+       enum { MPEG2, MPEG4_H264, MPEG1, MPEG4_Part2, VC1, VC1_SM };
        eDVBVideo(eDVBDemux *demux, int dev);
-       int startPid(int pid, int type=MPEG2);
        void stop();
 #if HAVE_DVB_API_VERSION < 3
-       void start();
-       void stopPid();
+       int setPid(int pid);
+       int startPid();
+       int start();
+       int stopPid();
+#else
+       int startPid(int pid, int type=MPEG2);
 #endif
        void flush();
        void freeze();
@@ -58,29 +68,39 @@ public:
        int getPTS(pts_t &now);
        virtual ~eDVBVideo();
        RESULT connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn);
+       int getWidth();
+       int getHeight();
+       int getProgressive();
+       int getFrameRate();
+       int getAspect();
 };
 
 class eDVBPCR: public iObject
 {
-DECLARE_REF(eDVBPCR);
+       DECLARE_REF(eDVBPCR);
 private:
        ePtr<eDVBDemux> m_demux;
-       int m_fd_demux;
+       int m_fd_demux, m_dev;
 public:
-       eDVBPCR(eDVBDemux *demux);
+       eDVBPCR(eDVBDemux *demux, int dev);
+#if HAVE_DVB_API_VERSION < 3
+       int setPid(int pid);
+       int startPid();
+#else
        int startPid(int pid);
+#endif
        void stop();
        virtual ~eDVBPCR();
 };
 
 class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBTText);
+       DECLARE_REF(eDVBTText);
 private:
        ePtr<eDVBDemux> m_demux;
-       int m_fd_demux;
+       int m_fd_demux, m_dev;
 public:
-       eDVBTText(eDVBDemux *demux);
+       eDVBTText(eDVBDemux *demux, int dev);
        int startPid(int pid);
        void stop();
        virtual ~eDVBTText();
@@ -88,12 +108,12 @@ public:
 
 class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
 {
+       DECLARE_REF(eTSMPEGDecoder);
+private:
        static int m_pcm_delay;
        static int m_ac3_delay;
        static int m_audio_channel;
-DECLARE_REF(eTSMPEGDecoder);
        std::string m_radio_pic;
-private:
        ePtr<eDVBDemux> m_demux;
        ePtr<eDVBAudio> m_audio;
        ePtr<eDVBVideo> m_video;
@@ -105,10 +125,12 @@ private:
                changeVideo = 1, 
                changeAudio = 2, 
                changePCR   = 4,
-               changeText  = 8
+               changeText  = 8,
+               changeState = 16,
        };
        int m_changed, m_decoder;
-       int m_is_ff, m_is_sm, m_is_trickmode;
+       int m_state;
+       int m_ff_sm_ratio;
        int setState();
        ePtr<eConnection> m_demux_event_conn;
        ePtr<eConnection> m_video_event_conn;
@@ -116,6 +138,9 @@ private:
        void demux_event(int event);
        void video_event(struct videoEvent);
        Signal1<void, struct videoEvent> m_video_event;
+       int m_video_clip_fd;
+       ePtr<eTimer> m_showSinglePicTimer;
+       void finishShowSinglePic(); // called by timer
 public:
        enum { pidNone = -1 };
        eTSMPEGDecoder(eDVBDemux *demux, int decoder);
@@ -131,22 +156,45 @@ public:
        RESULT setSyncPCR(int pcrpid);
        RESULT setTextPID(int textpid);
        RESULT setSyncMaster(int who);
-       RESULT start();
-       RESULT preroll();
-       RESULT freeze(int cont);
-       RESULT unfreeze();
-       RESULT setSinglePictureMode(int when);
-       RESULT setPictureSkipMode(int what);
-       RESULT setFastForward(int frames_to_skip);
-       RESULT setSlowMotion(int repeat);
-       RESULT setZoom(int what);
+       
+               /*
+               The following states exist:
+               
+                - stop: data source closed, no playback
+                - pause: data source active, decoder paused
+                - play: data source active, decoder consuming
+                - decoder fast forward: data source linear, decoder drops frames
+                - trickmode, highspeed reverse: data source fast forwards / reverses, decoder just displays frames as fast as it can
+                - slow motion: decoder displays frames multiple times
+               */
+       enum {
+               stateStop,
+               statePause,
+               statePlay,
+               stateDecoderFastForward,
+               stateTrickmode,
+               stateSlowMotion
+       };
+       RESULT set(); /* just apply settings, keep state */
+       RESULT play(); /* -> play */
+       RESULT pause(); /* -> pause */
+       RESULT setFastForward(int frames_to_skip); /* -> decoder fast forward */
+       RESULT setSlowMotion(int repeat); /* -> slow motion **/
+       RESULT setTrickmode(); /* -> highspeed fast forward */
+
        RESULT flush();
-       RESULT setTrickmode(int what);
        RESULT showSinglePic(const char *filename);
        RESULT setRadioPic(const std::string &filename);
                /* what 0=auto, 1=video, 2=audio. */
        RESULT getPTS(int what, pts_t &pts);
        RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection);
+       int getVideoWidth();
+       int getVideoHeight();
+       int getVideoProgressive();
+       int getVideoFrameRate();
+       int getVideoAspect();
+       static RESULT setHwPCMDelay(int delay);
+       static RESULT setHwAC3Delay(int delay);
 };
 
 #endif