mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcd4l: try to fix ModeCam detection; add some new features:

Browse Source 
* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f10060211
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- lcd4l: try to fix ModeCam detection; add some new features:

* Resolution detection
* AspectRatio detection
* Videotext detection
* DolbyDigital detection


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-16 00:55:52 +01:00
parent c72aac7588
commit 179db9f1b4
2 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/gui/lcd4l.cpp
View File

@@ -57,6 +57,7 @@ extern int bc_popup_icon;
#endif
extern CRemoteControl *g_RemoteControl;
extern cVideo *videoDecoder;
#define LCD_DATADIR "/tmp/lcd/"
@@ -69,6 +70,10 @@ extern CRemoteControl *g_RemoteControl;
#define LOGO_DUMMY LCD_ICONSDIR "blank.png"
#define RESOLUTION LCD_DATADIR "resolution"
#define ASPECTRATIO LCD_DATADIR "aspectratio"
#define VIDEOTEXT LCD_DATADIR "videotext"
#define DOLBYDIGITAL LCD_DATADIR "dolbydigital"
#define TUNER LCD_DATADIR "tuner"
#define VOLUME LCD_DATADIR "volume"
#define MODE_REC LCD_DATADIR "mode_rec"
@@ -190,6 +195,10 @@ void CLCD4l::Init()
{
m_ParseID = 0;
m_Resolution = "n/a";
m_AspectRatio = "n/a";
m_Videotext = -1;
m_DolbyDigital = "n/a";
m_Tuner = -1;
m_Volume = -1;
m_ModeRec = -1;
@@ -311,6 +320,76 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
/* ----------------------------------------------------------------- */
int x_res, y_res, framerate;
videoDecoder->getPictureInfo(x_res, y_res, framerate);
std::string Resolution = to_string(x_res) + "x" + to_string(y_res);
//Resolution += "\n" + to_string(framerate); //TODO
if (m_Resolution.compare(Resolution))
{
WriteFile(RESOLUTION, Resolution);
m_Resolution = Resolution;
}
/* ----------------------------------------------------------------- */
std::string AspectRatio;
switch (videoDecoder->getAspectRatio())
{
case 0:
AspectRatio = "n/a";
break;
case 1:
AspectRatio = "4:3";
break;
case 2:
AspectRatio = "14:9";
break;
case 3:
AspectRatio = "16:9";
break;
case 4:
AspectRatio = "20:9";
break;
default:
AspectRatio = "n/k";
break;
}
if (m_AspectRatio.compare(AspectRatio))
{
WriteFile(ASPECTRATIO, AspectRatio);
m_AspectRatio = AspectRatio;
}
/* ----------------------------------------------------------------- */
int Videotext = g_RemoteControl->current_PIDs.PIDs.vtxtpid;
if (m_Videotext != Videotext)
{
WriteFile(VIDEOTEXT, Videotext ? "yes" : "no");
m_Videotext = Videotext;
}
/* ----------------------------------------------------------------- */
std::string DolbyDigital;
if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < g_RemoteControl->current_PIDs.APIDs.size()) &&
(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3))
DolbyDigital = "yes";
else
DolbyDigital = g_RemoteControl->has_ac3 ? "available" : "no";
if (m_DolbyDigital.compare(DolbyDigital))
{
WriteFile(DOLBYDIGITAL, DolbyDigital);
m_DolbyDigital = DolbyDigital;
}
/* ----------------------------------------------------------------- */
int Tuner = 1 + CFEManager::getInstance()->getLiveFE()->getNumber();
if (m_Tuner != Tuner)
@@ -412,10 +491,11 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
/* ----------------------------------------------------------------- */
int ModeCam = 0;
bool modulePresent = false;
for (unsigned int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++)
modulePresent |= cCA::GetInstance()->ModulePresent(CA_SLOT_TYPE_CI, i);
if (CCamManager::getInstance()->getUseCI())
ModeCam = 1;
int ModeCam = (modulePresent && CCamManager::getInstance()->getUseCI());
if (m_ModeCam != ModeCam)
{

4
src/gui/lcd4l.h
View File

@@ -88,6 +88,10 @@ class CLCD4l
int m_Mode;
int m_ModeChannel;
std::string m_Resolution;
std::string m_AspectRatio;
int m_Videotext;
std::string m_DolbyDigital;
int m_Tuner;
int m_Volume;
int m_ModeRec;