Changeset 6112 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/media_container.cc

Timestamp:

Dec 14, 2005, 4:23:11 PM (18 years ago)

Author:

stefalie

Message:

branches\avi_play: OpenGL still has problems to display our texture, way too slow

File:

• branches/avi_play/src/lib/graphics/importer/media_container.cc (modified) (7 diffs)

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);
+                                        codec_context->width, codec_context->height);
 
         picture = (AVPicture*)RGB_frame;
-                        
-        //////////////////////////////////////////////
-        ////////// FIX THIS //////////////////////////
+
+
+        data = 0;
+        data = new uint8_t[codec_context->width*codec_context->height*3*sizeof(uint8_t)];
+        for(int i = 0; i < codec_context->height; i++)
+          memcpy(&data[i*codec_context->width*3],
+                 picture->data[0]+i * picture->linesize[0],codec_context->width*sizeof(uint8_t)*3);
+
+
         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);
         // 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(current_frame == 1)
+        //{
+          // build the texture
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, codec_context->width, codec_context->height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
+        //}
         // 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]);
+        //else
+        //  glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, codec_context->width, codec_context->height, GL_RGB, GL_UNSIGNED_BYTE, data);
 
 
@@ -142 +148 @@
   file = fopen(filename, "wb");
   if(file == NULL)
-        return;
+        return;
 
   // Write header
@@ -163 +169 @@
   /* Retrieve stream information */
   if (av_find_stream_info(format_context) < 0)
-    PRINTF(1)("Could not find stream information in %s\n", filename); 
+    PRINTF(1)("Could not find stream information in %s\n", filename);
 
   // Dump information about file onto standard error
@@ -173 +179 @@
   {
     // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
-    // if(format_context->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO)             
+    // if(format_context->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO)
     if(format_context->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
     {
@@ -180 +186 @@
     }
   }
-  
+
   if(video_stream == -1)
     PRINTF(1)("Could not find a video stream in %s\n", filename);
@@ -200 +206 @@
   // Allocate video frame
   frame = avcodec_alloc_frame();
-        RGB_frame = avcodec_alloc_frame();
+        RGB_frame = avcodec_alloc_frame();
 
   // Determine required buffer size and allocate buffer
@@ -207 +213 @@
 
   // Assign appropriate parts of buffer to image planes in pFrameRGB
-  avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);   
+  avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);
 
 }