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

armbox: fix still image

Browse Source
This commit is contained in:
TangoCash
2017-10-17 19:53:02 +02:00
parent 18d6e271e2
commit 4ccbffeb31
1 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libarmbox/video.cpp
View File

@@ -401,10 +401,32 @@ void cVideo::SetVideoMode(analog_mode_t mode)
proc_put("/proc/stb/avs/0/colorformat", m, strlen(m)); proc_put("/proc/stb/avs/0/colorformat", m, strlen(m));
} }
ssize_t write_all(int fd, const void *buf, size_t count)
{
int retval;
char *ptr = (char*)buf;
size_t handledcount = 0;
while (handledcount < count)
{
retval = write(fd, &ptr[handledcount], count - handledcount);
if (retval == 0)
return -1;
if (retval < 0)
{
if (errno == EINTR)
continue;
return retval;
}
handledcount += retval;
}
return handledcount;
}
void cVideo::ShowPicture(const char * fname, const char *_destname) void cVideo::ShowPicture(const char * fname, const char *_destname)
{ {
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 pes_header[] = { 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x80, 0x00, 0x00 };
static const unsigned char pes_header[] = {0x0, 0x0, 0x1, 0xe0, 0x00, 0x00, 0x80, 0x80, 0x5, 0x21, 0x0, 0x1, 0x0, 0x1};
static const unsigned char seq_end[] = { 0x00, 0x00, 0x01, 0xB7 }; static const unsigned char seq_end[] = { 0x00, 0x00, 0x01, 0xB7 };
char destname[512]; char destname[512];
char cmd[512]; char cmd[512];
@@ -448,7 +470,7 @@ void cVideo::ShowPicture(const char * fname, const char *_destname)
u.actime = time(NULL); u.actime = time(NULL);
u.modtime = st2.st_mtime; u.modtime = st2.st_mtime;
/* it does not exist or has a different date, so call ffmpeg... */ /* it does not exist or has a different date, so call ffmpeg... */
sprintf(cmd, "ffmpeg -y -f mjpeg -i '%s' -s 1280x720 -aspect 16:9 '%s' </dev/null", sprintf(cmd, "ffmpeg -y -f mjpeg -i '%s' -s 1280x720 -aspect 16:9 '%s' >/dev/null",
fname, destname); fname, destname);
system(cmd); /* TODO: use libavcodec to directly convert it */ system(cmd); /* TODO: use libavcodec to directly convert it */
utime(destname, &u); utime(destname, &u);
@@ -469,17 +491,19 @@ void cVideo::ShowPicture(const char * fname, const char *_destname)
{ {
stillpicture = true; stillpicture = true;
if (ioctl(fd, VIDEO_SET_FORMAT, VIDEO_FORMAT_16_9) < 0)
lt_info("%s: VIDEO_SET_FORMAT failed (%m)\n", __func__);
bool seq_end_avail = false; bool seq_end_avail = false;
off_t pos=0; off_t pos=0;
unsigned char *iframe = (unsigned char *)malloc((st.st_size < 8192) ? 8192 : st.st_size); unsigned char iframe[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);
if(iframe[0] == 0x00 && iframe[1] == 0x00 && iframe[2] == 0x00 && iframe[3] == 0x01 && (iframe[4] & 0x0f) == 0x07)
ioctl(fd, VIDEO_SET_STREAMTYPE, 1); // set to mpeg4
else
ioctl(fd, VIDEO_SET_STREAMTYPE, 0); // set to mpeg2
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);
@@ -488,14 +512,17 @@ void cVideo::ShowPicture(const char * fname, const char *_destname)
++pos; ++pos;
if ((iframe[3] >> 4) != 0xE) // no pes header if ((iframe[3] >> 4) != 0xE) // no pes header
write(fd, pes_header, sizeof(pes_header)); write_all(fd, pes_header, sizeof(pes_header));
write(fd, iframe, st.st_size); else
iframe[4] = iframe[5] = 0x00;
write_all(fd, iframe, st.st_size);
if (!seq_end_avail) if (!seq_end_avail)
write(fd, seq_end, sizeof(seq_end)); write(fd, seq_end, sizeof(seq_end));
memset(iframe, 0, 8192); memset(iframe, 0, 8192);
write(fd, iframe, 8192); write_all(fd, iframe, 8192);
usleep(150000);
ioctl(fd, VIDEO_STOP, 0);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX); ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
free(iframe);
} }
out: out:
close(mfd); close(mfd);
@@ -956,12 +983,13 @@ void cVideo::SetCECState(bool state)
if ((standby_cec_activ) && state){ if ((standby_cec_activ) && state){
message.data[0] = CEC_MSG_STANDBY; message.data[0] = CEC_MSG_STANDBY;
message.data[1] = 1; message.data[1] = 1;
sendCECMessage(message);
} }
if ((autoview_cec_activ) && !state){ if ((autoview_cec_activ) && !state){
message.data[0] = CEC_MSG_IMAGE_VIEW_ON; message.data[0] = CEC_MSG_IMAGE_VIEW_ON;
message.data[1] = 1; message.data[1] = 1;
sendCECMessage(message);
} }
sendCECMessage(message);
} }