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

zapit: rework start/stop pip code to get more readability

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b287525a
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-02 (Tue, 02 Jan 2024)

Origin message was:
------------------
- zapit: rework start/stop pip code to get more readability

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-01-02 00:43:08 +01:00
parent 6cb526f9b0
commit eeb71277e9
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/zapit/src/zapit.cpp
View File

@@ -693,28 +693,34 @@ bool CZapit::StopPip(int pip)
if (!g_info.hw_caps->can_pip) if (!g_info.hw_caps->can_pip)
return false; return false;
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE #if HAVE_CST_HARDWARE
if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP();
}
#endif
if (pip_channel_id[pip]) { if (pip_channel_id[pip]) {
INFO("[pip %d] stop %llx", pip, pip_channel_id[pip]); INFO("[pip %d] stop %llx", pip, pip_channel_id[pip]);
#if !HAVE_CST_HARDWARE
pipVideoDecoder[pip]->ShowPig(0);
#endif
CCamManager::getInstance()->Stop(pip_channel_id[pip], CCamManager::PIP); CCamManager::getInstance()->Stop(pip_channel_id[pip], CCamManager::PIP);
pipVideoDemux[pip]->Stop(); pipVideoDemux[pip]->Stop();
pipVideoDecoder[pip]->Stop(); pipVideoDecoder[pip]->Stop();
#if !HAVE_CST_HARDWARE
pipVideoDecoder[pip]->setBlank(pip);
pipAudioDemux[pip]->Stop();
pipAudioDecoder[pip]->Stop();
#endif
pip_fe[pip] = NULL; pip_fe[pip] = NULL;
pip_channel_id[pip] = 0; pip_channel_id[pip] = 0;
return true; return true;
} }
#else
if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP();
}
if (pip_channel_id[pip]) {
INFO("[pip %d] stop %llx", pip, pip_channel_id[pip]);
pipVideoDecoder[pip]->ShowPig(0);
CCamManager::getInstance()->Stop(pip_channel_id[pip], CCamManager::PIP);
pipVideoDemux[pip]->Stop();
pipVideoDecoder[pip]->Stop();
pipVideoDecoder[pip]->setBlank(pip);
pipAudioDemux[pip]->Stop();
pipAudioDecoder[pip]->Stop();
pip_fe[pip] = NULL;
pip_channel_id[pip] = 0;
return true;
}
#endif
return false; return false;
} }
@@ -775,6 +781,13 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
} }
if (CFEManager::getInstance()->getFrontendCount() > 1) if (CFEManager::getInstance()->getFrontendCount() > 1)
cDemux::SetSource(dnum, pip_fe[pip]->getNumber()); cDemux::SetSource(dnum, pip_fe[pip]->getNumber());
pipVideoDecoder[pip]->SetStreamType((VIDEO_FORMAT) newchannel->type);
pipVideoDemux[pip]->pesFilter(newchannel->getVideoPid());
pipVideoDecoder[pip]->Start(0, newchannel->getPcrPid(), newchannel->getVideoPid());
pipVideoDemux[pip]->Start();
pip_channel_id[pip] = channel_id;
#else #else
#ifdef DYNAMIC_DEMUX #ifdef DYNAMIC_DEMUX
int dnum = CFEManager::getInstance()->getDemux(newchannel->getTransponderId(), pip_fe[pip]->getNumber()); int dnum = CFEManager::getInstance()->getDemux(newchannel->getTransponderId(), pip_fe[pip]->getNumber());
@@ -797,15 +810,9 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
pipVideoDemux[pip]->SetSource(dnum, pip_fe[pip]->getNumber()); pipVideoDemux[pip]->SetSource(dnum, pip_fe[pip]->getNumber());
newchannel->setPipDemux(dnum); newchannel->setPipDemux(dnum);
newchannel->setRecordDemux(pip_fe[pip]->getNumber()); newchannel->setRecordDemux(pip_fe[pip]->getNumber());
#endif
pipVideoDecoder[pip]->SetStreamType((VIDEO_FORMAT) newchannel->type); pipVideoDecoder[pip]->SetStreamType((VIDEO_FORMAT) newchannel->type);
pipVideoDemux[pip]->pesFilter(newchannel->getVideoPid()); pipVideoDemux[pip]->pesFilter(newchannel->getVideoPid());
#if HAVE_CST_HARDWARE
pipVideoDecoder[pip]->Start(0, newchannel->getPcrPid(), newchannel->getVideoPid());
pipVideoDemux[pip]->Start();
pip_channel_id[pip] = channel_id;
#else
pipVideoDemux[pip]->Start(); pipVideoDemux[pip]->Start();
pipVideoDecoder[pip]->Start(0, newchannel->getPcrPid(), newchannel->getVideoPid()); pipVideoDecoder[pip]->Start(0, newchannel->getPcrPid(), newchannel->getVideoPid());
pip_channel_id[pip] = newchannel->getChannelID(); pip_channel_id[pip] = newchannel->getChannelID();