Changeset 6094 in orxonox.OLD for branches/avi_play/src/lib

Timestamp:

Dec 14, 2005, 1:18:19 AM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: MediaContainer::getNextFrame() try to create a texture from a frame ←- DOES NOT WORK YET, added new function TextureSequence::addFrame(GLuint texture)

Location:

branches/avi_play/src/lib/graphics/importer

Files:

• media_container.cc (modified) (4 diffs)
• media_container.h (modified) (1 diff)
• texture_sequence.cc (modified) (1 diff)
• texture_sequence.h (modified) (1 diff)

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

@@ -92 +92 @@
         PRINTF(1)("current_frame: %i\n", current_frame);
 
-        // Convert the image from its native format to RGB
+                    // Convert the image from its native format to RGB
         img_convert((AVPicture*)RGB_frame, PIX_FMT_RGB24, (AVPicture*)frame, codec_context->pix_fmt,
                                         codec_context->width, codec_context->height);
+
+        picture = (AVPicture*)RGB_frame;
                         
+        //////////////////////////////////////////////
+        ////////// FIX THIS //////////////////////////
+        glGenTextures(1, &texture);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        // if it is the first frame create texture
+        if(current_frame == 1)
+        {
+          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_RGBA, codec_context->width, codec_context->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, picture->data[0]);
+        }
+        // if its not the first use glTexSubImage2D <-- faster then creating always a new texture
+        else
+          glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, codec_context->width, codec_context->height, GL_RGBA, GL_UNSIGNED_BYTE, picture->data[0]);
+
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+        //////////////////////////////////////////////
+        /////////////////////////////////////////////
+
         // save frame
-        this->saveCurrentFrame();
-
-
-        /* RGB_picture -> texture */
-
+        //this->saveCurrentFrame();
 
         return texture;
@@ -118 +137 @@
   char filename[32];
   int  y;
-
-  picture = (AVPicture*)RGB_frame;
 
   // Open file
@@ -183 +200 @@
   // Allocate video frame
   frame = avcodec_alloc_frame();
-  RGB_frame = avcodec_alloc_frame();
+        RGB_frame = avcodec_alloc_frame();
 
   // Determine required buffer size and allocate buffer
@@ -202 +219 @@
 {
   return codec_context->width;
+}
+
+int MediaContainer::getCurrentFrame()
+{
+  return this->current_frame;
 }
 

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

@@ -56 +56 @@
   int getHeight();
   int getWidth();
+        int getCurrentFrame();
   int getFrameRate();
   void getStream(/* stream */);

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

@@ -152 +152 @@
 }
 
-
+/**
+ * @brief adds a new Frame at the end of the Sequence.
+ * @param texture the texture to add at the end of the Sequence.
+ */
+bool TextureSequence::addFrame(GLuint texture)
+{
+  if (texture == NULL)
+    return false;
+  this->textures.push_back(texture);
+  
+  return true;
+}
 
 /**

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

@@ -29 +29 @@
     bool addFrame(const char* image);
     bool addFrame(SDL_Surface* surface);
+    bool addFrame(GLuint texture);
 
     virtual bool rebuild();