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: improve cVideo::ShowPicture()

Browse Source 
* don't clear stillpicture on radio channel change
* don't show stillpicture in standby


Origin commit data
------------------
Branch: master
Commit: 55d0d90b5b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-25 (Sat, 25 Feb 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-25 22:15:37 +01:00
parent 4715d61929
commit 70e2f30a8c
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libspark/video.cpp
View File

@@ -57,6 +57,7 @@ cVideo * videoDecoder = NULL;
int system_rev = 0; int system_rev = 0;
static bool hdmi_enabled = true; static bool hdmi_enabled = true;
static bool stillpicture = false;
#define VIDEO_STREAMTYPE_MPEG2 0 #define VIDEO_STREAMTYPE_MPEG2 0
#define VIDEO_STREAMTYPE_MPEG4_H264 1 #define VIDEO_STREAMTYPE_MPEG4_H264 1
@@ -260,6 +261,11 @@ int cVideo::Start(void * /*PcrChannel*/, unsigned short /*PcrPid*/, unsigned sho
int cVideo::Stop(bool blank) int cVideo::Stop(bool blank)
{ {
lt_debug("%s(%d)\n", __FUNCTION__, blank); lt_debug("%s(%d)\n", __FUNCTION__, blank);
if (stillpicture)
{
lt_debug("%s: stillpicture == true\n", __func__);
return -1;
}
playstate = blank ? VIDEO_STOPPED : VIDEO_FREEZED; playstate = blank ? VIDEO_STOPPED : VIDEO_FREEZED;
return fop(ioctl, VIDEO_STOP, blank ? 1 : 0); return fop(ioctl, VIDEO_STOP, blank ? 1 : 0);
} }
@@ -349,6 +355,12 @@ void cVideo::ShowPicture(const char * fname)
char *p; char *p;
int mfd; int mfd;
struct stat st, st2; struct stat st, st2;
if (video_standby)
{
/* does not work and the driver does not seem to like it */
lt_info("%s: video_standby == true\n", __func__);
return;
}
strcpy(destname, "/var/cache"); strcpy(destname, "/var/cache");
if (stat(fname, &st2)) if (stat(fname, &st2))
{ {
@@ -385,11 +397,13 @@ void cVideo::ShowPicture(const char * fname)
} }
fstat(mfd, &st); fstat(mfd, &st);
Stop(1);
closeDevice(); closeDevice();
openDevice(); openDevice();
if (fd >= 0) if (fd >= 0)
{ {
stillpicture = true;
if (ioctl(fd, VIDEO_SET_FORMAT, VIDEO_FORMAT_16_9) < 0) if (ioctl(fd, VIDEO_SET_FORMAT, VIDEO_FORMAT_16_9) < 0)
lt_info("%s: VIDEO_SET_FORMAT failed (%m)\n", __func__); lt_info("%s: VIDEO_SET_FORMAT failed (%m)\n", __func__);
bool seq_end_avail = false; bool seq_end_avail = false;
@@ -425,10 +439,8 @@ void cVideo::ShowPicture(const char * fname)
void cVideo::StopPicture() void cVideo::StopPicture()
{ {
#if 0 lt_debug("%s\n", __func__);
lt_debug("%s\n", __FUNCTION__); stillpicture = false;
fop(ioctl, MPEG_VID_SELECT_SOURCE, VID_SOURCE_DEMUX);
#endif
} }
void cVideo::Standby(unsigned int bOn) void cVideo::Standby(unsigned int bOn)
@@ -449,6 +461,7 @@ void cVideo::Standby(unsigned int bOn)
hdmi_out(true); hdmi_out(true);
openDevice(); openDevice();
} }
video_standby = bOn;
} }
int cVideo::getBlank(void) int cVideo::getBlank(void)