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

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.h (modified) (6 diffs)

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

@@ -8 +8 @@
 #define _MEDIA_CONTAINER
 
+#include <SDL.h>
+#include <vector>
 
 #ifdef HAVE_AVFORMAT_H
@@ -15 +17 @@
 #endif
 
-
-#include "glincl.h"
-
 /* include base_object.h since all classes are derived from this one */
 #include "base_object.h"
-
-#include <SDL.h>
 
 /* using namespace std is default, this needs to be here */
@@ -32 +29 @@
 
   double fps;
-  Uint32 rmask, gmask, bmask;
-  SDL_Surface *surface;
+  SDL_Surface* surface;
   uint8_t* data;
 
@@ -41 +37 @@
   AVFrame* frame;
   AVPacket packet;
+  AVFrame* RGB_frame;
   AVPicture* picture;
-  AVFrame* RGB_frame;
 
   int num_bytes;
   uint8_t *buffer;
   int video_stream;
+
+  vector<SDL_Surface*>    surface_list;
 
 public:
@@ -55 +53 @@
   SDL_Surface* getFrame(int frame_number);
   SDL_Surface* getNextFrame();
+  vector<SDL_Surface*> getFrameList();
   void loadMedia(const char* filename);
 
@@ -62 +61 @@
   double getFPS();
 
-  /* prints some information about the
-     media file for debug reasons */
+  void saveCurrentFrame();
+
   void printMediaInformation();
   void printPacketInformation();
-  void saveCurrentFrame();
 
 };
 
 
-
 #endif /* _MEDIA_CONTAINER */