aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/decoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/dvb/decoder.h')
-rw-r--r--lib/dvb/decoder.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 04501fe6..51be5141 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -13,7 +13,7 @@ private:
ePtr<eDVBDemux> m_demux;
int m_fd, m_fd_demux, m_dev, m_is_freezed;
public:
- enum { aMPEG, aAC3, aDTS, aAAC };
+ enum { aMPEG, aAC3, aDTS, aAAC, aAACHE };
eDVBAudio(eDVBDemux *demux, int dev);
enum { aMonoLeft, aStereo, aMonoRight };
void setChannel(int channel);
@@ -47,8 +47,9 @@ private:
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);
void stop();
#if HAVE_DVB_API_VERSION < 3
@@ -67,6 +68,11 @@ 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
@@ -182,6 +188,11 @@ public:
/* 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();
};
#endif