X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/740ae9b4a03c13901e4f4ffc008e4c0cfd63d896..e7e5b70162a6e74d7ee293495635c79660e0f7a8:/lib/dvb/decoder.cpp diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 7bdb3062..90bf19e1 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #if HAVE_DVB_API_VERSION < 3 @@ -10,8 +10,14 @@ #define videoStreamSource_t video_stream_source_t #define streamSource stream_source #define dmxPesFilterParams dmx_pes_filter_params -#define DMX_PES_VIDEO DMX_PES_VIDEO0 -#define DMX_PES_AUDIO DMX_PES_AUDIO0 +#define DMX_PES_VIDEO0 DMX_PES_VIDEO +#define DMX_PES_AUDIO0 DMX_PES_AUDIO +#define DMX_PES_PCR0 DMX_PES_PCR +#define DMX_PES_TELETEXT0 DMX_PES_TELETEXT +#define DMX_PES_VIDEO1 DMX_PES_VIDEO +#define DMX_PES_AUDIO1 DMX_PES_AUDIO +#define DMX_PES_PCR1 DMX_PES_PCR +#define DMX_PES_TELETEXT1 DMX_PES_TELETEXT #include #include #include @@ -24,15 +30,24 @@ #include #include #include +#include +#include #include + /* these are quite new... */ +#ifndef AUDIO_GET_PTS +#define AUDIO_GET_PTS _IOR('o', 19, __u64) +#define VIDEO_GET_PTS _IOR('o', 57, __u64) +#endif + DEFINE_REF(eDVBAudio); -eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux) +eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev) + :m_demux(demux), m_dev(dev) { char filename[128]; #if HAVE_DVB_API_VERSION < 3 - sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev); + sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev); #else sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev); #endif @@ -43,14 +58,106 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux) sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux); #else sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux); -#endif +#endif m_fd_demux = ::open(filename, O_RDWR); if (m_fd_demux < 0) eWarning("%s: %m", filename); } - + +#if HAVE_DVB_API_VERSION < 3 +int eDVBAudio::setPid(int pid, int type) +{ + if ((m_fd < 0) || (m_fd_demux < 0)) + return -1; + + int bypass = 0; + + switch (type) + { + case aMPEG: + bypass = 1; + break; + case aAC3: + bypass = 0; + break; + /* + case aDTS: + bypass = 2; + break; + */ + } + + if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0) + eDebug("failed (%m)"); + + dmx_pes_filter_params pes; + + pes.pid = pid; + pes.input = DMX_IN_FRONTEND; + pes.output = DMX_OUT_DECODER; + pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */ + pes.flags = 0; + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid); + if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + + return 0; +} + +int eDVBAudio::startPid() +{ + eDebugNoNewLine("DEMUX_START - audio - "); + if (::ioctl(m_fd_demux, DMX_START) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; +} + +int eDVBAudio::start() +{ + eDebugNoNewLine("AUDIO_PLAY - "); + if (::ioctl(m_fd, AUDIO_PLAY) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; +} + +int eDVBAudio::stopPid() +{ + eDebugNoNewLine("DEMUX_STOP - audio - "); + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; +} + +int eDVBAudio::setAVSync(int val) +{ + eDebugNoNewLine("AUDIO_SET_AV_SYNC - "); + if (::ioctl(m_fd, AUDIO_SET_AV_SYNC, val) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; +} +#else int eDVBAudio::startPid(int pid, int type) -{ +{ if ((m_fd < 0) || (m_fd_demux < 0)) return -1; dmx_pes_filter_params pes; @@ -58,21 +165,24 @@ int eDVBAudio::startPid(int pid, int type) pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_AUDIO; // DMX_PES_AUDIO0 + pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */ pes.flags = 0; + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid); if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { - eWarning("audio: DMX_SET_PES_FILTER: %m"); + eDebug("failed (%m)"); return -errno; } + eDebug("ok"); + eDebugNoNewLine("DEMUX_START - audio - "); if (::ioctl(m_fd_demux, DMX_START) < 0) { - eWarning("audio: DMX_START: %m"); + eDebug("failed (%m)"); return -errno; } - + eDebug("ok"); int bypass = 0; - + switch (type) { case aMPEG: @@ -81,59 +191,107 @@ int eDVBAudio::startPid(int pid, int type) case aAC3: bypass = 0; break; - /* case aDTS: bypass = 2; break; - */ + case aAAC: + bypass = 8; + break; + case aAACHE: + bypass = 9; + break; + case aLPCM: + bypass = 6; + break; } - + + eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass); if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0) - eWarning("audio: AUDIO_SET_BYPASS_MODE: %m"); - + eDebug("failed (%m)"); + else + eDebug("ok"); + freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState + eDebugNoNewLine("AUDIO_PLAY - "); if (::ioctl(m_fd, AUDIO_PLAY) < 0) - eWarning("audio: AUDIO_PLAY: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); return 0; } - +#endif + void eDVBAudio::stop() { +#if HAVE_DVB_API_VERSION > 2 + flush(); +#endif + eDebugNoNewLine("AUDIO_STOP - "); if (::ioctl(m_fd, AUDIO_STOP) < 0) - eWarning("audio: AUDIO_STOP: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); #if HAVE_DVB_API_VERSION > 2 + eDebugNoNewLine("DEMUX_STOP - audio - "); if (::ioctl(m_fd_demux, DMX_STOP) < 0) - eWarning("audio: DMX_STOP: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); #endif } - -#if HAVE_DVB_API_VERSION < 3 -void eDVBAudio::stopPid() -{ - if (::ioctl(m_fd_demux, DMX_STOP) < 0) - eWarning("audio: DMX_STOP: %m"); -} -#endif void eDVBAudio::flush() { + eDebugNoNewLine("AUDIO_CLEAR_BUFFER - "); if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0) - eDebug("audio: AUDIO_CLEAR_BUFFER: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); } void eDVBAudio::freeze() { + eDebugNoNewLine("AUDIO_PAUSE - "); if (::ioctl(m_fd, AUDIO_PAUSE) < 0) - eDebug("video: AUDIO_PAUSE: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); } void eDVBAudio::unfreeze() { + eDebugNoNewLine("AUDIO_CONTINUE - "); if (::ioctl(m_fd, AUDIO_CONTINUE) < 0) - eDebug("video: AUDIO_CONTINUE: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); +} + +void eDVBAudio::setChannel(int channel) +{ + int val = AUDIO_STEREO; + switch (channel) + { + case aMonoLeft: val = AUDIO_MONO_LEFT; break; + case aMonoRight: val = AUDIO_MONO_RIGHT; break; + default: break; + } + eDebugNoNewLine("AUDIO_CHANNEL_SELECT(%d) - ", val); + if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0) + eDebug("failed (%m)"); + else + eDebug("ok"); } - + +int eDVBAudio::getPTS(pts_t &now) +{ + if (::ioctl(m_fd, AUDIO_GET_PTS, &now) < 0) + eDebug("AUDIO_GET_PTS failed (%m)"); + return 0; +} + eDVBAudio::~eDVBAudio() { + unfreeze(); // why unfreeze here... but not unfreeze video in ~eDVBVideo ?!? if (m_fd >= 0) ::close(m_fd); if (m_fd_demux >= 0) @@ -142,17 +300,28 @@ eDVBAudio::~eDVBAudio() DEFINE_REF(eDVBVideo); -eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) +eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev) + : m_demux(demux), m_dev(dev), + m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1) { char filename[128]; #if HAVE_DVB_API_VERSION < 3 sprintf(filename, "/dev/dvb/card%d/video%d", demux->adapter, dev); + m_fd_video = ::open("/dev/video", O_RDWR); + if (m_fd_video < 0) + eWarning("/dev/video: %m"); #else sprintf(filename, "/dev/dvb/adapter%d/video%d", demux->adapter, dev); #endif m_fd = ::open(filename, O_RDWR); if (m_fd < 0) eWarning("%s: %m", filename); + else + { + m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Priority); + CONNECT(m_sn->activated, eDVBVideo::video_event); + } + eDebug("Video Device: %s", filename); #if HAVE_DVB_API_VERSION < 3 sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux); #else @@ -161,10 +330,20 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux) m_fd_demux = ::open(filename, O_RDWR); if (m_fd_demux < 0) eWarning("%s: %m", filename); + eDebug("demux device: %s", filename); } - -int eDVBVideo::startPid(int pid) -{ + +// not finally values i think.. !! +#define VIDEO_STREAMTYPE_MPEG2 0 +#define VIDEO_STREAMTYPE_MPEG4_H264 1 +#define VIDEO_STREAMTYPE_VC1 3 +#define VIDEO_STREAMTYPE_MPEG4_Part2 4 +#define VIDEO_STREAMTYPE_VC1_SM 5 +#define VIDEO_STREAMTYPE_MPEG1 6 + +#if HAVE_DVB_API_VERSION < 3 +int eDVBVideo::setPid(int pid) +{ if ((m_fd < 0) || (m_fd_demux < 0)) return -1; dmx_pes_filter_params pes; @@ -172,87 +351,446 @@ int eDVBVideo::startPid(int pid) pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_VIDEO; + pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */ pes.flags = 0; + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid); if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { - eWarning("video: DMX_SET_PES_FILTER: %m"); + eDebug("failed (%m)"); return -errno; } + eDebug("ok"); + return 0; +} + +int eDVBVideo::startPid() +{ + eDebugNoNewLine("DEMUX_START - video - "); if (::ioctl(m_fd_demux, DMX_START) < 0) { - eWarning("video: DMX_START: %m"); + eDebug("failed (%m)"); return -errno; } + eDebug("ok"); + return 0; +} + +int eDVBVideo::start() +{ + eDebugNoNewLine("VIDEO_PLAY - "); if (::ioctl(m_fd, VIDEO_PLAY) < 0) - eWarning("video: VIDEO_PLAY: %m"); + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); return 0; } - -void eDVBVideo::stop() + +int eDVBVideo::stopPid() { -#if HAVE_DVB_API_VERSION > 2 + eDebugNoNewLine("DEMUX_STOP - video - "); if (::ioctl(m_fd_demux, DMX_STOP) < 0) - eWarning("video: DMX_STOP: %m"); -#endif - eDebug("VIDEO_STOP"); - if (::ioctl(m_fd, VIDEO_STOP, 1) < 0) - eWarning("video: VIDEO_STOP: %m"); + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; } +#else +int eDVBVideo::startPid(int pid, int type) +{ + int streamtype = VIDEO_STREAMTYPE_MPEG2; -#if HAVE_DVB_API_VERSION < 3 -void eDVBVideo::stopPid() + if ((m_fd < 0) || (m_fd_demux < 0)) + return -1; + dmx_pes_filter_params pes; + + switch(type) + { + default: + case MPEG2: + break; + case MPEG4_H264: + streamtype = VIDEO_STREAMTYPE_MPEG4_H264; + break; + case MPEG1: + streamtype = VIDEO_STREAMTYPE_MPEG1; + break; + case MPEG4_Part2: + streamtype = VIDEO_STREAMTYPE_MPEG4_Part2; + break; + case VC1: + streamtype = VIDEO_STREAMTYPE_VC1; + break; + case VC1_SM: + streamtype = VIDEO_STREAMTYPE_VC1_SM; + break; + } + + eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ", streamtype); + if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE, streamtype) < 0) + eDebug("failed (%m)"); + else + eDebug("ok"); + + pes.pid = pid; + pes.input = DMX_IN_FRONTEND; + pes.output = DMX_OUT_DECODER; + pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */ + pes.flags = 0; + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid); + if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + eDebugNoNewLine("DEMUX_START - video - "); + if (::ioctl(m_fd_demux, DMX_START) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + freeze(); // why freeze here?!? this is a problem when only a pid change is requested... because of the unfreeze logic in Decoder::setState + eDebugNoNewLine("VIDEO_PLAY - "); + if (::ioctl(m_fd, VIDEO_PLAY) < 0) + eDebug("failed (%m)"); + else + eDebug("ok"); + return 0; +} +#endif + +void eDVBVideo::stop() { +#if HAVE_DVB_API_VERSION > 2 + eDebugNoNewLine("DEMUX_STOP - video - "); if (::ioctl(m_fd_demux, DMX_STOP) < 0) - eWarning("video: DMX_STOP: %m"); -} + eDebug("failed (%m)"); + else + eDebug("ok"); #endif + eDebugNoNewLine("VIDEO_STOP - "); + if (::ioctl(m_fd, VIDEO_STOP, 1) < 0) + eDebug("failed (%m)"); + else + eDebug("ok"); +} void eDVBVideo::flush() { + eDebugNoNewLine("VIDEO_CLEAR_BUFFER - "); if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0) - eDebug("video: VIDEO_CLEAR_BUFFER: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); } - + void eDVBVideo::freeze() { + eDebugNoNewLine("VIDEO_FREEZE - "); if (::ioctl(m_fd, VIDEO_FREEZE) < 0) - eDebug("video: VIDEO_FREEZE: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); } - + void eDVBVideo::unfreeze() { + eDebugNoNewLine("VIDEO_CONTINUE - "); if (::ioctl(m_fd, VIDEO_CONTINUE) < 0) - eDebug("video: VIDEO_CONTINUE: %m"); + eDebug("failed (%m)"); + else + eDebug("ok"); +} + +int eDVBVideo::setSlowMotion(int repeat) +{ + eDebugNoNewLine("VIDEO_SLOWMOTION(%d) - ", repeat); + int ret = ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat); + if (ret < 0) + eDebug("failed(%m)"); + else + eDebug("ok"); + return ret; +} + +int eDVBVideo::setFastForward(int skip) +{ + eDebugNoNewLine("VIDEO_FAST_FORWARD(%d) - ", skip); + int ret = ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip); + if (ret < 0) + eDebug("failed(%m)"); + else + eDebug("ok"); + return ret; +} + +int eDVBVideo::getPTS(pts_t &now) +{ +#if HAVE_DVB_API_VERSION < 3 + #define VIDEO_GET_PTS_OLD _IOR('o', 1, unsigned int*) + unsigned int pts; + int ret = ::ioctl(m_fd_video, VIDEO_GET_PTS_OLD, &pts); + now = pts; + now *= 2; +#else + int ret = ::ioctl(m_fd, VIDEO_GET_PTS, &now); +#endif + if (ret < 0) + eDebug("VIDEO_GET_PTS failed(%m)"); + return ret; +} + +eDVBVideo::~eDVBVideo() +{ + if (m_fd >= 0) + ::close(m_fd); + if (m_fd_demux >= 0) + ::close(m_fd_demux); +#if HAVE_DVB_API_VERSION < 3 + if (m_fd_video >= 0) + ::close(m_fd_video); +#endif +} + +void eDVBVideo::video_event(int) +{ +#if HAVE_DVB_API_VERSION >= 3 + struct video_event evt; + eDebugNoNewLine("VIDEO_GET_EVENT - "); + if (::ioctl(m_fd, VIDEO_GET_EVENT, &evt) < 0) + eDebug("failed (%m)"); + else + { + eDebug("ok"); + if (evt.type == VIDEO_EVENT_SIZE_CHANGED) + { + struct iTSMPEGDecoder::videoEvent event; + event.type = iTSMPEGDecoder::videoEvent::eventSizeChanged; + m_aspect = event.aspect = evt.u.size.aspect_ratio == 0 ? 2 : 3; // convert dvb api to etsi + m_height = event.height = evt.u.size.h; + m_width = event.width = evt.u.size.w; + /* emit */ m_event(event); + } + else if (evt.type == VIDEO_EVENT_FRAME_RATE_CHANGED) + { + struct iTSMPEGDecoder::videoEvent event; + event.type = iTSMPEGDecoder::videoEvent::eventFrameRateChanged; + m_framerate = event.framerate = evt.u.frame_rate; + /* emit */ m_event(event); + } + else if (evt.type == 16 /*VIDEO_EVENT_PROGRESSIVE_CHANGED*/) + { + struct iTSMPEGDecoder::videoEvent event; + event.type = iTSMPEGDecoder::videoEvent::eventProgressiveChanged; + m_progressive = event.progressive = evt.u.frame_rate; + /* emit */ m_event(event); + } + else + eDebug("unhandled DVBAPI Video Event %d", evt.type); + } +#else +#warning "FIXMEE!! Video Events not implemented for old api" +#endif +} + +RESULT eDVBVideo::connectEvent(const Slot1 &event, ePtr &conn) +{ + conn = new eConnection(this, m_event.connect(event)); + return 0; +} + +static int readMpegProc(char *str, int decoder) +{ + int val = -1; + char tmp[64]; + sprintf(tmp, "/proc/stb/vmpeg/%d/%s", decoder, str); + FILE *f = fopen(tmp, "r"); + if (f) + { + fscanf(f, "%x", &val); + fclose(f); + } + return val; +} + +static int readApiSize(int fd, int &xres, int &yres, int &aspect) +{ +#if HAVE_DVB_API_VERSION >= 3 + video_size_t size; + if (!::ioctl(fd, VIDEO_GET_SIZE, &size)) + { + xres = size.w; + yres = size.h; + aspect = size.aspect_ratio == 0 ? 2 : 3; // convert dvb api to etsi + return 0; + } +// eDebug("VIDEO_GET_SIZE failed (%m)"); +#endif + return -1; +} + +static int readApiFrameRate(int fd, int &framerate) +{ +#if HAVE_DVB_API_VERSION >= 3 + unsigned int frate; + if (!::ioctl(fd, VIDEO_GET_FRAME_RATE, &frate)) + { + framerate = frate; + return 0; + } +// eDebug("VIDEO_GET_FRAME_RATE failed (%m)"); +#endif + return -1; +} + +int eDVBVideo::getWidth() +{ + if (m_width == -1) + readApiSize(m_fd, m_width, m_height, m_aspect); + if (m_width == -1) + m_width = readMpegProc("xres", m_dev); + return m_width; +} + +int eDVBVideo::getHeight() +{ + if (m_height == -1) + readApiSize(m_fd, m_width, m_height, m_aspect); + if (m_height == -1) + m_height = readMpegProc("yres", m_dev); + return m_height; +} + +int eDVBVideo::getAspect() +{ + if (m_aspect == -1) + readApiSize(m_fd, m_width, m_height, m_aspect); + if (m_aspect == -1) + m_aspect = readMpegProc("aspect", m_dev); + return m_aspect; +} + +int eDVBVideo::getProgressive() +{ + if (m_progressive == -1) + m_progressive = readMpegProc("progressive", m_dev); + return m_progressive; +} + +int eDVBVideo::getFrameRate() +{ + if (m_framerate == -1) + readApiFrameRate(m_fd, m_framerate); + if (m_framerate == -1) + m_framerate = readMpegProc("framerate", m_dev); + return m_framerate; +} + +DEFINE_REF(eDVBPCR); + +eDVBPCR::eDVBPCR(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev) +{ + char filename[128]; +#if HAVE_DVB_API_VERSION < 3 + sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux); +#else + sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux); +#endif + m_fd_demux = ::open(filename, O_RDWR); + if (m_fd_demux < 0) + eWarning("%s: %m", filename); +} + +#if HAVE_DVB_API_VERSION < 3 +int eDVBPCR::setPid(int pid) +{ + if (m_fd_demux < 0) + return -1; + dmx_pes_filter_params pes; + + pes.pid = pid; + pes.input = DMX_IN_FRONTEND; + pes.output = DMX_OUT_DECODER; + pes.pes_type = DMX_PES_PCR; + pes.flags = 0; + + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid); + if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; +} + +int eDVBPCR::startPid() +{ + if (m_fd_demux < 0) + return -1; + eDebugNoNewLine("DEMUX_START - pcr - "); + if (::ioctl(m_fd_demux, DMX_START) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; } - -int eDVBVideo::setSlowMotion(int repeat) +#else +int eDVBPCR::startPid(int pid) { - m_is_slow_motion = repeat; - return ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat); + if (m_fd_demux < 0) + return -1; + dmx_pes_filter_params pes; + + pes.pid = pid; + pes.input = DMX_IN_FRONTEND; + pes.output = DMX_OUT_DECODER; + pes.pes_type = m_dev ? DMX_PES_PCR1 : DMX_PES_PCR0; /* FIXME */ + pes.flags = 0; + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid); + if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + eDebugNoNewLine("DEMUX_START - pcr - "); + if (::ioctl(m_fd_demux, DMX_START) < 0) + { + eDebug("failed (%m)"); + return -errno; + } + eDebug("ok"); + return 0; } +#endif -int eDVBVideo::setFastForward(int skip) +void eDVBPCR::stop() { - m_is_fast_forward = skip; - return ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip); + eDebugNoNewLine("DEMUX_STOP - pcr - "); + if (::ioctl(m_fd_demux, DMX_STOP) < 0) + eDebug("failed(%m)"); + else + eDebug("ok"); } - -eDVBVideo::~eDVBVideo() + +eDVBPCR::~eDVBPCR() { - if (m_is_slow_motion) - setSlowMotion(0); - if (m_is_fast_forward) - setFastForward(0); - if (m_fd >= 0) - ::close(m_fd); if (m_fd_demux >= 0) ::close(m_fd_demux); } -DEFINE_REF(eDVBPCR); +DEFINE_REF(eDVBTText); -eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux) +eDVBTText::eDVBTText(eDVBDemux *demux, int dev) + :m_demux(demux), m_dev(dev) { char filename[128]; #if HAVE_DVB_API_VERSION < 3 @@ -265,7 +803,7 @@ eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux) eWarning("%s: %m", filename); } -int eDVBPCR::startPid(int pid) +int eDVBTText::startPid(int pid) { if (m_fd_demux < 0) return -1; @@ -274,28 +812,36 @@ int eDVBPCR::startPid(int pid) pes.pid = pid; pes.input = DMX_IN_FRONTEND; pes.output = DMX_OUT_DECODER; - pes.pes_type = DMX_PES_PCR; + pes.pes_type = m_dev ? DMX_PES_TELETEXT1 : DMX_PES_TELETEXT0; // FIXME pes.flags = 0; + + eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - ttx - ", pid); if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0) { - eWarning("video: DMX_SET_PES_FILTER: %m"); + eDebug("failed(%m)"); return -errno; } + eDebug("ok"); + eDebugNoNewLine("DEMUX_START - ttx - "); if (::ioctl(m_fd_demux, DMX_START) < 0) { - eWarning("video: DMX_START: %m"); + eDebug("failed(%m)"); return -errno; } + eDebug("ok"); return 0; } -void eDVBPCR::stop() +void eDVBTText::stop() { + eDebugNoNewLine("DEMUX_STOP - ttx - "); if (::ioctl(m_fd_demux, DMX_STOP) < 0) - eWarning("video: DMX_STOP: %m"); + eDebug("failed(%m)"); + else + eDebug("ok"); } -eDVBPCR::~eDVBPCR() +eDVBTText::~eDVBTText() { if (m_fd_demux >= 0) ::close(m_fd_demux); @@ -306,13 +852,22 @@ DEFINE_REF(eTSMPEGDecoder); int eTSMPEGDecoder::setState() { int res = 0; - - int noaudio = m_is_sm || m_is_ff || m_is_trickmode; - + + int noaudio = (m_state != statePlay) && (m_state != statePause); + int nott = noaudio; /* actually same conditions */ + if ((noaudio && m_audio) || (!m_audio && !noaudio)) - m_changed |= changeAudio; - + m_changed |= changeAudio | changeState; + + if ((nott && m_text) || (!m_text && !nott)) + m_changed |= changeText | changeState; + + const char *decoder_states[] = {"stop", "pause", "play", "decoderfastforward", "trickmode", "slowmotion"}; + eDebug("decoder state: %s, vpid=%d, apid=%d", decoder_states[m_state], m_vpid, m_apid); + + int changed = m_changed; #if HAVE_DVB_API_VERSION < 3 + bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR); if (m_changed & changeAudio && m_audio) m_audio->stopPid(); if (m_changed & changeVideo && m_video) @@ -321,124 +876,235 @@ int eTSMPEGDecoder::setState() { m_pcr->stop(); m_pcr=0; + if (!(m_pcrpid >= 0 && m_pcrpid < 0x1ff)) + m_changed &= ~changePCR; } if (m_changed & changeAudio && m_audio) { m_audio->stop(); m_audio=0; + if (!(m_apid >= 0 && m_apid < 0x1ff)) + m_changed &= ~changeAudio; } if (m_changed & changeVideo && m_video) { m_video->stop(); m_video=0; + m_video_event_conn=0; + if (!(m_vpid >= 0 && m_vpid < 0x1ff)) + m_changed &= ~changeVideo; + } + if (m_changed & changeVideo) + { + m_video = new eDVBVideo(m_demux, m_decoder); + m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn); + if (m_video->setPid(m_vpid)) + res -1; } if (m_changed & changePCR) { - m_pcr = new eDVBPCR(m_demux); - if (m_pcr->startPid(m_pcrpid)) - { - eWarning("pcr: startpid failed!"); + m_pcr = new eDVBPCR(m_demux, m_decoder); + if (m_pcr->setPid(m_pcrpid)) + res = -1; + } + if (m_changed & changeAudio) + { + m_audio = new eDVBAudio(m_demux, m_decoder); + if (m_audio->setPid(m_apid, m_atype)) + res = -1; + } + if (m_changed & changePCR) + { + if (m_pcr->startPid()) res = -1; - } m_changed &= ~changePCR; } + else if (checkAVSync && m_audio && m_video) + { + if (m_audio->setAVSync(1)) + res = -1; + } if (m_changed & changeVideo) { - m_video = new eDVBVideo(m_demux, 0); - if (m_video->startPid(m_vpid)) - { - eWarning("video: startpid failed!"); + if (m_video->startPid() || m_video->start()) res = -1; - } m_changed &= ~changeVideo; } if (m_changed & changeAudio) { - m_audio = new eDVBAudio(m_demux, 0); - if (m_audio->startPid(m_apid, m_atype)) - { - eWarning("audio: startpid failed!"); + if (m_audio->start() || m_audio->startPid()) res = -1; - } m_changed &= ~changeAudio; } #else + if (m_changed & changePCR) + { + if (m_pcr) + m_pcr->stop(); + m_pcr = 0; + } if (m_changed & changeVideo) { - eDebug("VIDEO CHANGED (to %04x)", m_vpid); if (m_video) - { - eDebug("STOP"); - m_video->stop(); - } - m_video = 0; - if ((m_vpid >= 0) && (m_vpid < 0x1FFF)) { - eDebug("new video"); - m_video = new eDVBVideo(m_demux, 0); - if (m_video->startPid(m_vpid)) - { - eWarning("video: startpid failed!"); - res = -1; - } + m_video->stop(); + m_video = 0; + m_video_event_conn = 0; } - m_changed &= ~changeVideo; + } + if (m_changed & changeAudio) + { + if (m_audio) + m_audio->stop(); + m_audio = 0; + } + if (m_changed & changeText) + { + if (m_text) + m_text->stop(); + m_text = 0; } if (m_changed & changePCR) { - if (m_pcr) - m_pcr->stop(); - m_pcr = 0; if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF)) { - m_pcr = new eDVBPCR(m_demux); + m_pcr = new eDVBPCR(m_demux, m_decoder); if (m_pcr->startPid(m_pcrpid)) - { - eWarning("pcr: startpid failed!"); res = -1; - } } m_changed &= ~changePCR; } if (m_changed & changeAudio) { - if (m_audio) - m_audio->stop(); - m_audio = 0; if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio) { - m_audio = new eDVBAudio(m_demux, 0); + m_audio = new eDVBAudio(m_demux, m_decoder); if (m_audio->startPid(m_apid, m_atype)) - { - eWarning("audio: startpid failed!"); res = -1; - } } m_changed &= ~changeAudio; } + if (m_changed & changeVideo) + { + if ((m_vpid >= 0) && (m_vpid < 0x1FFF)) + { + m_video = new eDVBVideo(m_demux, m_decoder); + m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn); + if (m_video->startPid(m_vpid, m_vtype)) + res = -1; + } + m_changed &= ~changeVideo; + } + if (m_changed & changeText) + { + if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott) + { + m_text = new eDVBTText(m_demux, m_decoder); + if (m_text->startPid(m_textpid)) + res = -1; + } + m_changed &= ~changeText; + } #endif + + if (changed & (changeState|changeVideo|changeAudio)) + { + /* play, slowmotion, fast-forward */ + int state_table[6][4] = + { + /* [stateStop] = */ {0, 0, 0}, + /* [statePause] = */ {0, 0, 0}, + /* [statePlay] = */ {1, 0, 0}, + /* [stateDecoderFastForward] = */ {1, 0, m_ff_sm_ratio}, + /* [stateHighspeedFastForward] = */ {1, 0, 1}, + /* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0} + }; + int *s = state_table[m_state]; + if (changed & (changeState|changeVideo) && m_video) + { + m_video->setSlowMotion(s[1]); + m_video->setFastForward(s[2]); + if (s[0]) + m_video->unfreeze(); + else + m_video->freeze(); + } + if (changed & (changeState|changeAudio) && m_audio) + { + if (s[0]) + m_audio->unfreeze(); + else + m_audio->freeze(); + } + m_changed &= ~changeState; + } + + if (changed && !m_video && m_audio && m_radio_pic.length()) + showSinglePic(m_radio_pic.c_str()); + return res; } -eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0) +int eTSMPEGDecoder::m_pcm_delay=-1, + eTSMPEGDecoder::m_ac3_delay=-1; + +RESULT eTSMPEGDecoder::setPCMDelay(int delay) +{ + if (m_decoder == 0 && delay != m_pcm_delay ) + { + FILE *fp = fopen("/proc/stb/audio/audio_delay_pcm", "w"); + if (fp) + { + fprintf(fp, "%x", delay*90); + fclose(fp); + m_pcm_delay = delay; + return 0; + } + } + return -1; +} + +RESULT eTSMPEGDecoder::setAC3Delay(int delay) { - demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event); - m_is_ff = m_is_sm = m_is_trickmode = 0; + if ( m_decoder == 0 && delay != m_ac3_delay ) + { + FILE *fp = fopen("/proc/stb/audio/audio_delay_bitstream", "w"); + if (fp) + { + fprintf(fp, "%x", delay*90); + fclose(fp); + m_ac3_delay = delay; + return 0; + } + } + return -1; +} + +eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder) + : m_demux(demux), + m_vpid(-1), m_vtype(-1), m_apid(-1), m_atype(-1), m_pcrpid(-1), m_textpid(-1), + m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eTimer::create(eApp)) +{ + demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn); + CONNECT(m_showSinglePicTimer->timeout, eTSMPEGDecoder::finishShowSinglePic); + m_state = stateStop; } eTSMPEGDecoder::~eTSMPEGDecoder() { - m_vpid = m_apid = m_pcrpid = pidNone; + finishShowSinglePic(); + m_vpid = m_apid = m_pcrpid = m_textpid = pidNone; m_changed = -1; setState(); } -RESULT eTSMPEGDecoder::setVideoPID(int vpid) +RESULT eTSMPEGDecoder::setVideoPID(int vpid, int type) { - if (m_vpid != vpid) + if ((m_vpid != vpid) || (m_vtype != type)) { m_changed |= changeVideo; m_vpid = vpid; + m_vtype = type; } return 0; } @@ -454,85 +1120,115 @@ RESULT eTSMPEGDecoder::setAudioPID(int apid, int type) return 0; } -RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid) +int eTSMPEGDecoder::m_audio_channel = -1; + +RESULT eTSMPEGDecoder::setAudioChannel(int channel) { - if (m_pcrpid != pcrpid) + if (channel == -1) + channel = ac_stereo; + if (m_decoder == 0 && m_audio_channel != channel) { - m_changed |= changePCR; - m_pcrpid = pcrpid; + if (m_audio) + { + m_audio->setChannel(channel); + m_audio_channel=channel; + } + else + eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist"); } return 0; } -RESULT eTSMPEGDecoder::setSyncMaster(int who) +int eTSMPEGDecoder::getAudioChannel() { - return -1; + return m_audio_channel == -1 ? ac_stereo : m_audio_channel; } -RESULT eTSMPEGDecoder::start() +RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid) { - return setState(); + if (m_pcrpid != pcrpid) + { + m_changed |= changePCR; + m_pcrpid = pcrpid; + } + return 0; } -RESULT eTSMPEGDecoder::freeze(int cont) +RESULT eTSMPEGDecoder::setTextPID(int textpid) { - if (m_video) - m_video->freeze(); - - if (m_audio) - m_audio->freeze(); - + if (m_textpid != textpid) + { + m_changed |= changeText; + m_textpid = textpid; + } return 0; } -RESULT eTSMPEGDecoder::unfreeze() +RESULT eTSMPEGDecoder::setSyncMaster(int who) { - if (m_video) - m_video->unfreeze(); + return -1; +} - if (m_audio) - m_audio->unfreeze(); - - return 0; +RESULT eTSMPEGDecoder::set() +{ + return setState(); } -RESULT eTSMPEGDecoder::setSinglePictureMode(int when) +RESULT eTSMPEGDecoder::play() { - return -1; + if (m_state == statePlay) + { + if (!m_changed) + return 0; + } else + { + m_state = statePlay; + m_changed |= changeState; + } + return setState(); } -RESULT eTSMPEGDecoder::setPictureSkipMode(int what) +RESULT eTSMPEGDecoder::pause() { - return -1; + if (m_state == statePause) + return 0; + m_state = statePause; + m_changed |= changeState; + return setState(); } RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip) { - m_is_ff = frames_to_skip != 0; - - setState(); - - if (m_video) - return m_video->setFastForward(frames_to_skip); - else - return -1; + if ((m_state == stateDecoderFastForward) && (m_ff_sm_ratio == frames_to_skip)) + return 0; + + m_state = stateDecoderFastForward; + m_ff_sm_ratio = frames_to_skip; + m_changed |= changeState; + return setState(); + +// return m_video->setFastForward(frames_to_skip); } RESULT eTSMPEGDecoder::setSlowMotion(int repeat) { - m_is_sm = repeat != 0; - - setState(); - - if (m_video) - return m_video->setSlowMotion(repeat); - else - return -1; + if ((m_state == stateSlowMotion) && (m_ff_sm_ratio == repeat)) + return 0; + + m_state = stateSlowMotion; + m_ff_sm_ratio = repeat; + m_changed |= changeState; + return setState(); } -RESULT eTSMPEGDecoder::setZoom(int what) +RESULT eTSMPEGDecoder::setTrickmode() { - return -1; + if (m_state == stateTrickmode) + return 0; + + m_state = stateTrickmode; + m_changed |= changeState; + return setState(); } RESULT eTSMPEGDecoder::flush() @@ -556,9 +1252,152 @@ void eTSMPEGDecoder::demux_event(int event) } } -RESULT eTSMPEGDecoder::setTrickmode(int what) +RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts) { - m_is_trickmode = what; - setState(); + if (what == 0) /* auto */ + what = m_video ? 1 : 2; + + if (what == 1) /* video */ + { + if (m_video) + return m_video->getPTS(pts); + else + return -1; + } + + if (what == 2) /* audio */ + { + if (m_audio) + return m_audio->getPTS(pts); + else + return -1; + } + + return -1; +} + +RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename) +{ + m_radio_pic = filename; + return 0; +} + +RESULT eTSMPEGDecoder::showSinglePic(const char *filename) +{ + if (m_decoder == 0) + { + eDebug("showSinglePic %s", filename); + int f = open(filename, O_RDONLY); + if (f >= 0) + { + struct stat s; + fstat(f, &s); + if (m_video_clip_fd == -1) + m_video_clip_fd = open("/dev/dvb/adapter0/video0", O_WRONLY|O_NONBLOCK); + if (m_video_clip_fd >= 0) + { + bool seq_end_avail = false; + size_t pos=0; + unsigned char pes_header[] = { 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x80, 0x00, 0x00 }; + unsigned char seq_end[] = { 0x00, 0x00, 0x01, 0xB7 }; + unsigned char iframe[s.st_size]; + unsigned char stuffing[8192]; + int streamtype = VIDEO_STREAMTYPE_MPEG2; + memset(stuffing, 0, 8192); + read(f, iframe, s.st_size); + if (ioctl(m_video_clip_fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY) < 0) + eDebug("VIDEO_SELECT_SOURCE MEMORY failed (%m)"); + if (ioctl(m_video_clip_fd, VIDEO_SET_STREAMTYPE, streamtype) < 0) + eDebug("VIDEO_SET_STREAMTYPE failed(%m)"); + if (ioctl(m_video_clip_fd, VIDEO_PLAY) < 0) + eDebug("VIDEO_PLAY failed (%m)"); + if (ioctl(m_video_clip_fd, VIDEO_CONTINUE) < 0) + eDebug("video: VIDEO_CONTINUE: %m"); + if (ioctl(m_video_clip_fd, VIDEO_CLEAR_BUFFER) < 0) + eDebug("video: VIDEO_CLEAR_BUFFER: %m"); + while(pos <= (s.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(m_video_clip_fd, pes_header, sizeof(pes_header)); + else + iframe[4] = iframe[5] = 0x00; + write(m_video_clip_fd, iframe, s.st_size); + if (!seq_end_avail) + write(m_video_clip_fd, seq_end, sizeof(seq_end)); + write(m_video_clip_fd, stuffing, 8192); + m_showSinglePicTimer->start(150, true); + } + close(f); + } + else + { + eDebug("couldnt open %s", filename); + return -1; + } + } + else + { + eDebug("only show single pics on first decoder"); + return -1; + } + return 0; +} + +void eTSMPEGDecoder::finishShowSinglePic() +{ + if (m_video_clip_fd >= 0) + { + if (ioctl(m_video_clip_fd, VIDEO_STOP, 0) < 0) + eDebug("VIDEO_STOP failed (%m)"); + if (ioctl(m_video_clip_fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX) < 0) + eDebug("VIDEO_SELECT_SOURCE DEMUX failed (%m)"); + close(m_video_clip_fd); + m_video_clip_fd = -1; + } +} + +RESULT eTSMPEGDecoder::connectVideoEvent(const Slot1 &event, ePtr &conn) +{ + conn = new eConnection(this, m_video_event.connect(event)); return 0; } + +void eTSMPEGDecoder::video_event(struct videoEvent event) +{ + /* emit */ m_video_event(event); +} + +int eTSMPEGDecoder::getVideoWidth() +{ + if (m_video) + return m_video->getWidth(); + return -1; +} + +int eTSMPEGDecoder::getVideoHeight() +{ + if (m_video) + return m_video->getHeight(); + return -1; +} + +int eTSMPEGDecoder::getVideoProgressive() +{ + if (m_video) + return m_video->getProgressive(); + return -1; +} + +int eTSMPEGDecoder::getVideoFrameRate() +{ + if (m_video) + return m_video->getFrameRate(); + return -1; +} + +int eTSMPEGDecoder::getVideoAspect() +{ + if (m_video) + return m_video->getAspect(); + return -1; +}