mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
more pip changes
Signed-off-by: Thilo Graf <dbt@novatux.de> Thx for the informative commit chain.
This commit is contained in:
@@ -694,7 +694,7 @@ bool CZapit::StopPip(int pip)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (pip_channel_id[pip]) {
|
if (pip_channel_id[pip]) {
|
||||||
INFO("[pip] stop %llx", pip_channel_id[pip]);
|
INFO("[pip %d] stop %llx", pip, pip_channel_id[pip]);
|
||||||
#if !HAVE_CST_HARDWARE
|
#if !HAVE_CST_HARDWARE
|
||||||
pipVideoDecoder[pip]->ShowPig(0);
|
pipVideoDecoder[pip]->ShowPig(0);
|
||||||
#endif
|
#endif
|
||||||
@@ -725,7 +725,7 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
|
|||||||
INFO("channel_id " PRINTF_CHANNEL_ID_TYPE " not found", channel_id);
|
INFO("channel_id " PRINTF_CHANNEL_ID_TYPE " not found", channel_id);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
INFO("[pip] zap to %s (%llx tp %llx)", newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId());
|
INFO("[pip %d] zap to %s (%llx tp %llx)", pip, newchannel->getName().c_str(), newchannel->getChannelID(), newchannel->getTransponderId());
|
||||||
|
|
||||||
if (need_lock)
|
if (need_lock)
|
||||||
CFEManager::getInstance()->lockFrontend(live_fe);
|
CFEManager::getInstance()->lockFrontend(live_fe);
|
||||||
@@ -770,14 +770,14 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
|
|||||||
#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());
|
||||||
INFO("[pip] dyn demux: %d", dnum);
|
INFO("[pip %d] dyn demux: %d", pip, dnum);
|
||||||
#else
|
#else
|
||||||
/* FIXME until proper demux management */
|
/* FIXME until proper demux management */
|
||||||
int dnum = pip + 1;
|
int dnum = pip + 1;
|
||||||
INFO("[pip] demux: %d", dnum);
|
INFO("[pip %d] demux: %d", pip, dnum);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
INFO("[pip] vpid %X apid %X pcr %X", newchannel->getVideoPid(), newchannel->getAudioPid(), newchannel->getPcrPid());
|
INFO("[pip %d] vpid %X apid %X pcr %X", pip, newchannel->getVideoPid(), newchannel->getAudioPid(), newchannel->getPcrPid());
|
||||||
if (!pipVideoDemux[pip]) {
|
if (!pipVideoDemux[pip]) {
|
||||||
pipVideoDemux[pip] = new cDemux(dnum);
|
pipVideoDemux[pip] = new cDemux(dnum);
|
||||||
pipVideoDemux[pip]->Open(DMX_VIDEO_CHANNEL);
|
pipVideoDemux[pip]->Open(DMX_VIDEO_CHANNEL);
|
||||||
|
Reference in New Issue
Block a user