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

more pip changes

Browse Source
This commit is contained in:
BPanther
2021-10-15 20:00:19 +02:00
committed by Thilo Graf
parent e2b696f785
commit ccb33957a5
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/zapit/src/zapit.cpp
View File

@@ -98,6 +98,8 @@ extern cDemux *videoDemux;
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
extern cVideo *pipVideoDecoder[3]; extern cVideo *pipVideoDecoder[3];
extern cDemux *pipVideoDemux[3]; extern cDemux *pipVideoDemux[3];
extern cAudio * pipAudioDecoder[3];
extern cDemux * pipAudioDemux[3];
#endif #endif
cDemux *pcrDemux = NULL; cDemux *pcrDemux = NULL;
@@ -699,6 +701,8 @@ bool CZapit::StopPip(int pip)
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();
pipAudioDemux[pip]->Stop();
pipAudioDecoder[pip]->Stop();
pip_fe[pip] = NULL; pip_fe[pip] = NULL;
pip_channel_id[pip] = 0; pip_channel_id[pip] = 0;
return true; return true;
@@ -802,6 +806,21 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
pipVideoDecoder[pip]->ShowPig(1); pipVideoDecoder[pip]->ShowPig(1);
#endif #endif
if (!pipAudioDemux[pip]) {
pipAudioDemux[pip] = new cDemux(dnum);
pipAudioDemux[pip]->Open(DMX_AUDIO_CHANNEL);
if (!pipAudioDecoder[pip]) {
pipAudioDecoder[pip] = new cAudio(0, NULL, NULL, dnum);
}
}
if (newchannel->getAudioChannel())
pipAudioDecoder[pip]->SetStreamType(newchannel->getAudioChannel()->audioChannelType);
pipAudioDemux[pip]->pesFilter(newchannel->getAudioPid());
pipVideoDecoder[pip]->SetSyncMode((AVSYNC_TYPE) g_settings.avsync);
pipAudioDecoder[pip]->SetSyncMode((AVSYNC_TYPE) g_settings.avsync);
CCamManager::getInstance()->Start(newchannel->getChannelID(), CCamManager::PIP); CCamManager::getInstance()->Start(newchannel->getChannelID(), CCamManager::PIP);
return true; return true;
} }
@@ -2634,6 +2653,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
{ {
pipVideoDecoder[i] = new cVideo(0, NULL, NULL, i+1); pipVideoDecoder[i] = new cVideo(0, NULL, NULL, i+1);
pipVideoDecoder[i]->ShowPig(0); pipVideoDecoder[i]->ShowPig(0);
pipAudioDecoder[i] = new cAudio(0, NULL, NULL, i+1);
} }
#endif #endif
} }
@@ -2885,6 +2905,10 @@ void CZapit::run()
pipVideoDecoder[i] = NULL; pipVideoDecoder[i] = NULL;
if (pipVideoDemux[i]) if (pipVideoDemux[i])
pipVideoDemux[i] = NULL; pipVideoDemux[i] = NULL;
if (pipAudioDecoder[i])
pipAudioDecoder[i] = NULL;
if (pipAudioDemux[i])
pipAudioDemux[i] = NULL;
} }
#endif #endif