frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 11:37:42 +00:00
Code Issues Releases Wiki Activity

Added support for Digital Devices CI extension.

Browse Source
This commit is contained in:
Rolf Ahrenberg
2015-01-06 00:58:35 +02:00
parent 0fd559ce79
commit db59aa9c29
18 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tuner.c
View File

@@ -41,6 +41,7 @@ cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP)
signalStrengthM(-1),
signalQualityM(-1),
streamIdM(-1),
pmtPidM(-1),
addPidsM(),
delPidsM(),
pidsM()
@@ -186,8 +187,6 @@ bool cSatipTuner::Connect(void)
// Just retune
if (streamIdM >= 0) {
cString uri = cString::sprintf("%sstream=%d?%s", *connectionUri, streamIdM, *streamParamM);
//if (pidsM.Size())
// uri = cString::sprintf("%s&pids=%s", *uri, *pidsM.ListPids());
debug1("%s Retuning [device %d]", __PRETTY_FUNCTION__, deviceIdM);
if (rtspM.Play(*uri)) {
keepAliveM.Set(timeoutM);
@@ -240,6 +239,7 @@ bool cSatipTuner::Disconnect(void)
cSatipDiscover::GetInstance()->UseServer(currentServerM, false);
statusUpdateM.Set(0);
timeoutM = eMinKeepAliveIntervalMs;
pmtPidM = -1;
addPidsM.Clear();
delPidsM.Clear();
@@ -391,6 +391,7 @@ bool cSatipTuner::UpdatePids(bool forceP)
if (((forceP && pidsM.Size()) || (pidUpdateCacheM.TimedOut() && (addPidsM.Size() || delPidsM.Size()))) &&
!isempty(*streamAddrM) && (streamIdM > 0)) {
cString uri = cString::sprintf("rtsp://%s/stream=%d", *streamAddrM, streamIdM);
bool usexpmt = (SatipConfig.GetCIExtension() && !!(currentServerM && currentServerM->Quirk(cSatipServer::eSatipQuirkUseXPMT)));
bool usedummy = !!(currentServerM && currentServerM->Quirk(cSatipServer::eSatipQuirkPlayPids));
if (forceP || usedummy) {
if (pidsM.Size())
@@ -404,6 +405,13 @@ bool cSatipTuner::UpdatePids(bool forceP)
if (delPidsM.Size())
uri = cString::sprintf("%s%sdelpids=%s", *uri, addPidsM.Size() ? "&" : "?", *delPidsM.ListPids());
}
if (usexpmt) {
int pid = deviceM->GetPmtPid();
// issue TS rerouting only on pid changes
if ((pid > 0) && (pid != pmtPidM))
uri = cString::sprintf("%s&x_pmt=%d", *uri, pid);
pmtPidM = pid;
}
if (!rtspM.Play(*uri))
return false;
addPidsM.Clear();