diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-14 12:23:23 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-14 12:23:23 +0000 |
| commit | 1f3788c5e1a47fa9b0412902acba38c86b53bb63 (patch) | |
| tree | bb0c67a1ecf37d5f1ace92e33b8e10f34881a57f /lib/dvb/decoder.h | |
| parent | 7f19468027d025ce8597318e7211995871f17376 (diff) | |
| download | enigma2-1f3788c5e1a47fa9b0412902acba38c86b53bb63.tar.gz enigma2-1f3788c5e1a47fa9b0412902acba38c86b53bb63.zip | |
remove unneeded caching of caids, use an array for pidcache instead of std::map (safe memory)
prepare for different video stream types.. (H264) ( NOT for dm7025 )
Diffstat (limited to 'lib/dvb/decoder.h')
| -rw-r--r-- | lib/dvb/decoder.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h index bceca040..834499b0 100644 --- a/lib/dvb/decoder.h +++ b/lib/dvb/decoder.h @@ -11,7 +11,7 @@ private: ePtr<eDVBDemux> m_demux; int m_fd, m_fd_demux, m_dev; public: - enum {aMPEG, aAC3, aDTS }; + enum { aMPEG, aAC3, aDTS, aAAC }; eDVBAudio(eDVBDemux *demux, int dev); int startPid(int pid, int type); void stop(); @@ -35,8 +35,9 @@ private: int m_is_slow_motion, m_is_fast_forward; public: + enum { MPEG2, MPEG4_H264 }; eDVBVideo(eDVBDemux *demux, int dev); - int startPid(int pid); + int startPid(int pid, int type); void stop(); #if HAVE_DVB_API_VERSION < 3 void start(); @@ -86,7 +87,7 @@ private: 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, @@ -104,7 +105,7 @@ 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 setSyncPCR(int pcrpid); RESULT setTextPID(int textpid); |