mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

armbox: improve cec

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 0b69bc17f9
Author: TangoCash <eric@loxat.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-10-19 21:39:55 +02:00
parent 37993f3db7
commit 99b15a27b5
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libarmbox/video.cpp
View File

@@ -161,6 +161,7 @@ cVideo::cVideo(int, void *, void *, unsigned int unit)
} else } else
devnum = unit; devnum = unit;
fd = -1; fd = -1;
hdmiFd = -1;
standby_cec_activ = autoview_cec_activ = false; standby_cec_activ = autoview_cec_activ = false;
openDevice(); openDevice();
} }
@@ -815,9 +816,21 @@ bool cVideo::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
physicalAddress[0] = 0x10; physicalAddress[0] = 0x10;
physicalAddress[1] = 0x00; physicalAddress[1] = 0x00;
logicalAddress = 1; logicalAddress = 1;
deviceType = 1; /* default: recorder */
if (_deviceType == VIDEO_HDMI_CEC_MODE_OFF)
{
if (hdmiFd >= 0) {
close hdmiFd;
hdmiFd = -1;
}
return false;
}
else
deviceType = _deviceType;
if (hdmiFd == -1)
hdmiFd = open("/dev/cec0", O_RDWR | O_CLOEXEC);
hdmiFd = open("/dev/cec0", O_RDWR | O_CLOEXEC);
if (hdmiFd >= 0) if (hdmiFd >= 0)
{ {
__u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER; __u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER;
@@ -891,6 +904,7 @@ bool cVideo::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
GetCECAddressInfo(); GetCECAddressInfo();
return true;
} }
void cVideo::GetCECAddressInfo() void cVideo::GetCECAddressInfo()

5
libarmbox/video_lib.h
View File

@@ -118,11 +118,10 @@ typedef enum {
VIDEO_STD_MAX = VIDEO_STD_AUTO VIDEO_STD_MAX = VIDEO_STD_AUTO
} VIDEO_STD; } VIDEO_STD;
/* not used, for dummy functions */
typedef enum { typedef enum {
VIDEO_HDMI_CEC_MODE_OFF = 0, VIDEO_HDMI_CEC_MODE_OFF = 0,
VIDEO_HDMI_CEC_MODE_TUNER, VIDEO_HDMI_CEC_MODE_TUNER = 3,
VIDEO_HDMI_CEC_MODE_RECORDER VIDEO_HDMI_CEC_MODE_RECORDER = 1
} VIDEO_HDMI_CEC_MODE; } VIDEO_HDMI_CEC_MODE;
typedef enum typedef enum