Changeset 6254 in orxonox.OLD

Timestamp:

Dec 21, 2005, 5:25:04 PM (18 years ago)

Author:

stefalie

Message:

branches\avi_play: some changes….

Location:

branches/avi_play/src

Files:

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

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

@@ -75 +75 @@
 }
 
-SDL_Surface* MediaContainer::getFrame(int frame_number)
-{
-
+SDL_Surface* MediaContainer::getFrame(float time_stamp)
+{
+  if (time_stamp != AV_NOPTS_VALUE)
+  {
+    /* add the stream start time */
+    //time_stamp += AV_NOPTS_VALUE;
+    //PRINTF(1)("starttime %f\n", format_context->start_time);
+    //time_stamp += format_context->start_time;
+    int err = av_seek_frame(format_context, video_stream, time_stamp, AVSEEK_FLAG_BACKWARD);
+    if (err < 0)
+    {
+      PRINTF(1)("could not seek to position %f\n", time_stamp);
+      return NULL;
+    }
+
+    return this->getNextFrame();
+  }
+
+  return this->getNextFrame();
 }
 
@@ -98 +114 @@
       if(frame_finished)
       {
+        //PRINTF(1)("frame_number: %i\n", this->getFrameNumber());
         // Conversion from YUV to RGB
         // Most codecs return images in YUV 420 format
@@ -227 +244 @@
   // Calculate fps
   fps = av_q2d(format_context->streams[video_stream]->r_frame_rate);
+
+  // duration
+  duration = format_context->duration / 1000000LL;
 }
 
@@ -260 +280 @@
   PRINTF(1)("filename: %s\n", format_context->filename);
   PRINTF(1)("nb_streams: %i\n", format_context->nb_streams);
-  PRINTF(1)("duration: %fs\n", format_context->duration/1000000.);
+  PRINTF(1)("duration: (%02d:%02d:%02d)\n", duration/3600, (duration%3600)/60, duration%60);
   PRINTF(1)("file_size: %ikb\n", format_context->file_size/1024);
   PRINTF(1)("bit_rate: %ikb/s\n", format_context->bit_rate/1000);

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

@@ -43 +43 @@
   uint8_t *buffer;
   int video_stream;
+  int duration;
 
   vector<SDL_Surface*>    surface_list;
@@ -51 +52 @@
   ~MediaContainer();
 
-  SDL_Surface* getFrame(int frame_number);
+  SDL_Surface* getFrame(float time_stamp);
   SDL_Surface* getNextFrame();
   vector<SDL_Surface*> getFrameList();

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

@@ -44 +44 @@
 void Framework::moduleInit(int argc, char** argv)
 {
-  if( argc <= 1)
+  if( argc <= 2)
   {
     printf("Wrong arguments try following notations:\n");
-    printf("./multitex [mediaFile]\n");
+    printf("./multitex [media_file] [start_time]\n");
     exit(0);
   }
@@ -53 +53 @@
   movie = new MediaContainer(argv[1]);
   fps = movie->getFPS();
+
+  float start_time = atoi(argv[2]);
 
   // print information about the media file
@@ -63 +65 @@
   seq = new TextureSequence();
 
-  // get each fram individually  
+  // get each fram individually
   //while(seq->addFrame(movie->getNextFrame()) != NULL);
   // get a list of frames
+  seq->addFrame(movie->getFrame(start_time));
   seq->addFrameList(movie->getFrameList());
 
@@ -122 +125 @@
   {
     counter = fps * timer;
-  
+
     if (counter > seq->getFrameCount())
     {
@@ -130 +133 @@
 
     seq->gotoFrame(counter);
-  }    
+  }
 }