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

fix multistream, fix record streams

Browse Source 
Origin commit data
------------------
Commit: 05a0e4d04a
Author: TangoCash <eric@loxat.de>
Date: 2022-09-12 (Mon, 12 Sep 2022)
This commit is contained in:
TangoCash
2022-09-12 21:01:59 +02:00
committed by vanhofen
parent f524b77541
commit f464078fb1
7 changed files with 172 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/driver/streamts.cpp
View File

@@ -66,14 +66,6 @@
#define av_packet_unref av_free_packet
#endif
/* experimental mode:
* stream not possible, if record running
* pids in url ignored, and added from channel, with fake PAT/PMT
* different channels supported,
* with url like http://coolstream:31339/id=c32400030070283e (channel id)
*/
#define ENABLE_MULTI_CHANNEL
#define TS_SIZE 188
#define DMX_BUFFER_SIZE (2048*TS_SIZE)
#define IN_SIZE (250*TS_SIZE)
@@ -200,11 +192,8 @@ void CStreamInstance::run()
printf("CStreamInstance::run: add pid 0x%04x\n", *it);
dmx->addPid(*it);
}
#ifdef ENABLE_MULTI_CHANNEL
dmx->Start();//FIXME
#else
dmx->Start(true);//FIXME
#endif
dmx->Start(true);
if (!send_raw)
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
@@ -435,24 +424,13 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
chid = CZapit::getInstance()->GetCurrentChannelID();
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
#ifndef ENABLE_MULTI_CHANNEL
/* parse stdin / url path, start dmx filters */
do {
int pid;
int res = sscanf(bp, "%x", &pid);
if (res == 1) {
printf("CStreamManager::Parse: pid: 0x%x\n", pid);
pids.insert(pid);
}
} while ((bp = strchr(bp, ',')) && (bp++));
#else
t_channel_id tmpid = 0;
bp = &cbuf[5];
if (sscanf(bp, "id=%" SCNx64, &tmpid) == 1) {
channel = CServiceManager::getInstance()->FindChannel(tmpid);
chid = tmpid;
}
#endif
int tmpraw = 0;
bp = &cbuf[25];
@@ -474,11 +452,10 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
if (tmp_channel)
{
printf("e2 -> n chid:%" SCNx64 "\n", channel->getChannelID());
printf("e2 -> n chid:%" SCNx64 "\n", tmp_channel->getChannelID());
channel = tmp_channel;
chid = tmp_channel->getChannelID();
send_raw = true;
pids.clear(); // to catch and stream all pids later !
}
}
}
@@ -486,6 +463,14 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
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;
@@ -563,6 +548,8 @@ bool CStreamManager::AddClient(int connfd)
t_channel_id channel_id;
CFrontend *frontend;
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);
@@ -652,11 +639,14 @@ void CStreamManager::run()
perror("CStreamManager::run(): accept");
continue;
}
#if 0
if (!AddClient(connfd))
{
close(connfd);
#endif
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, connfd);
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_STOP, 0);
}
else
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, 0);
poll_timeout = 1000;
} else {
if (pfd[i].revents & (POLLHUP | POLLRDHUP)) {
@@ -862,6 +852,13 @@ bool CStreamStream::Open()
AVDictionary *options = NULL;
if (!headers.empty())
av_dict_set(&options, "headers", headers.c_str(), 0);
if (0 == strncmp(url.c_str(), "http://", 7) || 0 == strncmp(url.c_str(), "https://", 8))
{
av_dict_set(&options, "timeout", "20000000", 0); //20sec
av_dict_set(&options, "reconnect", "1", 0);
}
if (avformat_open_input(&ifcx, url.c_str(), NULL, &options) != 0) {
printf("%s: Cannot open input [%s]!\n", __FUNCTION__, channel->getUrl().c_str());
if (!headers.empty())