mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +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
committed by Stefan Seyfried
parent 2f24c2bcba
commit 8dd2a4091b
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libspark/video.cpp
View File

@@ -393,8 +393,6 @@ void cVideo::ShowPicture(const char * fname)
void VDec::ShowPicture(const char * fname) void VDec::ShowPicture(const char * fname)
{ {
lt_debug("%s(%s)\n", __func__, fname); lt_debug("%s(%s)\n", __func__, fname);
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 };
char destname[512]; char destname[512];
char cmd[512]; char cmd[512];
char *p; char *p;
@@ -451,30 +449,17 @@ void VDec::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__);
bool seq_end_avail = false; char *iframe = (char *)malloc((st.st_size < 8192) ? 8192 : st.st_size);
size_t pos=0;
unsigned char *iframe = (unsigned char *)malloc((st.st_size < 8192) ? 8192 : st.st_size);
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);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY); fop(ioctl, VIDEO_PLAY);
ioctl(fd, VIDEO_PLAY); fop(ioctl, VIDEO_CONTINUE);
ioctl(fd, VIDEO_CONTINUE); video_still_picture sp = { iframe, st.st_size };
ioctl(fd, VIDEO_CLEAR_BUFFER); fop(ioctl, VIDEO_STILLPICTURE, &sp);
while (pos <= (st.st_size-4) && !(seq_end_avail = (!iframe[pos] && !iframe[pos+1] && iframe[pos+2] == 1 && iframe[pos+3] == 0xB7)))
++pos;
if ((iframe[3] >> 4) != 0xE) // no pes header
write(fd, pes_header, sizeof(pes_header));
write(fd, iframe, st.st_size);
if (!seq_end_avail)
write(fd, seq_end, sizeof(seq_end));
memset(iframe, 0, 8192);
write(fd, iframe, 8192);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
free(iframe); free(iframe);
} }
out: out: