Changeset 6163 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/media_container.cc

Timestamp:

Dec 19, 2005, 6:43:39 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: added ability to get the frames in a list

File:

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

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

@@ -42 +42 @@
   fps = 0;
 
-  /* SDL interprets each pixel as a 32-bit number, so our masks must depend
-     on the endianness (byte order) of the machine */
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-  rmask = 0xff000000;
-  gmask = 0x00ff0000;
-  bmask = 0x0000ff00;
-#else
-  rmask = 0x000000ff;
-  gmask = 0x0000ff00;
-  bmask = 0x00ff0000;
-#endif
-
   if (filename != NULL)
     this->loadMedia(filename);
@@ -64 +52 @@
 MediaContainer::~MediaContainer()
 {
+  // delete all surfaces in the list
+  while(!this->surface_list.empty())
+  {
+    SDL_FreeSurface(this->surface_list.back());
+    this->surface_list.pop_back();
+  }
+  SDL_FreeSurface(surface);
 
   // Free the RGB image
@@ -97 +92 @@
       int frame_finished;
       // Decode video frame
-      avcodec_decode_video(codec_context, frame, &frame_finished, packet.data, packet.size);
+      avcodec_decode_video(codec_context, frame, &frame_finished,
+                           packet.data, packet.size);
 
       // Did we get a video frame?
       if(frame_finished)
       {
-        PRINTF(1)("frame_number: %i\n", codec_context->frame_number);
-
         // Conversion from YUV to RGB
         // Most codecs return images in YUV 420 format
         // (one luminance and two chrominance channels, with the chrominance
         // channels samples at half the spatial resolution of the luminance channel)
-        img_convert((AVPicture*)RGB_frame, PIX_FMT_RGB24, (AVPicture*)frame, codec_context->pix_fmt,
-                                        codec_context->width, codec_context->height);
+        img_convert((AVPicture*)RGB_frame, PIX_FMT_RGB24, (AVPicture*)frame,
+                    codec_context->pix_fmt, codec_context->width, codec_context->height);
 
         picture = (AVPicture*)RGB_frame;
@@ -119 +113 @@
           memcpy(&data[i*codec_context->width*3], picture->data[0]+i * picture->linesize[0],codec_context->width*sizeof(uint8_t)*3);
 
-        surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width, codec_context->height,
-                                           24, codec_context->width*sizeof(uint8_t)*3, rmask, gmask, bmask, 0);
+        surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
+                                           codec_context->height,24,
+                                           codec_context->width*sizeof(uint8_t)*3,
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
+                                           0x000000FF,
+                                           0x0000FF00,
+                                           0x00FF0000,
+                                           0
+#else
+                                           0xFF000000,
+                                           0x00FF0000,
+                                           0x0000FF00,
+                                           0
+#endif
+                                            );
 
         return surface;
@@ -130 +137 @@
   else
     return NULL;
+}
+
+vector<SDL_Surface*> MediaContainer::getFrameList()
+{
+
+  while((surface = this->getNextFrame()) != NULL)
+    surface_list.push_back(surface);
+
+  return surface_list;
 }
 
@@ -200 +216 @@
   // Allocate video frame
   frame = avcodec_alloc_frame();
-        RGB_frame = avcodec_alloc_frame();
+  RGB_frame = avcodec_alloc_frame();
 
   // Determine required buffer size and allocate buffer