Changeset 6160 in orxonox.OLD

Timestamp:

Dec 19, 2005, 12:43:51 AM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: frames are displayed correct and fast…took me only 3 days to find out that the only faut was wrong number in the SDL_CreateRGBSurfaceFrom call :-/

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (3 diffs)
• lib/graphics/importer/media_container.h (modified) (2 diffs)
• subprojects/importer/importer.cc (modified) (2 diffs)
• subprojects/importer/multitex.cc (modified) (1 diff)

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

@@ -42 +42 @@
   fps = 0;
 
+  /* SDL interprets each pixel as a 32-bit number, so our masks must depend
+     on the endianness (byte order) of the machine */
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+  rmask = 0xff000000;
+  gmask = 0x00ff0000;
+  bmask = 0x0000ff00;
+#else
+  rmask = 0x000000ff;
+  gmask = 0x0000ff00;
+  bmask = 0x00ff0000;
+#endif
+
   if (filename != NULL)
     this->loadMedia(filename);
@@ -68 +80 @@
 }
 
-GLuint MediaContainer::getFrame(int frame_number)
-{
-
-}
-
-SDL_Surface * MediaContainer::getNextFrame()
+SDL_Surface* MediaContainer::getFrame(int frame_number)
+{
+
+}
+
+SDL_Surface* MediaContainer::getNextFrame()
 {
   /* get next frame */
@@ -107 +119 @@
           memcpy(&data[i*codec_context->width*3], picture->data[0]+i * picture->linesize[0],codec_context->width*sizeof(uint8_t)*3);
 
-Uint32 rmask, gmask, bmask, amask;
-
-    /* SDL interprets each pixel as a 32-bit number, so our masks must depend
-       on the endianness (byte order) of the machine */
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    rmask = 0xff000000;
-    gmask = 0x00ff0000;
-    bmask = 0x0000ff00;
-    amask = 0x000000ff;
-#else
-    rmask = 0x000000ff;
-    gmask = 0x0000ff00;
-    bmask = 0x00ff0000;
-    amask = 0xff000000;
-#endif
-surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width, codec_context->height,
-                                   32, codec_context->width*sizeof(uint8_t)*3, rmask, gmask, bmask, 0);
-
-return surface;
-        /*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)
-        //{
-          // build the texture
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, codec_context->width, codec_context->height, 0, GL_RGB, GL_UNSIGNED_BYTE, picture->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_RGB, GL_UNSIGNED_BYTE, data);
-
-
-        glBindTexture(GL_TEXTURE_2D, 0);*/
-        //////////////////////////////////////////////
-        /////////////////////////////////////////////
-
-        // save frame
-        //this->saveCurrentFrame();
-
-        //return texture;
+        surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width, codec_context->height,
+                                           24, codec_context->width*sizeof(uint8_t)*3, rmask, gmask, bmask, 0);
+
+        return surface;
       }
     }

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

@@ -32 +32 @@
 
   double fps;
-  GLuint texture;
+  Uint32 rmask, gmask, bmask;
   SDL_Surface *surface;
   uint8_t* data;
@@ -53 +53 @@
   ~MediaContainer();
 
-  GLuint getFrame(int frame_number);
-  SDL_Surface * getNextFrame();
+  SDL_Surface* getFrame(int frame_number);
+  SDL_Surface* getNextFrame();
   void loadMedia(const char* filename);
 

branches/avi_play/src/subprojects/importer/importer.cc

@@ -40 +40 @@
   SDL_Delay(1000);
 
-  // get the frame and save it as an image
-  //while(movie->getNextFrame() != NULL);       
-
 }
 
@@ -60 +57 @@
 void Framework::moduleTick(float dt)
 {
-  //while(movie->getNextFrame() != NULL);
-  //  movie->saveCurrentFrame();        
+  while(movie->getNextFrame() != NULL);
+    movie->saveCurrentFrame();  
 }
 

branches/avi_play/src/subprojects/importer/multitex.cc

@@ -52 +52 @@
 
   seq = new TextureSequence();
-  //for (int i = 1; i < argc; i++)
-  //{
-  //  seq->addFrame(argv[i]);
-  //  printf("%s\n", argv[i]);
-  //}
+  while(seq->addFrame(movie->getNextFrame()) != NULL);
 
-  // add one frame from the movie
-  //seq->addFrame(movie->getNextFrame());
-  //GLuint tex;
-  while(seq->addFrame(movie->getNextFrame()) != NULL)
-
-  test = new Texture(argv[1]);
+  test = new Texture();
+  
+  // ???: Only works if i set as diffuse map an image
+  // from the avifile created with importer (frameXX.ppm)
   testMat->setDiffuseMap(argv[1]);