git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix menu title
[enigma2.git]
/
lib
/
dvb
/
decoder.h
diff --git
a/lib/dvb/decoder.h
b/lib/dvb/decoder.h
index bceca040846155b6b7b77f0339c5a5da13dda6c7..cd59b3d9734953970f0c640b2713045d45cce8cd 100644
(file)
--- a/
lib/dvb/decoder.h
+++ b/
lib/dvb/decoder.h
@@
-4,20
+4,28
@@
#include <lib/base/object.h>
#include <lib/dvb/demux.h>
#include <lib/base/object.h>
#include <lib/dvb/demux.h>
+class eSocketNotifier;
+
class eDVBAudio: public iObject
{
DECLARE_REF(eDVBAudio);
private:
ePtr<eDVBDemux> m_demux;
class eDVBAudio: public iObject
{
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:
public:
- enum {
aMPEG, aAC3, aDTS
};
+ enum {
aMPEG, aAC3, aDTS, aAAC
};
eDVBAudio(eDVBDemux *demux, int dev);
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 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();
#endif
void flush();
void freeze();
@@
-26,21
+34,30
@@
public:
virtual ~eDVBAudio();
};
virtual ~eDVBAudio();
};
-class eDVBVideo: public iObject
+class eDVBVideo: public iObject
, public Object
{
DECLARE_REF(eDVBVideo);
private:
ePtr<eDVBDemux> m_demux;
int m_fd, m_fd_demux, m_dev;
{
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;
+#if HAVE_DVB_API_VERSION < 3
+ m_fd_video;
+#endif
+ int m_is_slow_motion, m_is_fast_forward, m_is_freezed;
+ eSocketNotifier *m_sn;
+ void video_event(int what);
+ Signal1<void, struct iTSMPEGDecoder::videoEvent> m_event;
public:
public:
+ enum { MPEG2, MPEG4_H264 };
eDVBVideo(eDVBDemux *demux, int dev);
eDVBVideo(eDVBDemux *demux, int dev);
- int startPid(int pid);
void stop();
#if HAVE_DVB_API_VERSION < 3
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();
#endif
void flush();
void freeze();
@@
-49,6
+66,7
@@
public:
void unfreeze();
int getPTS(pts_t &now);
virtual ~eDVBVideo();
void unfreeze();
int getPTS(pts_t &now);
virtual ~eDVBVideo();
+ RESULT connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn);
};
class eDVBPCR: public iObject
};
class eDVBPCR: public iObject
@@
-59,7
+77,12
@@
private:
int m_fd_demux;
public:
eDVBPCR(eDVBDemux *demux);
int m_fd_demux;
public:
eDVBPCR(eDVBDemux *demux);
+#if HAVE_DVB_API_VERSION < 3
+ int setPid(int pid);
+ int startPid();
+#else
int startPid(int pid);
int startPid(int pid);
+#endif
void stop();
virtual ~eDVBPCR();
};
void stop();
virtual ~eDVBPCR();
};
@@
-79,14
+102,18
@@
public:
class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
{
class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
{
+ static int m_pcm_delay;
+ static int m_ac3_delay;
+ static int m_audio_channel;
DECLARE_REF(eTSMPEGDecoder);
DECLARE_REF(eTSMPEGDecoder);
+ std::string m_radio_pic;
private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
ePtr<eDVBVideo> m_video;
ePtr<eDVBPCR> m_pcr;
ePtr<eDVBTText> m_text;
private:
ePtr<eDVBDemux> m_demux;
ePtr<eDVBAudio> m_audio;
ePtr<eDVBVideo> m_video;
ePtr<eDVBPCR> m_pcr;
ePtr<eDVBTText> m_text;
- int m_vpid, m_apid, m_atype, m_pcrpid, m_textpid;
+ int m_vpid, m_
vtype, m_
apid, m_atype, m_pcrpid, m_textpid;
enum
{
changeVideo = 1,
enum
{
changeVideo = 1,
@@
-97,19
+124,29
@@
private:
int m_changed, m_decoder;
int m_is_ff, m_is_sm, m_is_trickmode;
int setState();
int m_changed, m_decoder;
int m_is_ff, m_is_sm, m_is_trickmode;
int setState();
- ePtr<eConnection> m_demux_event;
+ ePtr<eConnection> m_demux_event_conn;
+ ePtr<eConnection> m_video_event_conn;
void demux_event(int event);
void demux_event(int event);
+ void video_event(struct videoEvent);
+ Signal1<void, struct videoEvent> m_video_event;
public:
enum { pidNone = -1 };
eTSMPEGDecoder(eDVBDemux *demux, int decoder);
virtual ~eTSMPEGDecoder();
public:
enum { pidNone = -1 };
eTSMPEGDecoder(eDVBDemux *demux, int decoder);
virtual ~eTSMPEGDecoder();
- RESULT setVideoPID(int vpid);
+ RESULT setVideoPID(int vpid
, int type
);
RESULT setAudioPID(int apid, int type);
RESULT setAudioPID(int apid, int type);
+ RESULT setAudioChannel(int channel);
+ int getAudioChannel();
+ RESULT setPCMDelay(int delay);
+ int getPCMDelay() { return m_pcm_delay; }
+ RESULT setAC3Delay(int delay);
+ int getAC3Delay() { return m_ac3_delay; }
RESULT setSyncPCR(int pcrpid);
RESULT setTextPID(int textpid);
RESULT setSyncMaster(int who);
RESULT start();
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 freeze(int cont);
RESULT unfreeze();
RESULT setSinglePictureMode(int when);
@@
-119,9
+156,11
@@
public:
RESULT setZoom(int what);
RESULT flush();
RESULT setTrickmode(int what);
RESULT setZoom(int what);
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);
/* 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);
};
#endif
};
#endif