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

Temporary fix for OctopusNet

Browse Source
This commit is contained in:
REELcoder 2016-12-16 08:45:35 +01:00
parent 74640e0a63
commit 9c1dc3d6ac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
device.c
View File

@ -417,6 +417,7 @@ bool cSatipDevice::OpenDvr(void)
if (pTunerM) if (pTunerM)
pTunerM->Open(); pTunerM->Open();
isOpenDvrM = true; isOpenDvrM = true;
fixedPidsM.Clear();
return true; return true;
} }
@ -558,11 +559,11 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP)
else else
dataP = GetData(); dataP = GetData();
if (dataP && (dataP[4] == 0x00) && (dataP[5] == 0x02) && ((dataP[6] & 0xf0) == 0xb0)) { if (dataP && (dataP[4] == 0x00) && (dataP[5] == 0x02) && ((dataP[6] & 0xfc) == 0xb0)) {
int pidA = ((dataP[1] & 0x1f) << 8) | dataP[2]; int pidA = ((dataP[1] & 0x1f) << 8) | dataP[2];
int pidB = GetPmtPid(); int pidB = GetPmtPid();
debug12("%s PID %d/%d 0x%02x%02x%02x%02x%02x%02x%02x", __PRETTY_FUNCTION__, debug12("%s PID %d/%d 0x%02x%02x%02x%02x%02x%02x%02x %d", __PRETTY_FUNCTION__,
pidA, pidB, dataP[0], dataP[1], dataP[2], dataP[3], dataP[4], dataP[5], dataP[6]); pidA, pidB, dataP[0], dataP[1], dataP[2], dataP[3], dataP[4], dataP[5], dataP[6], fixedPidsM.IndexOf(pidA));
} }
return true; return true;

2
tuner.c
View File

@ -434,7 +434,7 @@ bool cSatipTuner::UpdatePids(bool forceP)
cString uri = cString::sprintf("%sstream=%d", *GetBaseUrl(*streamAddrM, streamPortM), streamIdM); cString uri = cString::sprintf("%sstream=%d", *GetBaseUrl(*streamAddrM, streamPortM), streamIdM);
bool useci = (SatipConfig.GetCIExtension() && currentServerM.HasCI()); bool useci = (SatipConfig.GetCIExtension() && currentServerM.HasCI());
bool usedummy = currentServerM.IsQuirk(cSatipServer::eSatipQuirkPlayPids); bool usedummy = currentServerM.IsQuirk(cSatipServer::eSatipQuirkPlayPids);
if (forceP || usedummy) { if (forceP || usedummy || true) { //temporary fix for OctopusNet addpid bug
if (pidsM.Size()) if (pidsM.Size())
uri = cString::sprintf("%s?pids=%s", *uri, *pidsM.ListPids()); uri = cString::sprintf("%s?pids=%s", *uri, *pidsM.ListPids());
if (usedummy && (pidsM.Size() == 1) && (pidsM[0] < 0x20)) if (usedummy && (pidsM.Size() == 1) && (pidsM[0] < 0x20))