Changeset 6373 in orxonox.OLD

Timestamp:

Dec 31, 2005, 3:26:57 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: different texture creation

Location:

branches/avi_play/src/lib/graphics/importer

Files:

• media_container.cc (modified) (3 diffs)
• media_container.h (modified) (1 diff)
• movie_player.cc (modified) (4 diffs)
• movie_player.h (modified) (2 diffs)

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

@@ -58 +58 @@
   if (glIsTexture(texture))
     glDeleteTextures(1, &texture);
-  SDL_FreeSurface(surface);
+  //SDL_FreeSurface(surface);
 
   // Free the RGB image
@@ -186 +186 @@
                  ((AVPicture*)RGB_frame)->data[0]+i *
                  ((AVPicture*)RGB_frame)->linesize[0], 
-                  codec_context->width*sizeof(uint8_t)*3);
-
-        //avcodec_flush_buffers(codec_context); 
-
+                  codec_context->width*sizeof(uint8_t)*3); 
+/*
         surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
                                            codec_context->height,24,
@@ -228 +226 @@
                         GL_UNSIGNED_BYTE,
                         surface->pixels);
-        glBindTexture(GL_TEXTURE_2D, 0);      
+        glBindTexture(GL_TEXTURE_2D, 0);  */   
+
+        // Create an OpenGL texture
+        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);
+        // create the texture
+        glTexImage2D(GL_TEXTURE_2D,
+                    0,
+                    GL_RGB,
+                    codec_context->width, codec_context->height,
+                    0,
+                    GL_RGB,
+                    GL_UNSIGNED_BYTE,
+                    data);
+        // build the MipMaps
+        gluBuild2DMipmaps(GL_TEXTURE_2D,
+                        GL_RGB,
+                        codec_context->width,
+                        codec_context->height,
+                        GL_RGB,
+                        GL_UNSIGNED_BYTE,
+                        data);
+        glBindTexture(GL_TEXTURE_2D, 0);
         
+        //avcodec_flush_buffers(codec_context);
+
         return texture;
       }

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

@@ -34 +34 @@
   AVFrame* RGB_frame;
 
-  SDL_Surface* surface;
+  //SDL_Surface* surface;
   GLuint texture;
   uint8_t* data;

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

@@ -49 +49 @@
   if (glIsTexture(texture))
     glDeleteTextures(1, &texture);
-  SDL_FreeSurface(surface);
+  //SDL_FreeSurface(surface);
 
   // Free the RGB image
@@ -57 +57 @@
   // Free the frame
   av_free(frame);
+
+avcodec_default_free_buffers(codec_context);
 
   // Close the codec
@@ -197 +199 @@
                  codec_context->width*sizeof(uint8_t)*3);
 
-//avcodec_flush_buffers(codec_context);
-
-        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,
@@ -229 +229 @@
                         GL_UNSIGNED_BYTE,
                         surface->pixels);
+        glBindTexture(GL_TEXTURE_2D, 0);*/
+
+
+        glBindTexture(GL_TEXTURE_2D, texture);
+        // update the texture
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
+                          codec_context->width, codec_context->height,
+                          GL_RGB, GL_UNSIGNED_BYTE,
+                          data);
+        // build the MipMaps
+        gluBuild2DMipmaps(GL_TEXTURE_2D,
+                        GL_RGB,
+                        codec_context->width,
+                        codec_context->height,
+                        GL_RGB,
+                        GL_UNSIGNED_BYTE,
+                        data);
         glBindTexture(GL_TEXTURE_2D, 0);
+
+        //avcodec_flush_buffers(codec_context);
+
       }
       else

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

@@ -48 +48 @@
   AVFrame* RGB_frame;
 
-  SDL_Surface* surface;
+  //SDL_Surface* surface;
   GLuint texture;
   uint8_t* data;
@@ -89 +89 @@
   void getNextFrame();
   void skipFrame(int frames);
-  void gotoFrame(int frame);
+  void gotoFrame(int frames);
 
 };