Changeset 6373 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/movie_player.cc

Timestamp:

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

Author:

hdavid

Message:

branches\avi_play: different texture creation

File:

• branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) (4 diffs)

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