Changeset 6317 in orxonox.OLD

Timestamp:

Dec 27, 2005, 2:24:13 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: MediaContainer returns a texture not a surface, it's faster. MoviePlayer can display the textures, playspeed not yet implemented

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (9 diffs)
• lib/graphics/importer/media_container.h (modified) (4 diffs)
• lib/graphics/importer/movie_player.cc (modified) (2 diffs)
• lib/graphics/importer/movie_player.h (modified) (3 diffs)
• lib/graphics/importer/texture_sequence.cc (modified) (1 diff)
• lib/graphics/importer/texture_sequence.h (modified) (1 diff)
• subprojects/importer/movie_player_test.cc (modified) (1 diff)

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

@@ -50 +50 @@
 MediaContainer::~MediaContainer()
 {
-  // delete all surfaces in the list
-  while(!this->surface_list.empty())
+  // delete all textures.
+  while(!this->texture_list.empty())
   {
-    SDL_FreeSurface(this->surface_list.back());
-    this->surface_list.pop_back();
+    if (glIsTexture(this->texture_list.back()))
+      glDeleteTextures(1, &this->texture_list.back());
+    this->texture_list.pop_back();
   }
+  glDeleteTextures(1, &texture);
   SDL_FreeSurface(surface);
 
@@ -82 +84 @@
 
   fps = 0;
-}
-
-SDL_Surface* MediaContainer::getFrame(int frame_number)
+  frame_num = 0;
+}
+
+GLuint MediaContainer::getFrame(int frame_number)
 {
   // seek doesnt work for the first two frames
@@ -112 +115 @@
 }
 
-SDL_Surface* MediaContainer::getNextFrame()
+GLuint MediaContainer::getNextFrame()
 {
   /* get next frame */
@@ -127 +130 @@
                            packet.data, packet.size);
 
+      // Free the packet that was allocated by av_read_frame
+      av_free_packet(&packet);
+      
       // Did we get a video frame?
       if(frame_finished)
       {
+        frame_num++;
         //PRINTF(1)("frame_number: %i\n", this->getFrameNumber());
         // Conversion from YUV to RGB
@@ -163 +170 @@
                                             );
 
-        return surface;
+        // NOTE: use glTexSubImage2D, it's faster!! //
+        /* Create an OpenGL texture from the surface */
+        glGenTextures(1, &texture);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        // build the Texture
+        glTexImage2D(GL_TEXTURE_2D,
+                    0,
+                    GL_RGB,
+                    surface->w, surface->h,
+                    0,
+                    GL_RGB,
+                    GL_UNSIGNED_BYTE,
+                    surface->pixels);
+        // build the MipMaps
+        gluBuild2DMipmaps(GL_TEXTURE_2D,
+                          GL_RGB,
+                          surface->w,
+                          surface->h,
+                          GL_RGB,
+                          GL_UNSIGNED_BYTE,
+                          surface->pixels);
+        glBindTexture(GL_TEXTURE_2D, 0);
+
+        return texture;
       }
     }
-    // Free the packet that was allocated by av_read_frame
-    av_free_packet(&packet);
+    else
+    {
+      av_free_packet(&packet);
+      this->getNextFrame();
+    }
   }
   else
@@ -173 +208 @@
 }
 
-vector<SDL_Surface*> MediaContainer::getFrameList()
-{
-
-  while((surface = this->getNextFrame()) != NULL)
-    surface_list.push_back(surface);
-
-  return surface_list;
+vector<GLuint> MediaContainer::getFrameList()
+{
+
+  while((texture = this->getNextFrame()) != NULL)
+    texture_list.push_back(texture);
+
+  return texture_list;
 }
 
@@ -189 +224 @@
 
   // Open file
-  sprintf(filename, "frame%i.ppm", codec_context->frame_number);
+  sprintf(filename, "frame%i.ppm", frame_num);
   file = fopen(filename, "wb");
   if(file == NULL)
@@ -264 +299 @@
   // duration
   duration = format_context->duration / 1000000LL;
+
+  frame_num = 0;
 }
 
@@ -278 +315 @@
 int MediaContainer::getFrameNumber()
 {
-  return codec_context->frame_number;
+  return frame_num;
 }
 

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

@@ -20 +20 @@
 #include "base_object.h"
 
+#include "glincl.h"
+
 /* using namespace std is default, this needs to be here */
 using namespace std;
@@ -30 +32 @@
   double fps;
   SDL_Surface* surface;
+  GLuint texture;
   uint8_t* data;
 
@@ -44 +47 @@
   int video_stream;
   int duration;
+  int frame_num;
 
-  vector<SDL_Surface*>    surface_list;
+  vector<GLuint>    texture_list;
 
 public:
@@ -54 +58 @@
 
   void init();
-  SDL_Surface* getFrame(int frame_number);
-  SDL_Surface* getNextFrame();
-  vector<SDL_Surface*> getFrameList();
+  GLuint getFrame(int frame_number);
+  GLuint getNextFrame();
+  vector<GLuint> getFrameList();
   void loadMedia(const char* filename);
 

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

@@ -58 +58 @@
   status = STOP;
 
-  tex = new Texture();
+  //tex = new Texture();
   material = new Material;
 
@@ -103 +103 @@
 void MoviePlayer::tick(float time)
 {
-  surface = media_container->getNextFrame();
-
-  if(surface == NULL)
-    texture = NULL;
-  else
-  {
-    bool hasAlpha;
-    SDL_Surface* newSurf = tex->prepareSurface(surface, hasAlpha);
-    if (newSurf != NULL)
-      texture = Texture::loadTexToGL(newSurf);
-    else
-      texture = NULL;
-  }
+  texture = media_container->getNextFrame();
 }
 

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

@@ -9 +9 @@
 
 #include "glincl.h"
-#include "sdlincl.h"
+//#include "sdlincl.h"
 
 #include "media_container.h"
@@ -19 +19 @@
 /* include base_object.h since all classes are derived from this one */
 #include "base_object.h"
-
-/* using namespace std is default, this needs to be here */
-using namespace std;
-
-class MediaContainer;
-class Model;
-class Material;
-class Texture;
 
 /* The state of the MoviePlayer */
@@ -43 +35 @@
   Model* model;
   Material* material;
-  Texture* tex;
 
-  SDL_Surface* surface;
   GLuint texture;
 

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

@@ -153 +153 @@
 }
 
-bool TextureSequence::addFrameList(std::vector<SDL_Surface*> surfaces)
+bool TextureSequence::addFrameList(std::vector<GLuint> textures)
 {
-  // add the surfaces to the list
-  for(int i = 0; i < surfaces.size(); i++)
-    this->addFrame(surfaces[i]);
+  // add the textures to the list
+  for(int i = 0; i < textures.size(); i++)
+    this->addFrame(textures[i]);
 }
 

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

@@ -30 +30 @@
     bool addFrame(SDL_Surface* surface);
     bool addFrame(GLuint texture);
-    bool addFrameList(std::vector<SDL_Surface*> surfaces);
+    bool addFrameList(std::vector<GLuint> textures);
 
     virtual bool rebuild();

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

@@ -36 +36 @@
 
 void Framework::moduleTick(float dt)
-{
+{ 
   movie_player->tick(dt);
 }