Changeset 6330 in orxonox.OLD

Timestamp:

Dec 29, 2005, 1:49:53 AM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: no big changes, somewhere in MediaPlayer is a big memory leek :-/

Location:

branches/avi_play/src

Files:

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

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

@@ -44 +44 @@
 
   int num_bytes;
-  uint8_t *buffer;
+  uint8_t* buffer;
   int video_stream;
   int duration;

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

@@ -82 +82 @@
 }
 
-void MoviePlayer::start(unsigned int start_frame)
+void MoviePlayer::start(unsigned int start_time)
 {
   status = PLAY;
@@ -88 +88 @@
   fps = media_container->getFPS();
 
-  media_container->gotoFrame(start_frame);
+  media_container->gotoFrame(start_time * fps);
 
-   PRINTF(0)("start\n");
+   PRINTF(0)("start (start_time: %0.2f)\n", start_time * fps);
 }
 
@@ -125 +125 @@
     current_frame = media_container->getFrameNumber();
     timer += dt;
-    actuel_frame = timer * fps * speed;
+    actual_frame = timer * fps * speed;
 
-    if(actuel_frame != current_frame)
+    if(actual_frame != current_frame)
     {
-      if(actuel_frame - current_frame == 1)
+      if(actual_frame - current_frame == 1)
         texture = media_container->getNextFrame();
       else
-        texture = media_container->skipFrame(actuel_frame - current_frame - 1);
+        texture = media_container->skipFrame(actual_frame - current_frame - 1);
     }   
     //PRINTF(0)("frame_number: %i\n", media_container->getFrameNumber());

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

@@ -41 +41 @@
   float speed;
   float timer;
-  int actuel_frame;
+  int actual_frame;
   int current_frame;
   float fps;  
@@ -54 +54 @@
   void loadMovie(const char* filename);
 
-        void start(unsigned int start_frame);
+        void start(unsigned int start_time);
         void resume();
         void pause();

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

@@ -62 +62 @@
 
   // get each fram individually
-  //while(seq->addFrame(movie->getNextFrame()) != NULL);
+  while(seq->addFrame(movie->getNextFrame()) != NULL);
   // get a list of frames
-  movie->gotoFrame(start_frame);
-  seq->addFrameList(movie->getFrameList());
+  //movie->gotoFrame(start_frame);
+  //seq->addFrameList(movie->getFrameList());
 
   testMat->setDiffuseMap("maps/radialTransparency.png");