From 0383437ca9cf811bf8aea01dd5f9abb01cee1c22 Mon Sep 17 00:00:00 2001 From: GetAway Date: Sun, 4 Jun 2023 21:50:14 +0200 Subject: [PATCH] neutrino.cpp: fix pip for hisilicon --- src/neutrino.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c8caf2d48..56b900060 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4940,12 +4940,16 @@ void CNeutrinoApp::tvMode( bool rezap ) #if ENABLE_PIP if (g_info.hw_caps->can_pip) +#if BOXMODEL_HISILICON + pipVideoDecoder[0]->ShowPig(0); +#else { pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x),pip_recalc_pos_y(g_settings.pip_y), g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); } #endif +#endif #if 0 if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) { //printf("standby on: autoshift ! stopping ...\n"); @@ -5224,11 +5228,15 @@ void CNeutrinoApp::radioMode( bool rezap) #if ENABLE_PIP if (g_info.hw_caps->can_pip) +#if BOXMODEL_HISILICON + pipVideoDecoder[0]->ShowPig(0); +#else { pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_radio_x),pip_recalc_pos_y(g_settings.pip_radio_y), g_settings.pip_radio_width, g_settings.pip_radio_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); } +#endif #endif CRecordManager::getInstance()->StopAutoRecord(); @@ -6072,8 +6080,12 @@ bool CNeutrinoApp::StartPip(const t_channel_id channel_id, int pip) int recmode = CRecordManager::getInstance()->GetRecordMode(channel_id); if ((recmode == CRecordManager::RECMODE_OFF) || (channel->getRecordDemux() != channel->getPipDemux())) { - if (!g_Zapit->zapTo_pip(channel_id, pip)) + if (!g_Zapit->zapTo_pip(channel_id, pip)) { +#if BOXMODEL_HISILICON + pipVideoDecoder[0]->ShowPig(0); +#endif DisplayErrorMessage(g_Locale->getText(LOCALE_VIDEOMENU_PIP_ERROR)); + } else ret = true; }