X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fspecs.h;h=d6ddde4d30cf07115bbefb1cb2710e103887630b;hb=f1186b323fe59536ceb717a799839e9cbc48b30a;hp=afd5cef882638b5d194673a01b50d886c354d190;hpb=572caca1ba06dd8247724c9f5d6bcad515e2edf4;p=vuplus_dvbapp

diff --git a/lib/dvb/specs.h b/lib/dvb/specs.h
index afd5cef..d6ddde4 100644
--- a/lib/dvb/specs.h
+++ b/lib/dvb/specs.h
@@ -14,12 +14,12 @@ struct eDVBPMTSpec
 {
 	eDVBTableSpec m_spec;
 public:
-	eDVBPMTSpec(int pid, int sid)
+	eDVBPMTSpec(int pid, int sid, int timeout = 20000)
 	{
 		m_spec.pid     = pid;
 		m_spec.tid     = ProgramMapSection::TID;
 		m_spec.tidext  = sid;
-		m_spec.timeout = 20000; // ProgramMapSection::TIMEOUT;
+		m_spec.timeout = timeout; // ProgramMapSection::TIMEOUT;
 		m_spec.flags   = eDVBTableSpec::tfAnyVersion | 
 			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfHaveTIDExt | 
 			eDVBTableSpec::tfCheckCRC | eDVBTableSpec::tfHaveTimeout;
@@ -43,6 +43,23 @@ public:
 			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
 			eDVBTableSpec::tfHaveTimeout;
 	}
+	eDVBSDTSpec(int tsid, bool other=false)
+	{
+		m_spec.pid     = ServiceDescriptionSection::PID;
+		m_spec.tid     = ServiceDescriptionSection::TID;
+		m_spec.tidext  = tsid;
+		m_spec.timeout = 60000; // ServiceDescriptionSection::TIMEOUT;
+		m_spec.flags   = eDVBTableSpec::tfAnyVersion |
+			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
+			eDVBTableSpec::tfHaveTIDExt | eDVBTableSpec::tfHaveTimeout;
+		if (other)
+		{
+			// SDT other transport stream have TID 0x46 (current is 0x42)
+			// so we mask out the third bit in table id mask..
+			m_spec.flags |= eDVBTableSpec::tfHaveTIDMask;
+			m_spec.tid_mask = 0xFB;
+		}
+	}
 	operator eDVBTableSpec &()
 	{
 		return m_spec;
@@ -91,11 +108,11 @@ struct eDVBPATSpec
 {
 	eDVBTableSpec m_spec;
 public:
-	eDVBPATSpec()
+	eDVBPATSpec(int timeout=20000)
 	{
 		m_spec.pid     = ProgramAssociationSection::PID;
 		m_spec.tid     = ProgramAssociationSection::TID;
-		m_spec.timeout = 20000; // ProgramAssociationSection::TIMEOUT;
+		m_spec.timeout = timeout; // ProgramAssociationSection::TIMEOUT;
 		m_spec.flags   = eDVBTableSpec::tfAnyVersion |
 			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
 			eDVBTableSpec::tfHaveTimeout;
@@ -148,4 +165,44 @@ public:
 	}
 };
 
+#include <dvbsi++/application_information_section.h>
+
+struct eDVBAITSpec
+{
+	eDVBTableSpec m_spec;
+public:
+	eDVBAITSpec(int pid)
+	{
+		m_spec.pid     = pid;
+		m_spec.tid     = ApplicationInformationSection::TID;
+		m_spec.timeout = ApplicationInformationSection::TIMEOUT;
+		m_spec.flags   = eDVBTableSpec::tfAnyVersion |
+			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
+			eDVBTableSpec::tfHaveTimeout;
+	}
+	operator eDVBTableSpec &()
+	{
+		return m_spec;
+	}
+};
+
+struct eDVBDSMCCDLDataSpec
+{
+	eDVBTableSpec m_spec;
+public:
+	eDVBDSMCCDLDataSpec(int pid)
+	{
+		m_spec.pid     = pid;
+		m_spec.tid     = TID_DSMCC_DL_DATA;
+		m_spec.timeout = 20000;
+		m_spec.flags   = eDVBTableSpec::tfAnyVersion |
+			eDVBTableSpec::tfHaveTID | eDVBTableSpec::tfCheckCRC |
+			eDVBTableSpec::tfHaveTimeout;
+	}
+	operator eDVBTableSpec &()
+	{
+		return m_spec;
+	}
+};
+
 #endif