Changeset 6382 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/media_container.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/media_container.cc (modified) (5 diffs)

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

@@ -88 +88 @@
 
   // 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)
     PRINTF(1)("Could not find a video stream in %s\n", filename);
@@ -124 +114 @@
   num_bytes = avpicture_get_size(PIX_FMT_RGB24, codec_context->width, codec_context->height);
   buffer=new uint8_t[num_bytes];
+
+  // data buffer for the texture
+  data = new uint8_t[codec_context->width*codec_context->height*3*sizeof(uint8_t)];
 
   // Assign appropriate parts of buffer to image planes in RGB_frame
@@ -180 +173 @@
                     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],
@@ -187 +178 @@
                  ((AVPicture*)RGB_frame)->linesize[0], 
                   codec_context->width*sizeof(uint8_t)*3); 
-/*
-        surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
+
+        /*surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
                                            codec_context->height,24,
                                            codec_context->width*sizeof(uint8_t)*3,
@@ -226 +217 @@
                         GL_UNSIGNED_BYTE,
                         surface->pixels);
-        glBindTexture(GL_TEXTURE_2D, 0);  */   
+        glBindTexture(GL_TEXTURE_2D, 0); */
 
         // Create an OpenGL texture