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.cpp: fix segfault on CST while neutrino starts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7b6191c23
Author: GetAway <get-away@t-online.de>
Date: 2024-01-13 (Sat, 13 Jan 2024)


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

------------------
This commit was generated by Migit
This commit is contained in:
GetAway
2024-01-13 20:02:51 +01:00
committed by vanhofen
parent f4bafe1f0f
commit a7488f5baf
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/zapit/src/zapit.cpp
View File

@@ -744,6 +744,7 @@ bool CZapit::StopPip(int pip)
pip_channel_id[pip] = 0; pip_channel_id[pip] = 0;
return true; return true;
} }
return false;
#else #else
if (CNeutrinoApp::getInstance()->avinput_pip) { if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP(); CNeutrinoApp::getInstance()->StopAVInputPiP();
@@ -783,8 +784,8 @@ bool CZapit::StopPip(int pip)
delete pipAudioDecoder[pip]; delete pipAudioDecoder[pip];
pipAudioDecoder[pip] = NULL; pipAudioDecoder[pip] = NULL;
} }
#endif
return true; return true;
#endif
} }
bool CZapit::StartPip(const t_channel_id channel_id, int pip) bool CZapit::StartPip(const t_channel_id channel_id, int pip)
@@ -2722,13 +2723,20 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
/* work around broken drivers: when starting up with 720p50 image is pink on hd1 */ /* work around broken drivers: when starting up with 720p50 image is pink on hd1 */
videoDecoder = new cVideo(VIDEO_STD_1080I50, videoDemux->getChannel(), videoDemux->getBuffer()); videoDecoder = new cVideo(VIDEO_STD_1080I50, videoDemux->getChannel(), videoDemux->getBuffer());
videoDecoder->SetVideoSystem(video_mode); videoDecoder->SetVideoSystem(video_mode);
videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
#else #else
videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer()); videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());
#endif
videoDecoder->Standby(false); videoDecoder->Standby(false);
audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/); audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
#endif
#if defined ENABLE_PIP && defined HAVE_CST_HARDWARE
if (g_info.hw_caps->can_pip)
{
pipVideoDemux[0] = new cDemux(dnum);
pipVideoDemux[0]->Open(DMX_PIP_CHANNEL);
pipVideoDecoder[0] = new cVideo(video_mode, pipVideoDemux[0]->getChannel(), pipVideoDemux[0]->getBuffer(), 1);
}
#endif
#endif #endif
videoDecoder->SetAudioHandle(audioDecoder->GetHandle()); videoDecoder->SetAudioHandle(audioDecoder->GetHandle());