Changeset 10809

Timestamp:

11/20/09 15:31:11 (3 years ago)

Author:

robert

Message:

From Rafa Gaitan, "Current ffmpeg plugin didn't support pause and seek, I have added this
functionality and I also modified osgmovie example to support "seek"."

Note from Robert Osfield, changes osgmovie to use '>' for the seek as '+' was already used in a separate submission that had been merged.

Location:

OpenSceneGraph/trunk

Files:

• examples/osgmovie/osgmovie.cpp (modified) (3 diffs)
• src/osgPlugins/ffmpeg/FFmpegDecoder.cpp (modified) (4 diffs)
• src/osgPlugins/ffmpeg/FFmpegDecoder.hpp (modified) (3 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.cpp (modified) (5 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -119 +119 @@
     bool            _trackMouse;
     ImageStreamList _imageStreamList;
+    unsigned int    _seekIncr;
 
 };
@@ -238 +239 @@
                 return true;
             }
+            else if (ea.getKey()=='>')
+            {
+                for(ImageStreamList::iterator itr=_imageStreamList.begin();
+                    itr!=_imageStreamList.end();
+                    ++itr)
+                {
+                    std::cout<<"Seeking"<<std::endl;
+                    if(_seekIncr > 3) _seekIncr = 0;
+                    double length = (*itr)->getLength();
+                    double t_pos = (length/4.0f)*_seekIncr;
+                    //(*itr)->rewind();
+                    (*itr)->seek(t_pos);
+                    (*itr)->play();
+                    _seekIncr++;
+                }
+                return true;
+            }
             else if (ea.getKey()=='L')
             {
@@ -310 +328 @@
     usage.addKeyboardMouseBinding("-","Decrease speed of movie");
     usage.addKeyboardMouseBinding("o","Display frame rate of movie");
+    usage.addKeyboardMouseBinding(">","Advance the movie using seek");
 }
 

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp

@@ -167 +167 @@
         return readNextPacketNormal();
 
+    case PAUSE:
+        return false;
+
     case END_OF_STREAM:
         return readNextPacketEndOfStream();
@@ -172 +175 @@
     case REWINDING:
         return readNextPacketRewinding();
+
+    case SEEKING:
+        return readNextPacketSeeking();
 
     default:
@@ -190 +196 @@
 }
 
-
-
+void FFmpegDecoder::seek(double time) 
+{
+    m_pending_packet.clear();
+
+    flushAudioQueue();
+    flushVideoQueue();
+    seekButDontFlushQueues(time);
+}
+
+void FFmpegDecoder::pause() 
+{
+    m_pending_packet.clear();
+
+    flushAudioQueue();
+    flushVideoQueue();
+    m_state = PAUSE;
+}
+
+void FFmpegDecoder::resume() 
+{
+    m_pending_packet.clear();
+
+    flushAudioQueue();
+    flushVideoQueue();
+    m_state = NORMAL;
+}
 
 void FFmpegDecoder::findAudioStream()
@@ -347 +377 @@
 }
 
+bool FFmpegDecoder::readNextPacketSeeking() 
+{
+    const FFmpegPacket packet(FFmpegPacket::PACKET_FLUSH);
+
+    if (m_audio_queue.timedPush(packet, 10) && m_video_queue.timedPush(packet, 10))
+        m_state = NORMAL;
+
+    return false;    
+}
+
+void FFmpegDecoder::seekButDontFlushQueues(double time)
+{
+    const AVRational AvTimeBaseQ = { 1, AV_TIME_BASE }; // = AV_TIME_BASE_Q
+
+    const int64_t pos = int64_t(m_clocks.getStartTime()+time * double(AV_TIME_BASE));
+    const int64_t seek_target = av_rescale_q(pos, AvTimeBaseQ, m_video_stream->time_base);
+
+    if (av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0/*AVSEEK_FLAG_BYTE |*/ /*AVSEEK_FLAG_BACKWARD*/) < 0)
+        throw std::runtime_error("av_seek_frame failed()");
+
+    m_state = SEEKING;    
+}
+
 
 

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp

@@ -69 +69 @@
     bool readNextPacket();
     void rewind();
+    void seek(double time);
+    void pause();
+    void resume();
 
     void loop(bool loop);
@@ -85 +88 @@
     {
         NORMAL,
+        PAUSE,
         END_OF_STREAM,
-        REWINDING
+        REWINDING,
+        SEEKING
     };
 
@@ -98 +103 @@
     bool readNextPacketEndOfStream();
     bool readNextPacketRewinding();
+    bool readNextPacketSeeking();
+    bool readNextPacketPause();
     void rewindButDontFlushQueues();
+    void seekButDontFlushQueues(double time);
 
     FormatContextPtr    m_format_context;

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp

@@ -129 +129 @@
 {
     m_commands->push(CMD_REWIND);
+}
+
+void FFmpegImageStream::seek(double time) {
+    m_seek_time = time;
+    m_commands->push(CMD_SEEK);
 }
 
@@ -235 +240 @@
         return true;
 
+    case CMD_SEEK:
+        cmdSeek(m_seek_time);
+        return true;
+
     case CMD_STOP:
         return false;
@@ -255 +264 @@
         if (! m_decoder->video_decoder().isRunning())
             m_decoder->video_decoder().start();
+
+        m_decoder->resume();
     }
 
@@ -266 +277 @@
     if (_status == PLAYING)
     {
-
+        m_decoder->pause();
     }
 
@@ -279 +290 @@
 }
 
+void FFmpegImageStream::cmdSeek(double time) 
+{
+    m_decoder->seek(time);
+}
 
 

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -31 +31 @@
         virtual void pause();
         virtual void rewind();
+        virtual void seek(double time);
         virtual void quit(bool waitForThreadToExit = true);
 
@@ -45 +46 @@
             CMD_PAUSE,
             CMD_STOP,
-            CMD_REWIND
+            CMD_REWIND,
+            CMD_SEEK
         };
 
@@ -61 +63 @@
         void cmdPause();
         void cmdRewind();
+        void cmdSeek(double time);
 
         static void publishNewFrame(const FFmpegDecoderVideo &, void * user_data);
@@ -70 +73 @@
         Condition        m_frame_published_cond;
         bool            m_frame_published_flag;
+        double           m_seek_time;
     };