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

libspark/video: ShowPicture: use VIDEO_STILLPICTURE

Browse Source
This commit is contained in:
martii
2013-05-25 08:42:06 +02:00
parent f88d47b0f2
commit 18b798bee2
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libspark/video.cpp
View File

@@ -371,8 +371,10 @@ void cVideo::ShowPicture(const char * fname)
#endif #endif
{ {
lt_debug("%s(%s)\n", __func__, fname); lt_debug("%s(%s)\n", __func__, fname);
#ifndef MARTII
static const unsigned char pes_header[] = { 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x80, 0x00, 0x00 }; static const unsigned char pes_header[] = { 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x80, 0x00, 0x00 };
static const unsigned char seq_end[] = { 0x00, 0x00, 0x01, 0xB7 }; static const unsigned char seq_end[] = { 0x00, 0x00, 0x01, 0xB7 };
#endif
char destname[512]; char destname[512];
char cmd[512]; char cmd[512];
char *p; char *p;
@@ -437,15 +439,25 @@ void cVideo::ShowPicture(const char * fname)
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__);
#ifdef MARTII
char *iframe = (char *)malloc((st.st_size < 8192) ? 8192 : st.st_size);
#else
bool seq_end_avail = false; bool seq_end_avail = false;
size_t pos=0; size_t pos=0;
unsigned char *iframe = (unsigned char *)malloc((st.st_size < 8192) ? 8192 : st.st_size); unsigned char *iframe = (unsigned char *)malloc((st.st_size < 8192) ? 8192 : st.st_size);
#endif
if (! iframe) if (! iframe)
{ {
lt_info("%s: malloc failed (%m)\n", __func__); lt_info("%s: malloc failed (%m)\n", __func__);
goto out; goto out;
} }
read(mfd, iframe, st.st_size); read(mfd, iframe, st.st_size);
#ifdef MARTII
fop(ioctl, VIDEO_PLAY);
fop(ioctl, VIDEO_CONTINUE);
video_still_picture sp = { iframe, st.st_size };
fop(ioctl, VIDEO_STILLPICTURE, &sp);
#else
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY); ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY);
ioctl(fd, VIDEO_PLAY); ioctl(fd, VIDEO_PLAY);
ioctl(fd, VIDEO_CONTINUE); ioctl(fd, VIDEO_CONTINUE);
@@ -465,6 +477,7 @@ void cVideo::ShowPicture(const char * fname)
memset(iframe, 0, 8192); memset(iframe, 0, 8192);
write(fd, iframe, 8192); write(fd, iframe, 8192);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX); ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
#endif
free(iframe); free(iframe);
} }
out: out: