git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small text change
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index 582e3f39c9efbbc214a6f8ac6aed3634cc670c7f..2d770fb05eb2486bcce401a284a106af238859b2 100644
(file)
--- a/
lib/service/servicedvb.cpp
+++ b/
lib/service/servicedvb.cpp
@@
-428,13
+428,38
@@
int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
return 0;
}
return 0;
}
+ int prio_order = eDVBFrontend::getTypePriorityOrder();
int cur=0;
eDVBChannelID chid, chid_ignore;
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
for (std::list<eServiceReference>::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it)
{
int cur=0;
eDVBChannelID chid, chid_ignore;
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
for (std::list<eServiceReference>::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it)
{
+ static unsigned char prio_map[6][3] = {
+ { 3, 2, 1 }, // -S -C -T
+ { 3, 1, 2 }, // -S -T -C
+ { 2, 3, 1 }, // -C -S -T
+ { 1, 3, 2 }, // -C -T -S
+ { 1, 2, 3 }, // -T -C -S
+ { 2, 1, 3 } // -T -S -C
+ };
((const eServiceReferenceDVB&)*it).getChannelID(chid);
int tmp=res->canAllocateChannel(chid, chid_ignore);
((const eServiceReferenceDVB&)*it).getChannelID(chid);
int tmp=res->canAllocateChannel(chid, chid_ignore);
+ switch(tmp)
+ {
+ case 0:
+ break;
+ case 30000: // cached DVB-T channel
+ case 1: // DVB-T frontend
+ tmp = prio_map[prio_order][2];
+ break;
+ case 40000: // cached DVB-C channel
+ case 2:
+ tmp = prio_map[prio_order][1];
+ break;
+ default: // DVB-S
+ tmp = prio_map[prio_order][0];
+ break;
+ }
if (tmp > cur)
{
m_playable_service = *it;
if (tmp > cur)
{
m_playable_service = *it;
@@
-1025,7
+1050,7
@@
eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
m_subtitle_widget = 0;
m_tune_state = -1;
m_subtitle_widget = 0;
m_tune_state = -1;
-
+
CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
}
CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
}
@@
-1078,6
+1103,7
@@
void eDVBServicePlay::serviceEvent(int event)
case eDVBServicePMTHandler::eventNoPATEntry:
case eDVBServicePMTHandler::eventNoPMT:
case eDVBServicePMTHandler::eventTuneFailed:
case eDVBServicePMTHandler::eventNoPATEntry:
case eDVBServicePMTHandler::eventNoPMT:
case eDVBServicePMTHandler::eventTuneFailed:
+ case eDVBServicePMTHandler::eventMisconfiguration:
{
eDebug("DVB service failed to tune - error %d", event);
m_event((iPlayableService*)this, evTuneFailed);
{
eDebug("DVB service failed to tune - error %d", event);
m_event((iPlayableService*)this, evTuneFailed);
@@
-1345,6
+1371,9
@@
RESULT eDVBServicePlay::seekTo(pts_t to)
return -1;
m_cue->seekTo(0, to);
return -1;
m_cue->seekTo(0, to);
+ m_dvb_subtitle_pages.clear();
+ m_subtitle_pages.clear();
+
return 0;
}
return 0;
}
@@
-1372,6
+1401,8
@@
RESULT eDVBServicePlay::seekRelative(int direction, pts_t to)
return 0;
m_cue->seekTo(mode, to);
return 0;
m_cue->seekTo(mode, to);
+ m_dvb_subtitle_pages.clear();
+ m_subtitle_pages.clear();
return 0;
}
return 0;
}
@@
-1694,6
+1725,8
@@
RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
if (i >= program.audioStreams.size())
return -2;
if (i >= program.audioStreams.size())
return -2;
+ info.m_pid = program.audioStreams[i].pid;
+
if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG)
info.m_description = "MPEG";
else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG)
info.m_description = "MPEG";
else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
@@
-1745,7
+1778,7
@@
int eDVBServicePlay::selectAudioStream(int i)
if (((unsigned int)stream) < program.audioStreams.size())
{
apid = program.audioStreams[stream].pid;
if (((unsigned int)stream) < program.audioStreams.size())
{
apid = program.audioStreams[stream].pid;
- apidtype =
apid
type;
+ apidtype =
program.audioStreams[stream].
type;
}
m_current_audio_pid = apid;
}
m_current_audio_pid = apid;
@@
-1779,7
+1812,8
@@
int eDVBServicePlay::selectAudioStream(int i)
anything in the best case, or destroy the default setting in
case the real default is not yet available.)
*/
anything in the best case, or destroy the default setting in
case the real default is not yet available.)
*/
- if (m_dvb_service && !m_is_pvr && (i != -1))
+ if (m_dvb_service && !m_is_pvr && ((i != -1)
+ || ((m_dvb_service->getCacheEntry(eDVBService::cAPID) == -1) && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1))))
{
if (apidtype == eDVBAudio::aMPEG)
{
{
if (apidtype == eDVBAudio::aMPEG)
{
@@
-2768,6
+2802,10
@@
void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
{
if (m_subtitle_widget)
{
{
if (m_subtitle_widget)
{
+ pts_t pos = 0;
+ if (m_decoder)
+ m_decoder->getPTS(0, pos);
+ eDebug("got new subtitle page %lld %lld %d", pos, page.m_pts, page.m_have_pts);
m_subtitle_pages.push_back(page);
checkSubtitleTiming();
}
m_subtitle_pages.push_back(page);
checkSubtitleTiming();
}
@@
-2775,7
+2813,7
@@
void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
void eDVBServicePlay::checkSubtitleTiming()
{
void eDVBServicePlay::checkSubtitleTiming()
{
-
//
eDebug("checkSubtitleTiming");
+
eDebug("checkSubtitleTiming");
if (!m_subtitle_widget)
return;
while (1)
if (!m_subtitle_widget)
return;
while (1)
@@
-2804,36
+2842,36
@@
void eDVBServicePlay::checkSubtitleTiming()
if (m_decoder)
m_decoder->getPTS(0, pos);
if (m_decoder)
m_decoder->getPTS(0, pos);
-
//
eDebug("%lld %lld", pos, show_time);
+
eDebug("%lld %lld", pos, show_time);
int diff = show_time - pos;
if (diff < 0)
{
eDebug("[late (%d ms)]", -diff / 90);
diff = 0;
}
int diff = show_time - pos;
if (diff < 0)
{
eDebug("[late (%d ms)]", -diff / 90);
diff = 0;
}
-
if (diff > 900000)
-
{
-
eDebug("[invalid]");
-
diff = 0;
-
}
+
//
if (diff > 900000)
+
//
{
+
//
eDebug("[invalid]");
+
//
diff = 0;
+
//
}
- if (
!diff
)
+ if (
(diff/90)<20
)
{
if (type == TELETEXT)
{
{
if (type == TELETEXT)
{
- eDebug("display teletext subtitle page
"
);
+ eDebug("display teletext subtitle page
%lld", show_time
);
m_subtitle_widget->setPage(page);
m_subtitle_pages.pop_front();
}
else
{
m_subtitle_widget->setPage(page);
m_subtitle_pages.pop_front();
}
else
{
- eDebug("display dvb subtitle Page
"
);
+ eDebug("display dvb subtitle Page
%lld", show_time
);
m_subtitle_widget->setPage(dvb_page);
m_dvb_subtitle_pages.pop_front();
}
} else
{
m_subtitle_widget->setPage(dvb_page);
m_dvb_subtitle_pages.pop_front();
}
} else
{
-
//
eDebug("start subtitle delay %d", diff / 90);
+
eDebug("start subtitle delay %d", diff / 90);
m_subtitle_sync_timer.start(diff / 90, 1);
break;
}
m_subtitle_sync_timer.start(diff / 90, 1);
break;
}
@@
-2844,6
+2882,10
@@
void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p)
{
if (m_subtitle_widget)
{
{
if (m_subtitle_widget)
{
+ pts_t pos = 0;
+ if (m_decoder)
+ m_decoder->getPTS(0, pos);
+ eDebug("got new subtitle page %lld %lld", pos, p.m_show_time);
m_dvb_subtitle_pages.push_back(p);
checkSubtitleTiming();
}
m_dvb_subtitle_pages.push_back(p);
checkSubtitleTiming();
}