mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
neutrino.cpp: fix pip for hisilicon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef2a108a
Author: GetAway <get-away@t-online.de>
Date: 2023-06-05 (Mon, 05 Jun 2023)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -4950,12 +4950,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");
|
||||
@@ -5234,11 +5238,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();
|
||||
|
||||
@@ -6123,8 +6131,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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user