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

rework streaming part2

Browse Source 
Origin commit data
------------------
Commit: 8567503f9d
Author: TangoCash <eric@loxat.de>
Date: 2022-10-05 (Wed, 05 Oct 2022)
This commit is contained in:
TangoCash
2022-10-05 21:48:04 +02:00
committed by vanhofen
parent f2e22001d7
commit 077f60e170
11 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/streamts.cpp
View File

@@ -195,7 +195,10 @@ void CStreamInstance::run()
dmx->Start(true);
//if (!g_settings.stream_raw && is_e2_stream)
if (is_e2_stream)
if (g_settings.streaming_decryptmode)
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
else
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
@@ -212,7 +215,10 @@ void CStreamInstance::run()
Send(r);
}
//if (!g_settings.stream_raw && is_e2_stream)
if (is_e2_stream)
if (g_settings.streaming_decryptmode)
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
else
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
@@ -242,7 +248,7 @@ CStreamManager::CStreamManager()
enabled = true;
running = false;
listenfd = -1;
port = 31339;
port = g_settings.streaming_port;
}
CStreamManager::~CStreamManager()
@@ -490,12 +496,12 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFro
return false;
}
PreparePids(channel, pids);
PreparePids(channel, pids, is_e2);
return !pids.empty();
}
void CStreamManager::PreparePids(CZapitChannel *channel, stream_pids_t &pids)
void CStreamManager::PreparePids(CZapitChannel *channel, stream_pids_t &pids, bool is_e2)
{
pids.clear();
@@ -518,8 +524,7 @@ void CStreamManager::PreparePids(CZapitChannel *channel, stream_pids_t &pids)
printf("CStreamManager::PreparePids: apid 0x%04x \n", channel->getAudioChannel(i)->pid);
}
#if 0
if (!channel->capids.empty() && g_settings.stream_raw && is_e2_stream)
if (!channel->capids.empty() && g_settings.streaming_ecmmode && is_e2)
{
for(casys_pids_iterator_t it = channel->capids.begin(); it != channel->capids.end(); ++it)
{
@@ -527,7 +532,6 @@ void CStreamManager::PreparePids(CZapitChannel *channel, stream_pids_t &pids)
printf("CStreamManager::PreparePids: capid 0x%04x \n", (*it));
}
}
#endif
//add pcr pid
if (channel->getPcrPid() && (channel->getPcrPid() != channel->getVideoPid())) {