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

spark: disable HDMI before switching mode in cVideo::SetVideoSystem

Browse Source 
this seems to greatly improve reliability - it looks like there is
a locking problem somewhere in the framebuffer driver :-(


Origin commit data
------------------
Branch: master
Commit: 63eb51a028
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-23 (Thu, 23 Feb 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-23 23:25:11 +01:00
parent 827891745b
commit b574a0e5d4
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libspark/video.cpp
View File

@@ -30,10 +30,12 @@
#include <pthread.h>
#include <linux/dvb/video.h>
#include <linux/stmfb.h>
#include "video_lib.h"
#define VIDEO_DEVICE "/dev/dvb/adapter0/video0"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, this, args)
#define lt_debug_c(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, NULL, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_VIDEO, this, args)
#define fop(cmd, args...) ({ \
@@ -96,6 +98,39 @@ static unsigned int proc_get_hex(const char *path)
return ret;
}
static int hdmi_out(bool enable)
{
struct stmfbio_output_configuration out;
int ret = -1;
int fb = open("/dev/fb0", O_RDWR);
if (fb < 0)
{
lt_debug_c("%s: can't open /dev/fb/0 (%m)\n", __func__);
return -1;
}
out.outputid = STMFBIO_OUTPUTID_MAIN;
if (ioctl(fb, STMFBIO_GET_OUTPUT_CONFIG, &out) < 0)
{
lt_debug_c("%s: STMFBIO_GET_OUTPUT_CONFIG (%m)\n", __func__);
goto out;
}
out.caps = STMFBIO_OUTPUT_CAPS_HDMI_CONFIG;
out.activate = STMFBIO_ACTIVATE_IMMEDIATE;
out.analogue_config = 0;
if (enable)
out.hdmi_config &= ~STMFBIO_OUTPUT_HDMI_DISABLED;
else
out.hdmi_config |= STMFBIO_OUTPUT_HDMI_DISABLED;
ret = ioctl(fb, STMFBIO_SET_OUTPUT_CONFIG, &out);
if (ret < 0)
_lt_debug(TRIPLE_DEBUG_VIDEO, NULL, "%s: STMFBIO_SET_OUTPUT_CONFIG (%m)\n", __func__);
out:
close(fb);
return ret;
}
cVideo::cVideo(int, void *, void *)
{
lt_debug("%s\n", __FUNCTION__);
@@ -232,9 +267,11 @@ int cVideo::SetVideoSystem(int video_system, bool remember)
lt_info("%s: video_system (%d) > VIDEO_STD_MAX (%d)\n", video_system, VIDEO_STD_MAX);
return -1;
}
if (proc_put("/proc/stb/video/videomode", modes[video_system],strlen(modes[video_system])) < 0)
return -1;
return 0;
hdmi_out(false);
int ret = proc_put("/proc/stb/video/videomode", modes[video_system],strlen(modes[video_system]));
hdmi_out(true);
return ret;
}
int cVideo::getPlayState(void)