Changeset 6003 in orxonox.OLD for branches

Timestamp:

Dec 9, 2005, 6:07:05 PM (19 years ago)

Author:

hdavid

Message:

branches/avi_play: some init stuff

Location:

branches/avi_play

Files:

• configure.ac (modified) (1 diff)
• src/lib/graphics/importer/media_container.cc (modified) (4 diffs)
• src/lib/graphics/importer/media_container.h (modified) (3 diffs)
• src/lib/sound/sound_engine.cc (modified) (1 diff)
• src/subprojects/importer/importer.cc (modified) (2 diffs)
• src/subprojects/importer/multitex.cc (modified) (2 diffs)

branches/avi_play/configure.ac

@@ -660 +660 @@
   AC_CHECK_HEADERS([avformat.h] ,,
       [AC_CHECK_HEADERS([ffmpeg/avformat.h] ,,AC_MSG_ERROR([cannot find FFmpeg header.])]))
-# checking for vorbisfile-lib
+# checking for ffmpeg-lib
   AC_CHECK_LIB([avformat], [main], [FOUND_avformat=yes; LIBS="$LIBS -lavformat"])
      if test x$FOUND_avformat != xyes ; then
         echo "------------------"
         echo "avformat library not found."
+        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.new"
+        echo "------------------"
+        exit -1
+     fi
+        AC_CHECK_LIB([avcodec], [main], [FOUND_avcodec=yes; LIBS="$LIBS -lavcodec"])
+     if test x$FOUND_avcodec != xyes ; then
+        echo "------------------"
+        echo "avcodec library not found."
         echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.new"
         echo "------------------"

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

@@ -40 +40 @@
   av_register_all();
 
+        current_frame = 0;
+        num_frames = 0;
+
   if (filename != NULL)
     this->loadMedia(filename);
@@ -50 +53 @@
 MediaContainer::~MediaContainer()
 {
+        //av_free(pFrameRGB);
+
+        /* Free the frame */
+  av_free(frame);
+
+  /* Close the codec */
+  avcodec_close(codec_context);
+
+  /* Close the video file */
+  av_close_input_file(format_context);
 
 }
 
-GLuint MediaContainer::getFrame(int frame_number)
+/*GLuint MediaContainer::getFrame(int frame_number)
 {
 
@@ -61 +74 @@
 {
 
+}*/
+
+SDL_Surface* MediaContainer::getFrame(int frame_number)
+{
+        SDL_Surface* frame;
+        
+
+        return frame;
+}
+
+SDL_Surface* MediaContainer::getNextFrame()
+{
+        current_frame++;
+        return this->getFrame(current_frame);
 }
 
@@ -68 +95 @@
   if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
     PRINTF(1)("Could not open %s\n", filename);
+
+        /* Retrieve stream information */
+  if (av_find_stream_info(format_context) < 0)
+        PRINTF(1)("Could not find stream information in %s\n", filename); 
+
+  // Dump information about file onto standard error
+  //dump_format(pFormatCtx, 0, argv[1], false);
+
+  /* Find the first video stream and take it */
+  video_stream = -1;
+  for(int i = 0; i < format_context->nb_streams; i++)
+        {
+                // 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)
+    {
+        video_stream = i;
+      break;
+    }
+        }
+  
+        if(video_stream == -1)
+        PRINTF(1)("Could not find a video stream in %s\n", filename);
+
+        /* Get a pointer to the codec context for the video stream */
+        // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
+        // codec_context = &format_context->streams[video_stream]->codec;
+  codec_context = format_context->streams[video_stream]->codec;
+
+        /* Find the decoder for the video stream */
+  codec = avcodec_find_decoder(codec_context->codec_id);
+  if (codec == NULL)
+        PRINTF(1)("Could not find codec\n");
+
+        /* Open codec */
+  if (avcodec_open(codec_context, codec) < 0)
+                PRINTF(1)("Could not open codec\n");
+
+        
 
 }

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

@@ -24 +24 @@
 using namespace std;
 
+/* Forward Declaration */
+struct SDL_Surface;
+
 class MediaContainer : public BaseObject
 {
@@ -31 +34 @@
         char* filename;
         int current_frame;
+        int num_frames;
 
         AVFormatContext* format_context;
@@ -46 +50 @@
   ~MediaContainer();
 
-        GLuint getFrame(int frame_number);
-        GLuint getNextFrame();
+        //GLuint getFrame(int frame_number);
+        SDL_Surface* getFrame(int frame_number);
+        //GLuint getNextFrame();
+        SDL_Surface* getNextFrame();
         void loadMedia(const char* filename);
         

branches/avi_play/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 #ifndef AL_VERSION_1_1
-  ALCchar deviceName[] =
+  ALubyte deviceName[] =
 #else
   ALCchar deviceName[] =

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

@@ -22 +22 @@
 #include "objModel.h"
 #include "primitive_model.h"
+#include "media_container.h"
 #include <stdlib.h>
 
@@ -30 +31 @@
 void Framework::moduleInit(int argc, char** argv)
 {
+        //MediaContainer* test;
+        
+        //test = new MediaContainer(argv[1]);   
+
+
   ResourceManager::getInstance()->addImageDir("./");
 

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

@@ -56 +56 @@
 
 
-  obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
+  obj = new PrimitiveModel(PRIM_PLANE, 10.0);
 
   ResourceManager::getInstance()->debug();
@@ -73 +73 @@
       switch (event->key.keysym.sym)
         {
-        case SDLK_i:
+        case SDLK_1:
+                                        obj = new PrimitiveModel(PRIM_CUBE, 10.0);
+          break;
+                                case SDLK_2:
+                                        obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
+          break;
+                                case SDLK_3:
+                                        obj = new PrimitiveModel(PRIM_PLANE, 10.0);
           break;
         }