mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "reverting neutrino streaming to old behavior, raw streaming only for e2 notating supported"

Browse Source 
This reverts commit 58de442f8e.


Origin commit data
------------------
Commit: 415c0ca82e
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-10-05 (Wed, 05 Oct 2022)
This commit is contained in:
vanhofen
2022-10-05 21:48:04 +02:00
parent ddf8ad0b68
commit 1f9e131a2e
2 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/driver/streamts.cpp
View File

@@ -193,7 +193,7 @@ void CStreamInstance::run()
dmx->addPid(*it);
}
dmx->Start();
dmx->Start(true);
if (!send_raw)
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
@@ -384,7 +384,6 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
{
char cbuf[512];
char *bp;
send_raw = false;
FILE * fp = fdopen(fd, "r+");
if (fp == NULL) {
@@ -427,18 +426,22 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
t_channel_id tmpid = 0;
bp = &cbuf[5];
if (strstr(bp,"id="))
{
if (sscanf(bp, "id=%" SCNx64, &tmpid) == 1) {
channel = CServiceManager::getInstance()->FindChannel(tmpid);
chid = tmpid;
send_raw = false;
pids.clear(); // to catch and stream all pids later !
}
if (sscanf(bp, "id=%" SCNx64, &tmpid) == 1) {
channel = CServiceManager::getInstance()->FindChannel(tmpid);
chid = tmpid;
}
else
int tmpraw = 0;
bp = &cbuf[25];
if (sscanf(bp, "raw=%d", &tmpraw) == 1)
{
send_raw = (tmpraw > 0);
}
if (!tmpid)
{
bp = &cbuf[5];
u_int service;
u_int i1, i2, i3, i4, satpos;
@@ -451,18 +454,23 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
{
printf("e2 -> n chid:%" SCNx64 "\n", tmp_channel->getChannelID());
channel = tmp_channel;
chid = channel->getChannelID();
chid = tmp_channel->getChannelID();
send_raw = true;
pids.clear(); // to catch and stream all pids later !
}
}
}
if (!channel)
return false;
printf("CStreamManager::Parse: channel_id %" PRIx64 " [%s] send %s\n", chid, channel->getName().c_str(), send_raw ? "raw" : "decrypted");
streammap_iterator_t it = streams.find(chid);
if (it != streams.end())
{
printf("CStreamManager::Parse: channel_id %" PRIx64 " already streaming, just add client %d\n", chid, fd);
return true;
}
if (IS_WEBCHAN(chid))
return true;
@@ -539,7 +547,9 @@ bool CStreamManager::AddClient(int connfd)
stream_pids_t pids;
t_channel_id channel_id;
CFrontend *frontend;
bool send_raw = false;
bool send_raw;
pids.clear(); // to catch and stream all pids later !
if (Parse(connfd, pids, channel_id, frontend, send_raw)) {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);
@@ -629,11 +639,13 @@ void CStreamManager::run()
perror("CStreamManager::run(): accept");
continue;
}
#if 0
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, 0);
if (!AddClient(connfd))
{
close(connfd);
#endif
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, connfd);
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_STOP, 0);
}
poll_timeout = 1000;
} else {
if (pfd[i].revents & (POLLHUP | POLLRDHUP)) {