X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fd9ebe13e2e86c7fb3a80769e419538e1cfe9142..cc8dceba41cdc3f1cb5a16c86bd3676101233c00:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index e2c55385..4047be5c 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -231,43 +231,47 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) } //break; fall through !!! case 0x06: // PES Private - /* PES private can contain AC-3, DTS or lots of other stuff. - check descriptors to get the exact type. */ + case 0x81: // user private for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); desc != (*es)->getDescriptors()->end(); ++desc) { - switch ((*desc)->getTag()) + uint8_t tag = (*desc)->getTag(); + if (!isaudio && !isvideo) { - case SUBTITLING_DESCRIPTOR: - { - SubtitlingDescriptor *d = (SubtitlingDescriptor*)(*desc); - const SubtitlingList *list = d->getSubtitlings(); - subtitleStream s; - s.pid = (*es)->getPid(); - for (SubtitlingConstIterator it(list->begin()); it != list->end(); ++it) + /* PES private can contain AC-3, DTS or lots of other stuff. + check descriptors to get the exakt type. */ + switch (tag) { - s.subtitling_type = (*it)->getSubtitlingType(); - s.composition_page_id = (*it)->getCompositionPageId(); - s.ancillary_page_id = (*it)->getAncillaryPageId(); - s.language_code = (*it)->getIso639LanguageCode(); -// eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d", -// s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id); - program.subtitleStreams.push_back(s); - } - break; - } - case TELETEXT_DESCRIPTOR: - if ( program.textPid == -1 || (*es)->getPid() == cached_tpid ) + case SUBTITLING_DESCRIPTOR: { + SubtitlingDescriptor *d = (SubtitlingDescriptor*)(*desc); + const SubtitlingList *list = d->getSubtitlings(); subtitleStream s; - s.subtitling_type = 0x01; // EBU TELETEXT SUBTITLES - s.pid = program.textPid = (*es)->getPid(); - TeletextDescriptor *d = (TeletextDescriptor*)(*desc); - const VbiTeletextList *list = d->getVbiTeletexts(); - for (VbiTeletextConstIterator it(list->begin()); it != list->end(); ++it) + s.pid = (*es)->getPid(); + for (SubtitlingConstIterator it(list->begin()); it != list->end(); ++it) { - switch((*it)->getTeletextType()) + s.subtitling_type = (*it)->getSubtitlingType(); + s.composition_page_id = (*it)->getCompositionPageId(); + s.ancillary_page_id = (*it)->getAncillaryPageId(); + s.language_code = (*it)->getIso639LanguageCode(); + // eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d", + // s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id); + program.subtitleStreams.push_back(s); + } + break; + } + case TELETEXT_DESCRIPTOR: + if ( program.textPid == -1 || (*es)->getPid() == cached_tpid ) + { + subtitleStream s; + s.subtitling_type = 0x01; // EBU TELETEXT SUBTITLES + s.pid = program.textPid = (*es)->getPid(); + TeletextDescriptor *d = (TeletextDescriptor*)(*desc); + const VbiTeletextList *list = d->getVbiTeletexts(); + for (VbiTeletextConstIterator it(list->begin()); it != list->end(); ++it) { + switch((*it)->getTeletextType()) + { case 0x02: // Teletext subtitle page case 0x05: // Teletext subtitle page for hearing impaired pepople s.language_code = (*it)->getIso639LanguageCode(); @@ -277,42 +281,69 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) // s.language_code.c_str(), s.pid, s.teletext_page_number, s.teletext_magazine_number); program.subtitleStreams.push_back(s); break; + } } } - } - break; - case DTS_DESCRIPTOR: - isaudio = 1; - audio.type = audioStream::atDTS; - break; - case AAC_DESCRIPTOR: - isaudio = 1; - audio.type = audioStream::atAAC; - break; - case AC3_DESCRIPTOR: - isaudio = 1; - audio.type = audioStream::atAC3; - break; - case ISO_639_LANGUAGE_DESCRIPTOR: - if (!isvideo) + break; + case DTS_DESCRIPTOR: + isaudio = 1; + audio.type = audioStream::atDTS; + break; + case AAC_DESCRIPTOR: + isaudio = 1; + audio.type = audioStream::atAAC; + break; + case AC3_DESCRIPTOR: + isaudio = 1; + audio.type = audioStream::atAC3; + break; + case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */ { - const Iso639LanguageList *languages = ((Iso639LanguageDescriptor*)*desc)->getIso639Languages(); - /* use last language code */ - for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i) - audio.language_code = (*i)->getIso639LanguageCode(); + /* 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; + } + default: + break; } - break; - case STREAM_IDENTIFIER_DESCRIPTOR: - audio.component_tag = - video.component_tag = - ((StreamIdentifierDescriptor*)*desc)->getComponentTag(); - break; - case CA_DESCRIPTOR: - { - CaDescriptor *descr = (CaDescriptor*)(*desc); - program.caids.insert(descr->getCaSystemId()); - break; } + switch (tag) + { + case ISO_639_LANGUAGE_DESCRIPTOR: + if (!isvideo) + { + const Iso639LanguageList *languages = ((Iso639LanguageDescriptor*)*desc)->getIso639Languages(); + /* use last language code */ + for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i) + audio.language_code = (*i)->getIso639LanguageCode(); + } + break; + case STREAM_IDENTIFIER_DESCRIPTOR: + audio.component_tag = + video.component_tag = + ((StreamIdentifierDescriptor*)*desc)->getComponentTag(); + break; + case CA_DESCRIPTOR: + { + CaDescriptor *descr = (CaDescriptor*)(*desc); + program.caids.insert(descr->getCaSystemId()); + break; + } + default: + break; } } break; @@ -561,12 +592,15 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, if (ref.path.empty()) { delete m_dvb_scan; - m_dvb_scan = new eDVBScan(m_channel, false, false); + m_dvb_scan = new eDVBScan(m_channel, true, false); m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection); } } else { - serviceEvent(eventNoResources); + if (res == eDVBResourceManager::errAllSourcesBusy) + serviceEvent(eventNoResources); + else /* errChidNotFound, errNoChannelList, errChannelNotInList, errNoSourceFound */ + serviceEvent(eventMisconfiguration); return res; } @@ -621,7 +655,7 @@ ChannelMap eDVBCAService::exist_channels; ePtr 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); @@ -632,6 +666,7 @@ eDVBCAService::~eDVBCAService() { eDebug("[eDVBCAService] free service %s", m_service.toString().c_str()); ::close(m_sock); + delete m_sn; } // begin static methods @@ -808,17 +843,49 @@ channel_data *eDVBCAService::getChannelData(eDVBChannelID &chid) } // 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 *ptr)