DEFINE_REF(eDVBAudio);
eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev)
- :m_demux(demux), m_dev(dev), m_is_freezed(0)
+ :m_demux(demux), m_dev(dev)
{
char filename[128];
#if HAVE_DVB_API_VERSION < 3
case aAC3:
bypass = 0;
break;
- /*
case aDTS:
bypass = 2;
break;
- */
+ case aAAC:
+ bypass = 8;
+ break;
+ case aAACHE:
+ bypass = 9;
+ break;
}
- eDebugNoNewLine("AUDIO_SET_BYPASS - ");
+ eDebugNoNewLine("AUDIO_SET_BYPASS(%d) - ", bypass);
if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
eDebug("failed (%m)");
else
void eDVBAudio::freeze()
{
- if (!m_is_freezed)
- {
- eDebugNoNewLine("AUDIO_PAUSE - ");
- if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
- m_is_freezed=1;
- }
+ eDebugNoNewLine("AUDIO_PAUSE - ");
+ if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
void eDVBAudio::unfreeze()
{
- if (m_is_freezed)
- {
- eDebugNoNewLine("AUDIO_CONTINUE - ");
- if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
- m_is_freezed=0;
- }
+ eDebugNoNewLine("AUDIO_CONTINUE - ");
+ if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
void eDVBAudio::setChannel(int channel)
DEFINE_REF(eDVBVideo);
eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
- :m_demux(demux), m_dev(dev), m_is_slow_motion(0), m_is_fast_forward(0), m_is_freezed(0)
+<<<<<<< HEAD:lib/dvb/decoder.cpp
+ : 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
eWarning("%s: %m", filename);
else
{
- m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Priority);
+ m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Priority);
CONNECT(m_sn->activated, eDVBVideo::video_event);
}
eDebug("Video Device: %s", filename);
// 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");
void eDVBVideo::freeze()
{
- if (!m_is_freezed)
- {
- eDebugNoNewLine("VIDEO_FREEZE - ");
- if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
- m_is_freezed=1;
- }
+ eDebugNoNewLine("VIDEO_FREEZE - ");
+ if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
void eDVBVideo::unfreeze()
{
- if (m_is_freezed)
- {
- eDebugNoNewLine("VIDEO_CONTINUE - ");
- if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
- eDebug("failed (%m)");
- else
- eDebug("ok");
- m_is_freezed=0;
- }
+ eDebugNoNewLine("VIDEO_CONTINUE - ");
+ if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+ eDebug("failed (%m)");
+ else
+ eDebug("ok");
}
int eDVBVideo::setSlowMotion(int repeat)
{
- eDebugNoNewLine("VIDEO_SLOWMOTION - ");
- m_is_slow_motion = repeat;
+ eDebugNoNewLine("VIDEO_SLOWMOTION(%d) - ", repeat);
int ret = ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat);
if (ret < 0)
eDebug("failed(%m)");
int eDVBVideo::setFastForward(int skip)
{
- eDebugNoNewLine("VIDEO_FAST_FORWARD - ");
- m_is_fast_forward = skip;
+ eDebugNoNewLine("VIDEO_FAST_FORWARD(%d) - ", skip);
int ret = ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
if (ret < 0)
eDebug("failed(%m)");
eDVBVideo::~eDVBVideo()
{
- if (m_sn)
- delete m_sn;
- if (m_is_slow_motion)
- setSlowMotion(0);
- if (m_is_fast_forward)
- setFastForward(0);
- unfreeze();
if (m_fd >= 0)
::close(m_fd);
if (m_fd_demux >= 0)
{
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;
+ 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
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)
{
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;
+ m_changed |= changeText | changeState;
bool changed = !!m_changed;
#if HAVE_DVB_API_VERSION < 3
if (m_pcr)
m_pcr->stop();
m_pcr = 0;
- if ((m_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
- {
- m_pcr = new eDVBPCR(m_demux);
- if (m_pcr->startPid(m_pcrpid))
- res = -1;
- }
- m_changed &= ~changePCR;
}
if (m_changed & changeVideo)
{
- eDebug("VIDEO CHANGED (to %04x)", m_vpid);
if (m_video)
{
m_video->stop();
m_video = 0;
m_video_event_conn = 0;
}
- 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 & 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_pcrpid >= 0) && (m_pcrpid < 0x1FFF))
+ {
+ m_pcr = new eDVBPCR(m_demux);
+ if (m_pcr->startPid(m_pcrpid))
+ res = -1;
+ }
+ m_changed &= ~changePCR;
+ }
+ if (m_changed & changeAudio)
+ {
if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio)
{
m_audio = new eDVBAudio(m_demux, m_decoder);
}
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_text)
- m_text->stop();
- m_text = 0;
if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
{
m_text = new eDVBTText(m_demux);
m_changed &= ~changeText;
}
#endif
+
+ if (m_changed & changeState)
+ {
+ /* 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 (m_video)
+ {
+ m_video->setSlowMotion(s[1]);
+ m_video->setFastForward(s[2]);
+ if (s[0])
+ m_video->unfreeze();
+ else
+ m_video->freeze();
+ }
+ if (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());
}
eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder)
- :m_demux(demux), m_changed(0), m_decoder(decoder), m_video_clip_fd(-1), m_showSinglePicTimer(eApp)
+ :m_demux(demux), 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_is_ff = m_is_sm = m_is_trickmode = 0;
+ CONNECT(m_showSinglePicTimer->timeout, eTSMPEGDecoder::finishShowSinglePic);
+ m_state = stateStop;
}
eTSMPEGDecoder::~eTSMPEGDecoder()
return -1;
}
-RESULT eTSMPEGDecoder::start()
-{
- timespec now, tmp;
- extern timespec service_start;
- RESULT r;
- clock_gettime(CLOCK_MONOTONIC, &now);
- tmp = now - service_start;
- eDebug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! %d:%d", tmp.tv_sec, tmp.tv_nsec);
- r = setState();
- if (r)
- return r;
- return unfreeze();
-}
-
- /* preroll is start in freezed mode. */
-RESULT eTSMPEGDecoder::preroll()
+RESULT eTSMPEGDecoder::set()
{
return setState();
}
-RESULT eTSMPEGDecoder::freeze(int cont)
+RESULT eTSMPEGDecoder::play()
{
- if (m_video)
- m_video->freeze();
-
- if (m_audio)
- m_audio->freeze();
-
- return 0;
-}
-
-RESULT eTSMPEGDecoder::unfreeze()
-{
- if (m_video)
- m_video->unfreeze();
-
- if (m_audio)
- m_audio->unfreeze();
-
- return 0;
-}
-
-RESULT eTSMPEGDecoder::setSinglePictureMode(int when)
-{
- return -1;
+ if (m_state == statePlay)
+ return 0;
+ 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;
+ if ((m_state == stateDecoderFastForward) && (m_ff_sm_ratio == frames_to_skip))
+ return 0;
- setState();
+ m_state = stateDecoderFastForward;
+ m_ff_sm_ratio = frames_to_skip;
+ m_changed |= changeState;
+ return setState();
- if (m_video)
- return m_video->setFastForward(frames_to_skip);
- else
- return -1;
+// return m_video->setFastForward(frames_to_skip);
}
RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
{
- m_is_sm = repeat != 0;
+ if ((m_state == stateSlowMotion) && (m_ff_sm_ratio == repeat))
+ return 0;
- setState();
-
- if (m_video)
- return m_video->setSlowMotion(repeat);
- else
- return -1;
+ 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()
}
}
-RESULT eTSMPEGDecoder::setTrickmode(int what)
-{
- m_is_trickmode = what;
- setState();
- return 0;
-}
-
RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
{
if (what == 0) /* auto */
++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);
+ m_showSinglePicTimer->start(150, true);
}
close(f);
}
{
/* 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;
+}
projects / vuplus_dvbapp / blobdiff