VIDEO_CLEAR_BUFFER isn't required.

[enigma2.git] / lib / dvb / decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index b9acabade0b14c7d01c0da6c4f44494fa2408d37..b9c9533af49708a7390f333088cb9fb7c9bd0ae0 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -40,7 +40,7 @@ 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
@@ -51,14 +51,14 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
        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);
 }
-       
+
 int eDVBAudio::startPid(int pid, int type)
-{      
+{
        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;
@@ -78,9 +78,9 @@ int eDVBAudio::startPid(int pid, int type)
                eWarning("audio: DMX_START: %m");
                return -errno;
        }
-       
+
        int bypass = 0;
-       
+
        switch (type)
        {
        case aMPEG:
@@ -95,15 +95,17 @@ int eDVBAudio::startPid(int pid, int type)
                break;
                */
        }
-       
+
        if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
                eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
-       
+
+       freeze();
+
        if (::ioctl(m_fd, AUDIO_PLAY) < 0)
                eWarning("audio: AUDIO_PLAY: %m");
        return 0;
 }
-       
+
 void eDVBAudio::stop()
 {
        if (::ioctl(m_fd, AUDIO_STOP) < 0)
@@ -113,7 +115,7 @@ void eDVBAudio::stop()
                eWarning("audio: DMX_STOP: %m");
 #endif
 }
-       
+
 #if HAVE_DVB_API_VERSION < 3
 void eDVBAudio::stopPid()
 {
@@ -160,6 +162,7 @@ int eDVBAudio::getPTS(pts_t &now)
 
 eDVBAudio::~eDVBAudio()
 {
+       unfreeze();
        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)
@@ -201,7 +204,7 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux), m_dev(dev)
 #define VIDEO_STREAMTYPE_MPEG4_H264 1
 
 int eDVBVideo::startPid(int pid, int type)
-{      
+{
        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;
@@ -225,11 +228,15 @@ int eDVBVideo::startPid(int pid, int type)
                eWarning("video: DMX_START: %m");
                return -errno;
        }
+
+       eDebug("FREEZE.\n");
+       freeze();
+
        if (::ioctl(m_fd, VIDEO_PLAY) < 0)
                eWarning("video: VIDEO_PLAY: %m");
        return 0;
 }
-       
+
 void eDVBVideo::stop()
 {
 #if HAVE_DVB_API_VERSION > 2
@@ -254,19 +261,21 @@ void eDVBVideo::flush()
        if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)
                eDebug("video: VIDEO_CLEAR_BUFFER: %m");
 }
-       
+
 void eDVBVideo::freeze()
 {
+       eDebug("VIDEO_FREEZE");
        if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
                eDebug("video: VIDEO_FREEZE: %m");
 }
-       
+
 void eDVBVideo::unfreeze()
 {
+       eDebug("VIDEO_CONTINUE");
        if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
                eDebug("video: VIDEO_CONTINUE: %m");
 }
-       
+
 int eDVBVideo::setSlowMotion(int repeat)
 {
        m_is_slow_motion = repeat;
@@ -283,7 +292,7 @@ int eDVBVideo::getPTS(pts_t &now)
 {
        return ::ioctl(m_fd, VIDEO_GET_PTS, &now);
 }
-       
+
 eDVBVideo::~eDVBVideo()
 {
        if (m_sn)
@@ -292,6 +301,7 @@ eDVBVideo::~eDVBVideo()
                setSlowMotion(0);
        if (m_is_fast_forward)
                setFastForward(0);
+       unfreeze();
        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)
@@ -436,13 +446,13 @@ DEFINE_REF(eTSMPEGDecoder);
 int eTSMPEGDecoder::setState()
 {
        int res = 0;
-       
+
        int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
        int nott = noaudio; /* actually same conditions */
-       
+
        if ((noaudio && m_audio) || (!m_audio && !noaudio))
                m_changed |= changeAudio;
-       
+
        if ((nott && m_text) || (!m_text && !nott))
                m_changed |= changeText;
 
@@ -466,6 +476,7 @@ int eTSMPEGDecoder::setState()
        {
                m_video->stop();
                m_video=0;
+               m_video_event_conn=0;
        }
        if (m_changed & changePCR)
        {
@@ -522,8 +533,9 @@ int eTSMPEGDecoder::setState()
                {
                        eDebug("STOP");
                        m_video->stop();
+                       m_video = 0;
+                       m_video_event_conn = 0;
                }
-               m_video = 0;
                if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
                {
                        eDebug("new video");
@@ -696,6 +708,16 @@ RESULT eTSMPEGDecoder::setSyncMaster(int who)
 }
 
 RESULT eTSMPEGDecoder::start()
+{
+       RESULT r;
+       r = setState();
+       if (r)
+               return r;
+       return unfreeze();
+}
+
+       /* preroll is start in freezed mode. */
+RESULT eTSMPEGDecoder::preroll()
 {
        return setState();
 }
@@ -707,7 +729,7 @@ RESULT eTSMPEGDecoder::freeze(int cont)
 
        if (m_audio)
                m_audio->freeze();
-       
+
        return 0;
 }
 
@@ -718,7 +740,7 @@ RESULT eTSMPEGDecoder::unfreeze()
 
        if (m_audio)
                m_audio->unfreeze();
-       
+
        return 0;
 }
 
@@ -735,9 +757,9 @@ RESULT eTSMPEGDecoder::setPictureSkipMode(int what)
 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
@@ -747,9 +769,9 @@ RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip)
 RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
 {
        m_is_sm = repeat != 0;
-       
+
        setState();
-       
+
        if (m_video)
                return m_video->setSlowMotion(repeat);
        else
@@ -831,33 +853,35 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
                        {
                                fseek(f, 0, SEEK_END);
                                int length = ftell(f);
-                               unsigned char *buffer = new unsigned char[length*3+9];
+                               unsigned char *buffer = new unsigned char[length*2+9];
                                if (ioctl(vfd, VIDEO_FAST_FORWARD, 1) < 0)
                                        eDebug("VIDEO_FAST_FORWARD failed (%m)");
                                if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY) < 0)
                                        eDebug("VIDEO_SELECT_SOURCE MEMORY failed (%m)");
                                if (ioctl(vfd, VIDEO_PLAY) < 0)
                                        eDebug("VIDEO_PLAY failed (%m)");
+                               if (::ioctl(vfd, VIDEO_CONTINUE) < 0)
+                                       eDebug("video: VIDEO_CONTINUE: %m");
                                int cnt=0;
                                int pos=0;
-                               while(cnt<3)
+                               while(cnt<2)
                                {
                                        int rd;
                                        fseek(f, 0, SEEK_SET);
+                                       if (!cnt)
+                                       {
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=1;
+                                               buffer[pos++]=0xE0;
+                                               buffer[pos++]=(length*2)>>8;
+                                               buffer[pos++]=(length*2)&0xFF;
+                                               buffer[pos++]=0x80;
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=0;
+                                       }
                                        while(1)
                                        {
-                                               if (!cnt)
-                                               {
-                                                       buffer[pos++]=0;
-                                                       buffer[pos++]=0;
-                                                       buffer[pos++]=1;
-                                                       buffer[pos++]=0xE0;
-                                                       buffer[pos++]=(length*3)>>8;
-                                                       buffer[pos++]=(length*3)&0xFF;
-                                                       buffer[pos++]=0x80;
-                                                       buffer[pos++]=0;
-                                                       buffer[pos++]=0;
-                                               }
                                                rd = fread(buffer+pos, 1, length, f);
                                                if (rd > 0)
                                                        pos += rd;
@@ -901,4 +925,3 @@ void eTSMPEGDecoder::video_event(struct videoEvent event)
 {
        /* emit */ m_video_event(event);
 }
-