Origin commit data
------------------
Commit: a63a8207ab
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-10-06 (Fri, 06 Oct 2023)
This commit is contained in:
BPanther
2024-01-02 00:43:08 +01:00
committed by Thilo Graf
parent 0e47c0c49f
commit 4d33da393a

View File

@@ -710,43 +710,41 @@ bool CZapit::StopPip(int pip)
if (CNeutrinoApp::getInstance()->avinput_pip) { if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP(); CNeutrinoApp::getInstance()->StopAVInputPiP();
} }
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]);
pipVideoDecoder[pip]->ShowPig(0);
CCamManager::getInstance()->Stop(pip_channel_id[pip], CCamManager::PIP); 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_fe[pip] = NULL;
pip_channel_id[pip] = 0; pip_channel_id[pip] = 0;
} }
if (pipVideoDemux[pip])
{
pipVideoDemux[pip]->Stop();
delete pipVideoDemux[pip];
pipVideoDemux[pip] = NULL;
}
if (pipVideoDecoder[pip]) if (pipVideoDecoder[pip])
{ {
pipVideoDecoder[pip]->ShowPig(0);
pipVideoDecoder[pip]->Stop();
pipVideoDecoder[pip]->closeDevice(); pipVideoDecoder[pip]->closeDevice();
delete pipVideoDecoder[pip]; delete pipVideoDecoder[pip];
pipVideoDecoder[pip] = NULL; pipVideoDecoder[pip] = NULL;
} }
if (pipVideoDemux[pip]) if (pipAudioDemux[pip])
{ {
delete pipVideoDemux[pip]; pipAudioDemux[pip]->Stop();
pipVideoDemux[pip] = NULL; delete pipAudioDemux[pip];
pipAudioDemux[pip] = NULL;
} }
if (pipAudioDecoder[pip]) if (pipAudioDecoder[pip])
{ {
pipAudioDecoder[pip]->Stop();
pipAudioDecoder[pip]->closeDevice(); pipAudioDecoder[pip]->closeDevice();
delete pipAudioDecoder[pip]; delete pipAudioDecoder[pip];
pipAudioDecoder[pip] = NULL; pipAudioDecoder[pip] = NULL;
} }
if (pipAudioDemux[pip])
{
delete pipAudioDemux[pip];
pipAudioDemux[pip] = NULL;
}
#endif #endif
return true; return true;