Changeset 6324 in orxonox.OLD

Timestamp:

Dec 27, 2005, 10:25:48 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: MoviePlayer works, at the moment not very fast

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (4 diffs)
• lib/graphics/importer/media_container.h (modified) (1 diff)
• lib/graphics/importer/movie_player.cc (modified) (5 diffs)
• lib/graphics/importer/movie_player.h (modified) (2 diffs)
• subprojects/importer/movie_player_test.cc (modified) (2 diffs)
• subprojects/importer/multitex.cc (modified) (2 diffs)

branches/avi_play/src/lib/graphics/importer/media_container.cc

@@ -87 +87 @@
 }
 
-GLuint MediaContainer::getFrame(int frame_number)
+void MediaContainer::gotoFrame(int frame_number)
 {
   // seek doesnt work for the first two frames
@@ -96 +96 @@
     av_seek_frame(format_context, video_stream, 0, AVSEEK_FLAG_BACKWARD);
     frame_num = 0;
-    return this->getNextFrame();
   }
   else
@@ -117 +116 @@
   
     frame_num = frame_number;
-
-    return this->getNextFrame();
   }
 }
@@ -215 +212 @@
 }
 
-void MediaContainer::skipFrame(int num_frames)
-{
-
+GLuint MediaContainer::skipFrame(int num_frames)
+{
+  frame_num += num_frames;
+  
+  while(num_frames != 0)
+  {
+    if(av_read_frame(format_context, &packet) < 0)
+      break;
+    if(packet.stream_index == video_stream)
+    {
+      int frame_finished;
+      // We have to decode the frame to not get ugly fragments
+      avcodec_decode_video(codec_context, frame, &frame_finished,
+                            packet.data, packet.size);
+        
+      // Did we get a video frame?
+      if(frame_finished)
+        num_frames--;
+    }
+    av_free_packet(&packet);
+  }
+  
+  return this->getNextFrame();
 }
 

branches/avi_play/src/lib/graphics/importer/media_container.h

@@ -58 +58 @@
 
   void init();
-  GLuint getFrame(int frame_number);
+  void gotoFrame(int frame_number);
   GLuint getNextFrame();
-  void skipFrame(int num_frames);
+  GLuint skipFrame(int num_frames);
   vector<GLuint> getFrameList();
   void loadMedia(const char* filename);

branches/avi_play/src/lib/graphics/importer/movie_player.cc

@@ -57 +57 @@
 {
   status = STOP;
+  timer = 0;
 
   material = new Material;
@@ -82 +83 @@
 void MoviePlayer::start(unsigned int start_frame)
 {
-  texture = media_container->getFrame(start_frame);
+  status = PLAY;
+  timer = 0;
+  fps = media_container->getFPS();
 
-  status = PLAY;
+  media_container->gotoFrame(start_frame);
+
+   PRINTF(0)("start\n");
 }
 
@@ -90 +95 @@
 {
   if(status == STOP)
-    texture = media_container->getFrame(0);
-  status = PLAY;
+    this->start(0);
+  else
+    status = PLAY;
+
+   PRINTF(0)("resume\n");
 }
 
@@ -98 +106 @@
   if(status != STOP)
     status = PAUSE;
+
+  PRINTF(0)("pause\n");
 }
 
@@ -104 +114 @@
   status = STOP;
   texture = NULL;
+
+  PRINTF(0)("stop\n");
 }
 
-void MoviePlayer::tick(float time)
+void MoviePlayer::tick(float dt)
 {
   if(status == PLAY)
   {
-    texture = media_container->getNextFrame();
+    current_frame = media_container->getFrameNumber();
+    timer += dt;
+    actuel_frame = timer * fps;
+
+    if(actuel_frame != current_frame)
+    {
+      if(actuel_frame - current_frame == 1)
+        texture = media_container->getNextFrame();
+      else
+        texture = media_container->skipFrame(actuel_frame - current_frame - 1);
+    }   
     //PRINTF(0)("frame_number: %i\n", media_container->getFrameNumber());
-    if(texture == NULL)
-      status = STOP;
+
+    if(texture == NULL && current_frame != 0)
+      this->stop();
   }
 }

branches/avi_play/src/lib/graphics/importer/movie_player.h

@@ -39 +39 @@
 
   MP_STATUS status;     
-  float speed;  
+  float speed;
+  float timer;
+  int actuel_frame;
+  int current_frame;
+  float fps;  
 
 public:
@@ -55 +59 @@
         void stop();
 
-        void tick(float time);
+        void tick(float dt);
         const void draw();
 

branches/avi_play/src/subprojects/importer/movie_player_test.cc

@@ -28 +28 @@
 
   movie_player->printInformation();
-
-  movie_player->start(0);
 }
 
@@ -41 +39 @@
         case SDLK_1:
           movie_player->start(0);
-          PRINTF(0)("Start\n");
           break;
         case SDLK_2:
           movie_player->resume();
-          PRINTF(0)("Play-/Resuming\n");
           break;
         case SDLK_3:
           movie_player->pause();
-          PRINTF(0)("Pause\n");
           break;
         case SDLK_4:
           movie_player->stop();
-          PRINTF(0)("Stopped\n");
           break;
       }

branches/avi_play/src/subprojects/importer/multitex.cc

@@ -52 +52 @@
   fps = movie->getFPS();
 
-  int start_time = atoi(argv[2]);
+  int start_frame = atoi(argv[2]);
 
   // print information about the media file
@@ -64 +64 @@
   //while(seq->addFrame(movie->getNextFrame()) != NULL);
   // get a list of frames
-  seq->addFrame(movie->getFrame(start_time));
+  movie->gotoFrame(start_frame);
   seq->addFrameList(movie->getFrameList());