#include <dvbsi++/stream_identifier_descriptor.h>
#include <dvbsi++/subtitling_descriptor.h>
#include <dvbsi++/teletext_descriptor.h>
+#include <lib/base/nconfig.h> // access to python config
eDVBServicePMTHandler::eDVBServicePMTHandler()
:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF)
program.pmtPid = -1;
program.textPid = -1;
+ int first_ac3 = -1;
+ program.defaultAudioStream = 0;
+
if ( m_service && !m_service->cacheEmpty() )
{
cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
- cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
- cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
+ cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAPID);
+ cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAC3PID);
cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
}
}
//break; fall through !!!
case 0x06: // PES Private
+ case 0x81: // user 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();
program.caids.insert(descr->getCaSystemId());
break;
}
+ case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */
+ {
+ /* libdvbsi++ doesn't yet support this descriptor type, so work around. */
+ if ((*desc)->getLength() != 4)
+ break;
+ unsigned char descr[6];
+ (*desc)->writeToBuffer(descr);
+ int format_identifier = (descr[2] << 24) | (descr[3] << 16) | (descr[4] << 8) | (descr[5]);
+ switch (format_identifier)
+ {
+ case 0x41432d33:
+ isaudio = 1;
+ audio.type = audioStream::atAC3;
+ break;
+ default:
+ break;
+ }
+ break;
+ }
}
}
break;
if (isaudio)
{
audio.pid = (*es)->getPid();
- if ( !program.audioStreams.empty() &&
- ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) )
- {
- program.audioStreams.push_back(program.audioStreams[0]);
- program.audioStreams[0] = audio;
- }
- else
- program.audioStreams.push_back(audio);
+
+ /* if we find the cached pids, this will be our default stream */
+ if (audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg)
+ program.defaultAudioStream = program.audioStreams.size();
+
+ /* also, we need to know the first non-mpeg (i.e. "ac3"/dts/...) stream */
+ if ((audio.type != audioStream::atMPEG) && ((first_ac3 == -1) || (audio.pid == cached_apid_ac3)))
+ first_ac3 = program.audioStreams.size();
+
+ program.audioStreams.push_back(audio);
}
else if (isvideo)
{
}
}
ret = 0;
+
+
+ /* finally some fixup: if our default audio stream is an MPEG audio stream,
+ and we have 'defaultac3' set, use the first available ac3 stream instead.
+ (note: if an ac3 audio stream was selected before, this will be also stored
+ in 'fisrt_ac3', so we don't need to worry. */
+ bool defaultac3 = false;
+ std::string default_ac3;
+
+ if (!ePythonConfigQuery::getConfigValue("config.av.defaultac3", default_ac3))
+ defaultac3 = default_ac3 == "True";
+
+ if (defaultac3 && (first_ac3 != -1))
+ program.defaultAudioStream = first_ac3;
+
m_cached_program = program;
m_have_cached_program = true;
}
} else
{
eDVBMetaParser parser;
-
- if (parser.parseFile(ref.path))
+
+ int ret=parser.parseFile(ref.path);
+ if (ret || !parser.m_ref.getServiceID().get() /* incorrect sid in meta file or recordings.epl*/ )
{
eWarning("no .meta file found, trying to find PMT pid");
eDVBTSTools tstools;
}
} else
{
- serviceEvent(eventNoResources);
+ if (res == eDVBResourceManager::errAllSourcesBusy)
+ serviceEvent(eventNoResources);
+ else /* errChidNotFound, errNoChannelList, errChannelNotInList, errNoSourceFound */
+ serviceEvent(eventMisconfiguration);
return res;
}
m_demux = 0;
}
-std::map<eServiceReferenceDVB, eDVBCAService*> eDVBCAService::exist;
+CAServiceMap eDVBCAService::exist;
+ChannelMap eDVBCAService::exist_channels;
+ePtr<eConnection> eDVBCAService::m_chanAddedConn;
eDVBCAService::eDVBCAService()
- :m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
+ :m_sn(0), m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp)
{
memset(m_used_demux, 0xFF, sizeof(m_used_demux));
CONNECT(m_retryTimer.timeout, eDVBCAService::sendCAPMT);
{
eDebug("[eDVBCAService] free service %s", m_service.toString().c_str());
::close(m_sock);
+ delete m_sn;
}
+// begin static methods
RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice )
{
CAServiceMap::iterator it = exist.find(ref);
return 0;
}
+void eDVBCAService::registerChannelCallback(eDVBResourceManager *res_mgr)
+{
+ res_mgr->connectChannelAdded(slot(&DVBChannelAdded), m_chanAddedConn);
+}
+
+void eDVBCAService::DVBChannelAdded(eDVBChannel *chan)
+{
+ if ( chan )
+ {
+ eDebug("[eDVBCAService] new channel %p!", chan);
+ channel_data *data = new channel_data();
+ data->m_channel = chan;
+ data->m_prevChannelState = -1;
+ data->m_dataDemux = -1;
+ exist_channels[chan] = data;
+ chan->connectStateChange(slot(&DVBChannelStateChanged), data->m_stateChangedConn);
+ }
+}
+
+void eDVBCAService::DVBChannelStateChanged(iDVBChannel *chan)
+{
+ ChannelMap::iterator it =
+ exist_channels.find(chan);
+ if ( it != exist_channels.end() )
+ {
+ int state=0;
+ chan->getState(state);
+ if ( it->second->m_prevChannelState != state )
+ {
+ switch (state)
+ {
+ case iDVBChannel::state_ok:
+ {
+ eDebug("[eDVBCAService] channel %p running", chan);
+ break;
+ }
+ case iDVBChannel::state_release:
+ {
+ eDebug("[eDVBCAService] remove channel %p", chan);
+ unsigned char msg[8] = { 0x9f,0x80,0x3f,0x04,0x83,0x02,0x00,0x00 };
+ msg[7] = it->second->m_dataDemux & 0xFF;
+ int sock, clilen;
+ struct sockaddr_un servaddr;
+ memset(&servaddr, 0, sizeof(struct sockaddr_un));
+ servaddr.sun_family = AF_UNIX;
+ strcpy(servaddr.sun_path, "/tmp/camd.socket");
+ clilen = sizeof(servaddr.sun_family) + strlen(servaddr.sun_path);
+ sock = socket(PF_UNIX, SOCK_STREAM, 0);
+ if (sock > -1)
+ {
+ connect(sock, (struct sockaddr *) &servaddr, clilen);
+ fcntl(sock, F_SETFL, O_NONBLOCK);
+ int val=1;
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
+ if (write(sock, msg, 8) != 8)
+ eDebug("[eDVBCAService] write leave transponder failed!!");
+ close(sock);
+ }
+ exist_channels.erase(it);
+ delete it->second;
+ it->second=0;
+ break;
+ }
+ default: // ignore all other events
+ return;
+ }
+ if (it->second)
+ it->second->m_prevChannelState = state;
+ }
+ }
+}
+
+channel_data *eDVBCAService::getChannelData(eDVBChannelID &chid)
+{
+ for (ChannelMap::iterator it(exist_channels.begin()); it != exist_channels.end(); ++it)
+ {
+ if (chid == it->second->m_channel->getChannelID())
+ return it->second;
+ }
+ return 0;
+}
+// end static methods
+
+void eDVBCAService::socketCB(int what)
+{
+ if (what & eSocketNotifier::Read)
+ /*eDebug("[eDVBCAService] data to read\n")*/;
+ if (what & eSocketNotifier::Priority)
+ /*eDebug("[eDVBCAService] priority data to read\n")*/;
+ if (what & eSocketNotifier::Hungup) {
+ /*eDebug("[eDVBCAService] connection closed\n")*/;
+ m_sendstate=1;
+ sendCAPMT();
+ }
+ if (what & eSocketNotifier::Error)
+ /*eDebug("[eDVBCAService] connection error\n")*/;
+}
+
void eDVBCAService::Connect()
{
+ if (m_sn) {
+ delete m_sn;
+ m_sn=0;
+ }
memset(&m_servaddr, 0, sizeof(struct sockaddr_un));
m_servaddr.sun_family = AF_UNIX;
strcpy(m_servaddr.sun_path, "/tmp/camd.socket");
m_clilen = sizeof(m_servaddr.sun_family) + strlen(m_servaddr.sun_path);
m_sock = socket(PF_UNIX, SOCK_STREAM, 0);
- connect(m_sock, (struct sockaddr *) &m_servaddr, m_clilen);
- fcntl(m_sock, F_SETFL, O_NONBLOCK);
- int val=1;
- setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
+ if (m_sock != -1)
+ {
+ if (!connect(m_sock, (struct sockaddr *) &m_servaddr, m_clilen))
+ {
+ int val=1;
+ fcntl(m_sock, F_SETFL, O_NONBLOCK);
+ setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4);
+ m_sn = new eSocketNotifier(eApp, m_sock,
+ eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup);
+ CONNECT(m_sn->activated, eDVBCAService::socketCB);
+
+ }
+// else
+// eDebug("[eDVBCAService] connect failed %m");
+ }
+ else
+ eDebug("[eDVBCAService] create socket failed %m");
}
void eDVBCAService::buildCAPMT(eTable<ProgramMapSection> *ptr)
eDebug("demux %d mask %02x prevhash %08x", data_demux, demux_mask, m_prev_build_hash);
- unsigned int build_hash = (pmtpid << 16);
+ unsigned int build_hash = ( pmtpid << 16);
build_hash |= (demux_mask << 8);
build_hash |= (pmt_version&0xFF);
{
m_sendstate=0xFFFFFFFF;
eDebug("[eDVBCAService] send %d bytes",wp);
+ eDVBChannelID chid;
+ m_service.getChannelID(chid);
+ channel_data *data = getChannelData(chid);
+ if (data)
+ {
+ int lenbytes = m_capmt[3] & 0x80 ? m_capmt[3] & ~0x80 : 0;
+ data->m_dataDemux = m_capmt[24+lenbytes];
+ }
#if 1
for(int i=0;i<wp;i++)
eDebugNoNewLine("%02x ", m_capmt[i]);