#define dmxPesFilterParams dmx_pes_filter_params
#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 <ost/dmx.h>
#include <ost/video.h>
#include <ost/audio.h>
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);
eDebug("failed (%m)");
else
eDebug("ok");
- freeze();
-
+ 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)
eDebug("failed (%m)");
eDVBAudio::~eDVBAudio()
{
- unfreeze();
+ unfreeze(); // why unfreeze here... but not unfreeze video in ~eDVBVideo ?!?
if (m_fd >= 0)
::close(m_fd);
if (m_fd_demux >= 0)
DEFINE_REF(eDVBVideo);
eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
- :m_demux(demux), m_dev(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
// 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)
#else
int eDVBVideo::startPid(int pid, int type)
{
+ int streamtype = VIDEO_STREAMTYPE_MPEG2;
+
if ((m_fd < 0) || (m_fd_demux < 0))
return -1;
dmx_pes_filter_params pes;
- eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ",type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2);
- if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE,
- type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2) < 0)
+ 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");
return -errno;
}
eDebug("ok");
- freeze();
+ 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)");
{
struct iTSMPEGDecoder::videoEvent event;
event.type = iTSMPEGDecoder::videoEvent::eventSizeChanged;
- event.aspect = evt.u.size.aspect_ratio;
- event.height = evt.u.size.h;
- event.width = evt.u.size.w;
+ 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;
- event.framerate = evt.u.frame_rate;
+ 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;
- event.progressive = evt.u.frame_rate;
+ m_progressive = event.progressive = evt.u.frame_rate;
/* emit */ m_event(event);
}
else
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): m_demux(demux)
+eDVBPCR::eDVBPCR(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
{
char filename[128];
#if HAVE_DVB_API_VERSION < 3
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_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)
DEFINE_REF(eDVBTText);
-eDVBTText::eDVBTText(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
pes.pid = pid;
pes.input = DMX_IN_FRONTEND;
pes.output = DMX_OUT_DECODER;
- pes.pes_type = DMX_PES_TELETEXT;
+ pes.pes_type = m_dev ? DMX_PES_TELETEXT1 : DMX_PES_TELETEXT0; // FIXME
pes.flags = 0;
eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - ttx - ", pid);
return -errno;
}
eDebug("ok");
- eDebugNoNewLine("DEMUX_START - pcr - ");
+ eDebugNoNewLine("DEMUX_START - ttx - ");
if (::ioctl(m_fd_demux, DMX_START) < 0)
{
eDebug("failed(%m)");
if ((nott && m_text) || (!m_text && !nott))
m_changed |= changeText | changeState;
- bool changed = !!m_changed;
+ 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)
}
if (m_changed & changePCR)
{
- m_pcr = new eDVBPCR(m_demux);
+ m_pcr = new eDVBPCR(m_demux, m_decoder);
if (m_pcr->setPid(m_pcrpid))
res = -1;
}
{
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))
res = -1;
}
{
if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
{
- m_text = new eDVBTText(m_demux);
+ m_text = new eDVBTText(m_demux, m_decoder);
if (m_text->startPid(m_textpid))
res = -1;
}
}
#endif
- if (m_changed & changeState)
+ if (changed & (changeState|changeVideo|changeAudio))
{
/* play, slowmotion, fast-forward */
int state_table[6][4] =
/* [stateSlowMotion] = */ {1, m_ff_sm_ratio, 0}
};
int *s = state_table[m_state];
- if (m_video)
+ if (changed & (changeState|changeVideo) && m_video)
{
m_video->setSlowMotion(s[1]);
m_video->setFastForward(s[2]);
else
m_video->freeze();
}
- if (m_audio)
+ if (changed & (changeState|changeAudio) && m_audio)
{
if (s[0])
m_audio->unfreeze();
}
eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder)
- :m_demux(demux), m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eTimer::create(eApp))
+ : 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);
RESULT eTSMPEGDecoder::setVideoPID(int vpid, int type)
{
- if (m_vpid != vpid)
+ if ((m_vpid != vpid) || (m_vtype != type))
{
m_changed |= changeVideo;
m_vpid = vpid;
RESULT eTSMPEGDecoder::play()
{
if (m_state == statePlay)
- return 0;
- m_state = statePlay;
- m_changed |= changeState;
+ {
+ if (!m_changed)
+ return 0;
+ } else
+ {
+ m_state = statePlay;
+ m_changed |= changeState;
+ }
return setState();
}
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)
+ if (ioctl(m_video_clip_fd, VIDEO_CONTINUE) < 0)
eDebug("video: VIDEO_CONTINUE: %m");
- if (::ioctl(m_video_clip_fd, VIDEO_CLEAR_BUFFER) < 0)
+ 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;
{
/* 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;
+}
git.cweiske.de / enigma2.git / blobdiff