Changeset 6382 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/movie_player.cc

Timestamp:

Jan 1, 2006, 7:58:56 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: removed memory leak

File:

• branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) (6 diffs)

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

@@ -102 +102 @@
 
   // Find the first video stream and take it
-  video_stream = -1;
-  for(int i = 0; i < format_context->nb_streams; i++)
-  {
-    // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
-    // if(format_context->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO)
-    if(format_context->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
-    {
-      video_stream = i;
-      break;
-    }
-  }
+  video_stream = av_find_default_stream_index(format_context);
 
   if(video_stream == -1)
@@ -141 +131 @@
   // Assign appropriate parts of buffer to image planes in RGB_frame
   avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);
+
+  // data buffer for the texture
+  data = new uint8_t[codec_context->width*codec_context->height*3*sizeof(uint8_t)];
 
   // Calculate fps
@@ -192 +185 @@
                     codec_context->pix_fmt, codec_context->width, codec_context->height);
 
-        data = 0;
-        data = new uint8_t[codec_context->width*codec_context->height*3*sizeof(uint8_t)];
         for(int i = 0; i < codec_context->height; i++)
           memcpy(&data[i*codec_context->width*3], ((AVPicture*)RGB_frame)->data[0]+i *
@@ -247 +238 @@
                         data);
         glBindTexture(GL_TEXTURE_2D, 0);
-
-        //avcodec_flush_buffers(codec_context);
 
       }
@@ -327 +316 @@
 }
 
-void MoviePlayer::start(unsigned int start_time)
+void MoviePlayer::start(float start_time)
 {
   status = PLAY;
@@ -339 +328 @@
 void MoviePlayer::resume()
 {
-  if(status == STOP)
-    this->start(0);
-  else
+  if(status == PAUSE)
+  {
     status = PLAY;
-
-   PRINTF(0)("resume\n");
+    PRINTF(0)("resume\n");
+  }
 }
 
 void MoviePlayer::pause()
 {
-  if(status != STOP)
+  if(status == PLAY)
+  {
     status = PAUSE;
-
-  PRINTF(0)("pause\n");
+    PRINTF(0)("pause\n");
+  }
 }