mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

sync with seife

Browse Source
This commit is contained in:
martii
2013-10-06 10:16:33 +02:00
parent 782bc95fd5 642de31a8b
commit 848730507b
11 changed files with 115 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
libspark/video.cpp
View File

@@ -34,7 +34,6 @@
#include <linux/dvb/video.h>
#include <linux/stmfb.h>
#include "video_lib.h"
#define VIDEO_DEVICE_FMT "/dev/dvb/adapter0/video%d"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_VIDEO, this, args)
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_VIDEO, this, args)
@@ -53,13 +52,43 @@
_r; \
})
cVideo * pipDecoder = NULL;
cVideo * videoDecoder = NULL;
cVideo * pipDecoder = NULL;
int system_rev = 0;
static bool hdmi_enabled = true;
static bool stillpicture = false;
static const char *VDEV[] = {
"/dev/dvb/adapter0/video0",
"/dev/dvb/adapter0/video1"
};
static const char *VMPEG_aspect[] = {
"/proc/stb/vmpeg/0/aspect",
"/proc/stb/vmpeg/1/aspect"
};
static const char *VMPEG_xres[] = {
"/proc/stb/vmpeg/0/xres",
"/proc/stb/vmpeg/1/xres"
};
static const char *VMPEG_yres[] = {
"/proc/stb/vmpeg/0/yres",
"/proc/stb/vmpeg/1/yres"
};
static const char *VMPEG_dst_all[] = {
"/proc/stb/vmpeg/0/dst_all",
"/proc/stb/vmpeg/1/dst_all"
};
static const char *VMPEG_framerate[] = {
"/proc/stb/vmpeg/0/framerate",
"/proc/stb/vmpeg/1/framerate"
};
#define VIDEO_STREAMTYPE_MPEG2 0
#define VIDEO_STREAMTYPE_MPEG4_H264 1
#define VIDEO_STREAMTYPE_VC1 3
@@ -142,16 +171,20 @@ out:
}
cVideo::cVideo(int, void *, void *, int _dev)
cVideo::cVideo(int, void *, void *, unsigned int unit)
{
lt_debug("%s\n", __FUNCTION__);
lt_debug("%s unit %u\n", __func__, unit);
//croppingMode = VID_DISPMODE_NORM;
//outputformat = VID_OUTFMT_RGBC_SVIDEO;
scartvoltage = -1;
video_standby = 0;
if (unit > 1) {
lt_info("%s: unit %d out of range, setting to 0\n", __func__, unit);
devnum = 0;
} else
devnum = unit;
fd = -1;
dev = _dev;
openDevice();
}
@@ -163,14 +196,12 @@ cVideo::~cVideo(void)
void cVideo::openDevice(void)
{
int n = 0;
lt_debug("%s\n", __func__);
lt_debug("#%d: %s\n", devnum, __func__);
/* todo: this fd checking is racy, should be protected by a lock */
if (fd != -1) /* already open */
return;
char vd[sizeof(VIDEO_DEVICE_FMT) + 10];
snprintf(vd, sizeof(vd), VIDEO_DEVICE_FMT, dev);
retry:
if ((fd = open(vd, O_RDWR)) < 0)
if ((fd = open(VDEV[devnum], O_RDWR|O_CLOEXEC)) < 0)
{
if (errno == EBUSY)
{
@@ -179,10 +210,8 @@ retry:
if (++n < 10)
goto retry;
}
lt_info("%s cannot open %s: %m, retries %d\n", __func__, vd, n);
lt_info("#%d: %s cannot open %s: %m, retries %d\n", devnum, __func__, VDEV[devnum], n);
}
else
fcntl(fd, F_SETFD, FD_CLOEXEC);
playstate = VIDEO_STOPPED;
}
@@ -197,12 +226,6 @@ void cVideo::closeDevice(void)
playstate = VIDEO_STOPPED;
}
void cVideo::SetDemux(cDemux * /*dmx*/)
{
lt_debug("%s\n", __func__);
// FIXME, stub only
}
int cVideo::setAspectRatio(int aspect, int mode)
{
static const char *a[] = { "n/a", "4:3", "14:9", "16:9" };
@@ -236,9 +259,7 @@ int cVideo::getAspectRatio(void)
if (fd == -1)
{
/* in movieplayer mode, fd is not opened -> fall back to procfs */
char tmp[100];
snprintf(tmp, sizeof(tmp), "/proc/stb/vmpeg/%d/aspect", dev);
int n = proc_get_hex(tmp);
int n = proc_get_hex(VMPEG_aspect[devnum]);
return n * 2 + 1;
}
if (fop(ioctl, VIDEO_GET_SIZE, &s) < 0)
@@ -246,7 +267,7 @@ int cVideo::getAspectRatio(void)
lt_info("%s: VIDEO_GET_SIZE %m\n", __func__);
return -1;
}
lt_debug("%s: %d\n", __func__, s.aspect_ratio);
lt_debug("#%d: %s: %d\n", devnum, __func__, s.aspect_ratio);
return s.aspect_ratio * 2 + 1;
}
@@ -268,7 +289,7 @@ int cVideo::setCroppingMode(int /*vidDispMode_t format*/)
int cVideo::Start(void * /*PcrChannel*/, unsigned short /*PcrPid*/, unsigned short /*VideoPid*/, void * /*hChannel*/)
{
lt_debug("%s playstate=%d\n", __FUNCTION__, playstate);
lt_debug("#%d: %s playstate=%d\n", devnum, __func__, playstate);
#if 0
if (playstate == VIDEO_PLAYING)
return 0;
@@ -282,7 +303,7 @@ int cVideo::Start(void * /*PcrChannel*/, unsigned short /*PcrPid*/, unsigned sho
int cVideo::Stop(bool blank)
{
lt_debug("%s(%d)\n", __FUNCTION__, blank);
lt_debug("#%d: %s(%d)\n", devnum, __func__, blank);
if (stillpicture)
{
lt_debug("%s: stillpicture == true\n", __func__);
@@ -357,7 +378,7 @@ int cVideo::getPlayState(void)
void cVideo::SetVideoMode(analog_mode_t mode)
{
lt_debug("%s(%d)\n", __func__, mode);
lt_debug("#%d: %s(%d)\n", devnum, __func__, mode);
if (!(mode & ANALOG_SCART_MASK))
{
lt_debug("%s: non-SCART mode ignored\n", __func__);
@@ -523,7 +544,7 @@ int cVideo::getBlank(void)
free(line);
fclose(f);
int ret = (count == lastcount); /* no new decode -> return 1 */
lt_debug("%s: %d (irq++: %d)\n", __func__, ret, count - lastcount);
lt_debug("#%d: %s: %d (irq++: %d)\n", devnum, __func__, ret, count - lastcount);
lastcount = count;
return ret;
}
@@ -555,7 +576,7 @@ void cVideo::Pig(int x, int y, int w, int h, int osd_w, int osd_h, int startx, i
* TODO: check this in the driver sources */
int xres = 720; /* proc_get_hex("/proc/stb/vmpeg/0/xres") */
int yres = 576; /* proc_get_hex("/proc/stb/vmpeg/0/yres") */
lt_debug("%s: x:%d y:%d w:%d h:%d ow:%d oh:%d\n", __func__, x, y, w, h, osd_w, osd_h);
lt_debug("#%d %s: x:%d y:%d w:%d h:%d ow:%d oh:%d\n", devnum, __func__, x, y, w, h, osd_w, osd_h);
if (x == -1 && y == -1 && w == -1 && h == -1)
{
_w = xres;
@@ -581,11 +602,9 @@ void cVideo::Pig(int x, int y, int w, int h, int osd_w, int osd_h, int startx, i
_w /= 1280;
_h /= 720;
}
lt_debug("%s: x:%d y:%d w:%d h:%d xr:%d yr:%d\n", __func__, _x, _y, _w, _h, xres, yres);
lt_debug("#%d %s: x:%d y:%d w:%d h:%d xr:%d yr:%d\n", devnum, __func__, _x, _y, _w, _h, xres, yres);
sprintf(buffer, "%x %x %x %x", _x, _y, _w, _h);
char tmp[100];
snprintf(tmp, sizeof(tmp), "/proc/stb/vmpeg/%d/dst_all", dev);
proc_put(tmp, buffer, strlen(buffer));
proc_put(VMPEG_dst_all[devnum], buffer, strlen(buffer));
}
static inline int rate2csapi(int rate)
@@ -621,13 +640,9 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate)
if (fd == -1)
{
/* in movieplayer mode, fd is not opened -> fall back to procfs */
char tmp[100];
snprintf(tmp, sizeof(tmp), "/proc/stb/vmpeg/%d/framerate", dev);
r = proc_get_hex(tmp);
snprintf(tmp, sizeof(tmp), "/proc/stb/vmpeg/%d/xres", dev);
width = proc_get_hex(tmp);
snprintf(tmp, sizeof(tmp), "/proc/stb/vmpeg/%d/yres", dev);
height = proc_get_hex(tmp);
r = proc_get_hex(VMPEG_framerate[devnum]);
width = proc_get_hex(VMPEG_xres[devnum]);
height = proc_get_hex(VMPEG_yres[devnum]);
rate = rate2csapi(r);
return;
}
@@ -636,7 +651,7 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate)
rate = rate2csapi(r);
height = s.h;
width = s.w;
lt_debug("%s: rate: %d, width: %d height: %d\n", __func__, rate, width, height);
lt_debug("#%d: %s: rate: %d, width: %d height: %d\n", devnum, __func__, rate, width, height);
}
void cVideo::SetSyncMode(AVSYNC_TYPE mode)
@@ -666,7 +681,7 @@ int cVideo::SetStreamType(VIDEO_FORMAT type)
"VIDEO_FORMAT_PNG"
};
int t;
lt_debug("%s type=%s\n", __FUNCTION__, VF[type]);
lt_debug("#%d: %s type=%s\n", devnum, __func__, VF[type]);
switch (type)
{
@@ -695,6 +710,11 @@ int64_t cVideo::GetPTS(void)
return pts;
}
void cVideo::SetDemux(cDemux *)
{
lt_debug("#%d %s not implemented yet\n", devnum, __func__);
}
void cVideo::SetControl(int control, int value) {
const char *p = NULL;
switch (control) {