#include <lib/dvb/specs.h>
#include <lib/dvb/dvb.h>
#include <lib/dvb/metaparser.h>
+#include <lib/dvb_ci/dvbci.h>
#include <dvbsi++/ca_program_map_section.h>
+#include <dvbsi++/descriptor_tag.h>
eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
:m_ca_servicePtr(0)
m_demux->getCADemuxID(demux_num);
ePtr<eTable<ProgramMapSection> > ptr;
m_PMT.getCurrent(ptr);
- eDVBCAService::unregister_demux(m_reference, demux_num, ptr);
+ eDVBCAService::unregister_service(m_reference, demux_num, ptr);
+ eDVBCIInterfaces::getInstance()->removePMTHandler(this);
}
}
else
{
serviceEvent(eventNewProgramInfo);
- if (!m_pvr_channel && !m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services
+ if (!m_pvr_channel)
{
- uint8_t demux_num;
- m_demux->getCADemuxID(demux_num);
- eDVBCAService::register_demux(m_reference, demux_num, m_ca_servicePtr);
+ if(!m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services
+ {
+ uint8_t demux_num;
+ m_demux->getCADemuxID(demux_num);
+ eDVBCAService::register_service(m_reference, demux_num, m_ca_servicePtr);
+ eDVBCIInterfaces::getInstance()->addPMTHandler(this);
+ }
+ eDVBCIInterfaces::getInstance()->gotPMT(this);
}
if (m_ca_servicePtr)
{
isaudio = 1;
audio.type = audioStream::atMPEG;
break;
+ case 0x06: // PES Private
+ /* PES private can contain AC-3, DTS or lots of other stuff.
+ check descriptors to get the exact type. */
+ for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
+ desc != (*es)->getDescriptors()->end(); ++desc)
+ {
+ switch ((*desc)->getTag())
+ {
+ case AC3_DESCRIPTOR:
+ isaudio = 1;
+ audio.type = audioStream::atAC3;
+ break;
+ }
+ }
+ break;
}
if (isaudio)
program.audioStreams.push_back(audio);
return -1;
}
+int eDVBServicePMTHandler::getChannel(eUsePtr<iDVBChannel> &channel)
+{
+ channel = m_channel;
+ if (channel)
+ return 0;
+ else
+ return -1;
+}
+
int eDVBServicePMTHandler::getDemux(ePtr<iDVBDemux> &demux)
{
demux = m_demux;
::close(m_sock);
}
-RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice )
+RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it != exist.end() )
return 0;
}
-RESULT eDVBCAService::unregister_demux( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr )
+RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it == exist.end() )
uint8_t demux_mask = 0;
uint8_t first_demux_num = 0xFF;
+#if 1
int iter=0, max_demux_slots = sizeof(m_used_demux);
while ( iter < max_demux_slots )
{
}
++iter;
}
+#else
+ demux_mask = 3;
+ first_demux_num = 0;
+#endif
if ( first_demux_num == 0xFF )
{
tmp[0] = 0x82; // demux
tmp[1] = 0x02;
- tmp[3] = first_demux_num; // read section data from demux number
tmp[2] = demux_mask; // descramble bitmask
+ tmp[3] = first_demux_num; // read section data from demux number
capmt.injectDescriptor(tmp, false);
tmp[0] = 0x81; // dvbnamespace
int i=0;
int lenbytes = m_capmt[3] & ~0x80;
while(i < lenbytes)
- wp |= (m_capmt[4+i] << (8 * i++));
+ wp = (wp << 8) | m_capmt[4 + i++];
wp+=4;
wp+=lenbytes;
}