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

Timestamp:

Dec 30, 2005, 8:34:22 PM (18 years ago)

Author:

hdavid

Message:

branches\avi_play: MoviePlayer works again

File:

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

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

@@ -125 +125 @@
   buffer=new uint8_t[num_bytes];
 
-  // Assign appropriate parts of buffer to image planes in pFrameRGB
+  // Assign appropriate parts of buffer to image planes in RGB_frame
   avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);
 
@@ -155 +155 @@
 GLuint MediaContainer::getNextFrame()
 {
-  //if (glIsTexture(texture))
-  //  glDeleteTextures(1, &texture);
 
   // get next frame
@@ -189 +187 @@
                  ((AVPicture*)RGB_frame)->linesize[0], 
                   codec_context->width*sizeof(uint8_t)*3);
+
+        //avcodec_flush_buffers(codec_context); 
 
         surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
@@ -228 +228 @@
                         GL_UNSIGNED_BYTE,
                         surface->pixels);
-        glBindTexture(GL_TEXTURE_2D, 0);
+        glBindTexture(GL_TEXTURE_2D, 0);      
         
         return texture;
@@ -235 +235 @@
       {
         av_free_packet(&packet);
-        this->getNextFrame();
+        return this->getNextFrame();
       }
     }
@@ -241 +241 @@
     {
       av_free_packet(&packet);
-      this->getNextFrame();
+      return this->getNextFrame();
     }
   }