aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/idvb.h
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-05-14 12:23:23 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-05-14 12:23:23 +0000
commit1f3788c5e1a47fa9b0412902acba38c86b53bb63 (patch)
treebb0c67a1ecf37d5f1ace92e33b8e10f34881a57f /lib/dvb/idvb.h
parent7f19468027d025ce8597318e7211995871f17376 (diff)
downloadenigma2-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/idvb.h')
-rw-r--r--lib/dvb/idvb.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 06080429..ecf8bb92 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -223,12 +223,13 @@ class eDVBService: public iStaticServiceInformation
public:
enum cacheID
{
- cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cacheMax
+ cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cacheMax
};
int getCachePID(cacheID);
void setCachePID(cacheID, int);
- bool cacheEmpty() { return m_cache.empty(); }
+
+ bool cacheEmpty();
eDVBService();
/* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
@@ -249,8 +250,9 @@ public:
bool usePMT() const { return !(m_flags & dxNoDVB); }
- std::set<int> m_ca;
- std::map<int,int> m_cache;
+// std::set<int> m_ca;
+
+ int m_cache[cacheMax];
virtual ~eDVBService();
eDVBService &operator=(const eDVBService &);
@@ -572,8 +574,8 @@ class iTSMPEGDecoder: public iObject
{
public:
enum { pidDisabled = -1 };
- /** Set Displayed Video PID */
- virtual RESULT setVideoPID(int vpid)=0;
+ /** Set Displayed Video PID and type */
+ virtual RESULT setVideoPID(int vpid, int type)=0;
enum { af_MPEG, af_AC3, af_DTS };
/** Set Displayed Audio PID and type */