Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6339 in orxonox.OLD for branches/avi_play


Ignore:
Timestamp:
Dec 30, 2005, 1:51:41 AM (19 years ago)
Author:
hdavid
Message:

branches\avi_play: some copy, pasta & delete

Location:
branches/avi_play/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/avi_play/src/lib/graphics/importer/media_container.cc

    r6333 r6339  
    3434MediaContainer::MediaContainer(const char* filename)
    3535{
    36   this->init();
     36  // set the class id for the base object
     37  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
     38
     39  fps = 0;
    3740
    3841  if (filename != NULL)
     
    4245MediaContainer::MediaContainer()
    4346{
    44   this->init();
     47  // set the class id for the base object
     48  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
     49
     50  fps = 0;
    4551}
    4652
     
    5056MediaContainer::~MediaContainer()
    5157{
    52   // delete all textures.
    53   while(!this->texture_list.empty())
    54   {
    55     if (glIsTexture(this->texture_list.back()))
    56       glDeleteTextures(1, &this->texture_list.back());
    57     this->texture_list.pop_back();
    58   }
    59   glDeleteTextures(1, &texture);
     58  if (glIsTexture(texture))
     59    glDeleteTextures(1, &texture);
    6060  SDL_FreeSurface(surface);
    6161
     
    6464  av_free(RGB_frame);
    6565
    66   /* Free the frame */
     66  // Free the frame
    6767  av_free(frame);
    6868
    69   /* Close the codec */
     69  // Close the codec
    7070  avcodec_close(codec_context);
    7171
    72   /* Close the video file */
     72  // Close the video file
    7373  av_close_input_file(format_context);
    74 
    75 }
    76 
    77 void MediaContainer::init()
    78 {
    79   /* set the class id for the base object */
    80   this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
    81 
    82   /* register all formats and codecs */
     74}
     75
     76void MediaContainer::loadMedia(const char* filename)
     77{
     78  // register all formats and codecs
    8379  av_register_all();
    8480
    85   fps = 0;
    86   frame_num = 0;
    87 }
    88 
    89 void MediaContainer::gotoFrame(int frame_number)
    90 {
    91   // seek doesnt work for the first two frames
    92   // you will get ugly fragments
    93   if(frame_number < 2)
     81  // Open video file
     82  if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
     83    PRINTF(1)("Could not open %s\n", filename);
     84
     85  // Retrieve stream information
     86  if (av_find_stream_info(format_context) < 0)
     87    PRINTF(1)("Could not find stream information in %s\n", filename);
     88
     89  // Find the first video stream and take it
     90  video_stream = -1;
     91  for(int i = 0; i < format_context->nb_streams; i++)
    9492  {
    95     // go to the begin of the video
    96     av_seek_frame(format_context, video_stream, 0, AVSEEK_FLAG_BACKWARD);
    97     frame_num = 0;
     93    // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
     94    // if(format_context->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO)
     95    if(format_context->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
     96    {
     97      video_stream = i;
     98      break;
     99    }
    98100  }
    99   else
    100   {
    101     // seeks to the nearest keyframe
    102     // NOTE: there is only about every 5s a keyframe!
    103     av_seek_frame(format_context, video_stream, frame_number, AVSEEK_FLAG_BACKWARD);
    104    
    105     // go from the keyframe to the exact position
    106     codec_context->hurry_up = 1;
    107     do {
    108       av_read_frame(format_context, &packet);
    109       if(packet.pts >= frame_number-1)
    110         break;
    111       int frame_finished;
    112       avcodec_decode_video(codec_context, frame, &frame_finished, packet.data, packet.size);
    113       av_free_packet(&packet);
    114     } while(1);
    115     codec_context->hurry_up = 0;
    116  
    117     frame_num = frame_number;
    118   }
    119 }
     101
     102  if(video_stream == -1)
     103    PRINTF(1)("Could not find a video stream in %s\n", filename);
     104
     105  // Get a pointer to the codec context for the video stream
     106  // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
     107  // codec_context = &format_context->streams[video_stream]->codec;
     108  codec_context = format_context->streams[video_stream]->codec;
     109
     110  // Find the decoder for the video stream
     111  codec = avcodec_find_decoder(codec_context->codec_id);
     112  if (codec == NULL)
     113    PRINTF(1)("Could not find codec\n");
     114
     115  // Open codec
     116  if (avcodec_open(codec_context, codec) < 0)
     117    PRINTF(1)("Could not open codec\n");
     118
     119  // Allocate video frame
     120  frame = avcodec_alloc_frame();
     121  RGB_frame = avcodec_alloc_frame();
     122
     123  // Determine required buffer size and allocate buffer
     124  num_bytes = avpicture_get_size(PIX_FMT_RGB24, codec_context->width, codec_context->height);
     125  buffer=new uint8_t[num_bytes];
     126
     127  // Assign appropriate parts of buffer to image planes in pFrameRGB
     128  avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);
     129
     130  // Calculate fps
     131  fps = av_q2d(format_context->streams[video_stream]->r_frame_rate);
     132
     133  // read the frames and save them in a sequence as textures
     134  this->loadFrames();
     135}
     136
     137double MediaContainer::getFPS()
     138{
     139  return this->fps;
     140}
     141
     142void MediaContainer::loadFrames()
     143{
     144  // go to the begin of the video
     145  av_seek_frame(format_context, video_stream, 0, AVSEEK_FLAG_BACKWARD);
     146
     147  // get all the frames and save them in the sequence
     148  while(this->addFrame(this->getNextFrame()) != NULL);
     149}
     150
    120151
    121152GLuint MediaContainer::getNextFrame()
    122153{
    123   /* get next frame */
     154  // get next frame
    124155  if(av_read_frame(format_context, &packet) >= 0)
    125156  {
    126     //this->printPacketInformation();
    127 
    128     /* Is this a packet from the video stream? */
     157    // Is this a packet from the video stream?
    129158    if(packet.stream_index == video_stream)
    130159    {
     
    140169      if(frame_finished)
    141170      {
    142         frame_num++;
    143         //PRINTF(1)("frame_number: %i\n", this->getFrameNumber());
    144171        // Conversion from YUV to RGB
    145172        // Most codecs return images in YUV 420 format
     
    149176                    codec_context->pix_fmt, codec_context->width, codec_context->height);
    150177
    151         picture = (AVPicture*)RGB_frame;
    152 
    153 
    154178        data = 0;
    155179        data = new uint8_t[codec_context->width*codec_context->height*3*sizeof(uint8_t)];
    156180        for(int i = 0; i < codec_context->height; i++)
    157           memcpy(&data[i*codec_context->width*3], picture->data[0]+i *
    158                  picture->linesize[0],codec_context->width*sizeof(uint8_t)*3);
     181          memcpy(&data[i*codec_context->width*3],
     182                 ((AVPicture*)RGB_frame)->data[0]+i *
     183                 ((AVPicture*)RGB_frame)->linesize[0],
     184                  codec_context->width*sizeof(uint8_t)*3);
    159185
    160186        surface = SDL_CreateRGBSurfaceFrom(data, codec_context->width,
    161187                                           codec_context->height,24,
    162188                                           codec_context->width*sizeof(uint8_t)*3,
    163 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
     189#if SDL_BYTEORDER == SDL_LIL_ENDIAN // OpenGL RGBA masks
    164190                                           0x000000FF,
    165191                                           0x0000FF00,
     
    174200                                            );
    175201
    176         if(frame_num == 1)
    177         {
    178           /* Create an OpenGL texture from the surface */
    179           glGenTextures(1, &texture);
    180           glBindTexture(GL_TEXTURE_2D, texture);
    181           glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    182           glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    183           // create the texture
    184           glTexImage2D(GL_TEXTURE_2D,
    185                       0,
    186                       GL_RGB,
    187                       surface->w, surface->h,
    188                       0,
    189                       GL_RGB,
    190                       GL_UNSIGNED_BYTE,
    191                       surface->pixels);
    192           // build the MipMaps
    193           gluBuild2DMipmaps(GL_TEXTURE_2D,
    194                           GL_RGB,
    195                           surface->w,
    196                           surface->h,
    197                           GL_RGB,
    198                           GL_UNSIGNED_BYTE,
    199                           surface->pixels);
    200           glBindTexture(GL_TEXTURE_2D, 0);
    201         }
    202         else
    203         {
    204           /* Create an OpenGL texture from the surface */
    205           glGenTextures(1, &texture);
    206           glBindTexture(GL_TEXTURE_2D, texture);
    207           glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    208           glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    209           // update the texture
    210           glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, surface->w, surface->h, GL_RGB, GL_UNSIGNED_BYTE, surface->pixels);
    211 
    212           // build the MipMaps
    213           gluBuild2DMipmaps(GL_TEXTURE_2D,
    214                           GL_RGB,
    215                           surface->w,
    216                           surface->h,
    217                           GL_RGB,
    218                           GL_UNSIGNED_BYTE,
    219                           surface->pixels);
    220           glBindTexture(GL_TEXTURE_2D, 0);
    221         }
    222 
     202        // Create an OpenGL texture from the surface
     203        glGenTextures(1, &texture);
     204        glBindTexture(GL_TEXTURE_2D, texture);
     205        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     206        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     207        // create the texture
     208        glTexImage2D(GL_TEXTURE_2D,
     209                    0,
     210                    GL_RGB,
     211                    surface->w, surface->h,
     212                    0,
     213                    GL_RGB,
     214                    GL_UNSIGNED_BYTE,
     215                    surface->pixels);
     216        // build the MipMaps
     217        gluBuild2DMipmaps(GL_TEXTURE_2D,
     218                        GL_RGB,
     219                        surface->w,
     220                        surface->h,
     221                        GL_RGB,
     222                        GL_UNSIGNED_BYTE,
     223                        surface->pixels);
     224        glBindTexture(GL_TEXTURE_2D, 0);
     225       
    223226        return texture;
     227      }
     228      else
     229      {
     230        av_free_packet(&packet);
     231        this->getNextFrame();
    224232      }
    225233    }
     
    233241    return NULL;
    234242}
    235 
    236 GLuint MediaContainer::skipFrame(int num_frames)
    237 {
    238   frame_num += num_frames;
    239  
    240   while(num_frames != 0)
    241   {
    242     if(av_read_frame(format_context, &packet) < 0)
    243       break;
    244     if(packet.stream_index == video_stream)
    245     {
    246       int frame_finished;
    247       // We have to decode the frame to not get ugly fragments
    248       avcodec_decode_video(codec_context, frame, &frame_finished,
    249                             packet.data, packet.size);
    250        
    251       // Did we get a video frame?
    252       if(frame_finished)
    253         num_frames--;
    254     }
    255     av_free_packet(&packet);
    256   }
    257  
    258   return this->getNextFrame();
    259 }
    260 
    261 vector<GLuint> MediaContainer::getFrameList()
    262 {
    263 
    264   while((texture = this->getNextFrame()) != NULL)
    265     texture_list.push_back(texture);
    266 
    267   return texture_list;
    268 }
    269 
    270 void MediaContainer::saveCurrentFrame()
    271 {
    272   FILE *file;
    273   char filename[32];
    274   int  y;
    275 
    276   // Open file
    277   sprintf(filename, "frame%i.ppm", frame_num);
    278   file = fopen(filename, "wb");
    279   if(file == NULL)
    280         return;
    281 
    282   // Write header
    283   fprintf(file, "P6\n%d %d\n255\n", codec_context->width, codec_context->height);
    284   // Write pixel data
    285   for(y = 0; y < codec_context->height; y++)
    286     fwrite(picture->data[0]+y * picture->linesize[0], 1, codec_context->width*3, file);
    287   // Close file
    288   fclose(file);
    289 
    290   PRINTF(1)("created file: %s\n", filename);
    291 }
    292 
    293 void MediaContainer::loadMedia(const char* filename)
    294 {
    295   /* Open video file */
    296   if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
    297     PRINTF(1)("Could not open %s\n", filename);
    298 
    299   /* Retrieve stream information */
    300   if (av_find_stream_info(format_context) < 0)
    301     PRINTF(1)("Could not find stream information in %s\n", filename);
    302 
    303   // Dump information about file onto standard error
    304   //dump_format(pFormatCtx, 0, argv[1], false);
    305 
    306   /* Find the first video stream and take it */
    307   video_stream = -1;
    308   for(int i = 0; i < format_context->nb_streams; i++)
    309   {
    310     // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
    311     // if(format_context->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO)
    312     if(format_context->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
    313     {
    314       video_stream = i;
    315       break;
    316     }
    317   }
    318 
    319   if(video_stream == -1)
    320     PRINTF(1)("Could not find a video stream in %s\n", filename);
    321 
    322   /* Get a pointer to the codec context for the video stream */
    323   // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
    324   // codec_context = &format_context->streams[video_stream]->codec;
    325   codec_context = format_context->streams[video_stream]->codec;
    326 
    327   /* Find the decoder for the video stream */
    328   codec = avcodec_find_decoder(codec_context->codec_id);
    329   if (codec == NULL)
    330     PRINTF(1)("Could not find codec\n");
    331 
    332   /* Open codec */
    333   if (avcodec_open(codec_context, codec) < 0)
    334     PRINTF(1)("Could not open codec\n");
    335 
    336   // Allocate video frame
    337   frame = avcodec_alloc_frame();
    338   RGB_frame = avcodec_alloc_frame();
    339 
    340   // Determine required buffer size and allocate buffer
    341   num_bytes = avpicture_get_size(PIX_FMT_RGB24, codec_context->width, codec_context->height);
    342   buffer=new uint8_t[num_bytes];
    343 
    344   // Assign appropriate parts of buffer to image planes in pFrameRGB
    345   avpicture_fill((AVPicture *)RGB_frame, buffer, PIX_FMT_RGB24, codec_context->width, codec_context->height);
    346 
    347   // Calculate fps
    348   fps = av_q2d(format_context->streams[video_stream]->r_frame_rate);
    349 
    350   // duration
    351   duration = format_context->duration / 1000000LL;
    352 
    353   frame_num = 0;
    354 }
    355 
    356 int MediaContainer::getHeight()
    357 {
    358   return codec_context->height;
    359 }
    360 
    361 int MediaContainer::getWidth()
    362 {
    363   return codec_context->width;
    364 }
    365 
    366 int MediaContainer::getFrameNumber()
    367 {
    368   return frame_num;
    369 }
    370 
    371 double MediaContainer::getFPS()
    372 {
    373   return this->fps;
    374 }
    375 
    376 void MediaContainer::printMediaInformation()
    377 {
    378   PRINTF(1)("========================\n");
    379   PRINTF(1)("========================\n");
    380   PRINTF(1)("=    MEDIACONTAINER    =\n");
    381   PRINTF(1)("========================\n");
    382   PRINTF(1)("========================\n");
    383   PRINTF(1)("=    AVFormatContext   =\n");
    384   PRINTF(1)("========================\n");
    385   PRINTF(1)("filename: %s\n", format_context->filename);
    386   PRINTF(1)("nb_streams: %i\n", format_context->nb_streams);
    387   PRINTF(1)("duration: (%02d:%02d:%02d)\n", duration/3600, (duration%3600)/60, duration%60);
    388   PRINTF(1)("file_size: %ikb\n", format_context->file_size/1024);
    389   PRINTF(1)("bit_rate: %ikb/s\n", format_context->bit_rate/1000);
    390   PRINTF(1)("nb_frames: %i\n", format_context->streams[video_stream]->nb_frames);
    391   PRINTF(1)("r_frame_rate: %i\n", format_context->streams[video_stream]->r_frame_rate.num);
    392   PRINTF(1)("fps: %0.2f\n", av_q2d(format_context->streams[video_stream]->r_frame_rate));
    393   PRINTF(1)("========================\n");
    394   PRINTF(1)("=    AVCodecContext    =\n");
    395   PRINTF(1)("========================\n");
    396   PRINTF(1)("width: %i\n", codec_context->width);
    397   PRINTF(1)("height: %i\n", codec_context->height);
    398   PRINTF(1)("time_base.den: %i\n", codec_context->time_base.den);
    399   PRINTF(1)("time_base.num: %i\n", codec_context->time_base.num);
    400   PRINTF(1)("========================\n");
    401   PRINTF(1)("=       AVCodec        =\n");
    402   PRINTF(1)("========================\n");
    403   PRINTF(1)("codec name: %s\n", codec->name);
    404   PRINTF(1)("========================\n");
    405   PRINTF(1)("========================\n");
    406 }
    407 
    408 void MediaContainer::printPacketInformation()
    409 {
    410   PRINTF(1)("========================\n");
    411   PRINTF(1)("========================\n");
    412   PRINTF(1)("=       AVPacket       =\n");
    413   PRINTF(1)("========================\n");
    414   PRINTF(1)("pts: %i\n", packet.pts);
    415   PRINTF(1)("dts: %i\n", packet.dts);
    416   PRINTF(1)("size: %i\n", packet.size);
    417   PRINTF(1)("stream_index: %i\n", packet.stream_index);
    418   PRINTF(1)("duration: %i\n", packet.duration);
    419   PRINTF(1)("pos: %i\n", packet.pos);
    420   PRINTF(1)("========================\n");
    421   PRINTF(1)("========================\n");
    422 }
  • branches/avi_play/src/lib/graphics/importer/media_container.h

    r6330 r6339  
    99
    1010#include <SDL.h>
    11 #include <vector>
    1211
    1312#ifdef HAVE_AVFORMAT_H
     
    1918/* include base_object.h since all classes are derived from this one */
    2019#include "base_object.h"
     20#include "texture_sequence.h"
    2121
    2222#include "glincl.h"
    2323
    24 /* using namespace std is default, this needs to be here */
    25 using namespace std;
    26 
    27 class MediaContainer : public BaseObject
     24class MediaContainer : public TextureSequence
    2825{
    2926
    3027private:
    31 
    32   double fps;
    33   SDL_Surface* surface;
    34   GLuint texture;
    35   uint8_t* data;
    3628
    3729  AVFormatContext* format_context;
     
    4133  AVPacket packet;
    4234  AVFrame* RGB_frame;
    43   AVPicture* picture;
    4435
     36  SDL_Surface* surface;
     37  GLuint texture;
     38  uint8_t* data;
     39  uint8_t* buffer;
    4540  int num_bytes;
    46   uint8_t* buffer;
    4741  int video_stream;
    48   int duration;
    49   int frame_num;
    50 
    51   vector<GLuint>    texture_list;
     42  double fps;
    5243
    5344public:
     
    5748  ~MediaContainer();
    5849
    59   void init();
    60   void gotoFrame(int frame_number);
    61   GLuint getNextFrame();
    62   GLuint skipFrame(int num_frames);
    63   vector<GLuint> getFrameList();
    6450  void loadMedia(const char* filename);
     51  void loadFrames();
    6552
    66   int getHeight();
    67   int getWidth();
    68   int getFrameNumber();
    6953  double getFPS();
    7054
    71   void saveCurrentFrame();
    72 
    73   void printMediaInformation();
    74   void printPacketInformation();
     55private:
     56 
     57  GLuint getNextFrame();
    7558
    7659};
  • branches/avi_play/src/lib/graphics/importer/movie_player.cc

    r6330 r6339  
    1818/* this is for debug output. It just says, that all calls to PRINT() belong to the DEBUG_MODULE_MEDIA module
    1919   For more information refere to https://www.orxonox.net/cgi-bin/trac.cgi/wiki/DebugOutput
    20 */
     20*//*
    2121#define DEBUG_MODULE_MEDIA
    2222
    2323
    24 /* include your own header */
     24// include your own header
    2525#include "movie_player.h"
    2626
    27 /* header for debug output */
     27// header for debug output
    2828#include "debug.h"
    2929
    3030
    31 /**
    32  * Default constructor
    33  */
     31//
     32// Default constructor
     33//
    3434MoviePlayer::MoviePlayer(const char* filename)
    3535{
     
    4646}
    4747
    48 /**
    49  * Default destructor
    50  */
    5148MoviePlayer::~MoviePlayer()
    5249{
     
    165162  return this->status;
    166163}
     164*/
  • branches/avi_play/src/lib/graphics/importer/movie_player.h

    r6330 r6339  
    44
    55*/
    6 
     6/*
    77#ifndef _MOVIE_PLAYER
    88#define _MOVIE_PLAYER
     
    1717#include "primitive_model.h"
    1818
    19 /* include base_object.h since all classes are derived from this one */
     19// include base_object.h since all classes are derived from this one
    2020#include "base_object.h"
    2121
    22 /* The state of the MoviePlayer */
     22// The state of the MoviePlayer
    2323typedef enum MP_STATUS {
    2424  PLAY,
     
    7171
    7272
    73 #endif /* _MOVIE_PLAYER */
     73#endif // _MOVIE_PLAYER
     74*/
  • branches/avi_play/src/lib/graphics/importer/texture_sequence.cc

    r6317 r6339  
    153153}
    154154
    155 bool TextureSequence::addFrameList(std::vector<GLuint> textures)
    156 {
    157   // add the textures to the list
    158   for(int i = 0; i < textures.size(); i++)
    159     this->addFrame(textures[i]);
    160 }
    161 
    162155/**
    163156 * @brief adds a new Frame at the end of the Sequence.
     
    177170 * @param frameNumber the n-th frame
    178171 */
    179 void TextureSequence::gotoFrame(unsigned int frameNumber)
     172/*void TextureSequence::gotoFrame(unsigned int frameNumber)
    180173{
    181174  if (this->textures.size() > frameNumber)
    182175    this->setTexture(this->textures[frameNumber]);
    183176}
     177*/
  • branches/avi_play/src/lib/graphics/importer/texture_sequence.h

    r6317 r6339  
    3030    bool addFrame(SDL_Surface* surface);
    3131    bool addFrame(GLuint texture);
    32     bool addFrameList(std::vector<GLuint> textures);
    3332
    3433    virtual bool rebuild();
     
    3736    inline unsigned int getFrameCount() const { return this->textures.size(); };
    3837
    39     void gotoFrame(unsigned int frameNumber);
     38    //void gotoFrame(unsigned int frameNumber);
    4039    /** @returns The textureID of the Frame @param frameNumber the n-th frame this texture-series.  */
    4140    inline GLuint getFrameTexture(unsigned int frameNumber) const { return (this->textures.size()>frameNumber)?this->textures[frameNumber]:0; };
  • branches/avi_play/src/subprojects/importer/importer.cc

    r6286 r6339  
    2525#include "resource_manager.h"
    2626
    27 MediaContainer* movie;
    2827
    2928void Framework::moduleInit(int argc, char** argv)
    3029{
    3130
    32   movie = new MediaContainer(argv[1]);
    33 
    34   // print information about the media file
    35   movie->printMediaInformation();
    36 
    37   SDL_Delay(1000);
    3831
    3932}
     
    4639void Framework::moduleTick(float dt)
    4740{
    48   while(movie->getNextFrame() != NULL);
    49     movie->saveCurrentFrame(); 
     41
    5042}
    5143
  • branches/avi_play/src/subprojects/importer/movie_player_test.cc

    r6325 r6339  
    2121#include "movie_player.h"
    2222
    23 MoviePlayer* movie_player;
     23//MoviePlayer* movie_player;
    2424
    2525void Framework::moduleInit(int argc, char** argv)
    2626{
    27   movie_player = new MoviePlayer(argv[1]);
     27  //movie_player = new MoviePlayer(argv[1]);
    2828
    29   movie_player->printInformation();
     29  //movie_player->printInformation();
    3030}
    3131
    3232void Framework::moduleEventHandler(SDL_Event* event)
    3333{
    34   switch (event->type)
     34  /*switch (event->type)
    3535  {
    3636    case SDL_KEYDOWN:
     
    5858          break;
    5959      }
    60   }
     60  }*/
    6161}
    6262
    6363void Framework::moduleTick(float dt)
    6464{
    65   movie_player->tick(dt);
     65  //movie_player->tick(dt);
    6666}
    6767
    6868void Framework::moduleDraw(void) const
    6969{
    70   movie_player->draw();
     70  //movie_player->draw();
    7171}
    7272
  • branches/avi_play/src/subprojects/importer/multitex.cc

    r6333 r6339  
    2020#include "light.h"
    2121
    22 #include "texture_sequence.h"
    2322#include "material.h"
    24 
    2523#include "primitive_model.h"
    2624#include <stdlib.h>
     
    2927
    3028Model* obj;
    31 TextureSequence* seq;
    3229Material* testMat;
    33 MediaContainer* movie;
     30MediaContainer* media_container;
    3431
    3532int counter = 0;
     
    4037void Framework::moduleInit(int argc, char** argv)
    4138{
    42   if( argc <= 2)
     39  if( argc <= 1)
    4340  {
    4441    printf("Wrong arguments try following notations:\n");
    45     printf("./multitex [media_file] [start_time]\n");
     42    printf("./multitex [media_file]\n");
    4643    exit(0);
    4744  }
    4845
    49   movie = new MediaContainer(argv[1]);
    50   //movie = new MediaContainer();
    51   //movie->loadMedia(argv[1]);
    52   fps = movie->getFPS();
    53 
    54   int start_frame = atoi(argv[2]);
    55 
    56   // print information about the media file
    57   movie->printMediaInformation();
     46  media_container = new MediaContainer(argv[1]);
    5847
    5948  testMat = new Material;
    60 
    61   seq = new TextureSequence();
    62 
    63   // get each fram individually
    64   //while(seq->addFrame(movie->getNextFrame()) != NULL);
    65   // get a list of frames
    66   movie->gotoFrame(start_frame);
    67   seq->addFrameList(movie->getFrameList());
    68 
    6949  testMat->setDiffuseMap("maps/radialTransparency.png");
    70 
    7150  obj = new PrimitiveModel(PRIM_PLANE, 10.0);
    7251
     
    7554  (new Light())->setAbsCoor(5.0, 10.0, 40.0);
    7655  (new Light())->setAbsCoor(-10, -20, -100);
     56
     57  fps = media_container->getFPS();
    7758}
    7859
     
    9677        case SDLK_9:
    9778          fps++;
    98           PRINTF(1)("fps: %f\n", fps);
     79          PRINTF(0)("fps: %0.2f\n", fps);
    9980          break;
    10081        // decrease fps
     
    10283          if(fps > 0)
    10384            fps--;
    104           PRINTF(1)("fps: %f\n", fps);
     85          PRINTF(0)("fps: %0.2f\n", fps);
    10586          break;
    10687        }
     
    11697    counter = fps * timer;
    11798
    118     if (counter > seq->getFrameCount())
     99    if (counter >= media_container->getFrameCount())
    119100    {
    120101      timer = 0;
    121102      counter = 0;
    122103    }
    123 
    124     seq->gotoFrame(counter);
    125104  }
    126105}
     
    129108{
    130109  testMat->select();
    131   glBindTexture(GL_TEXTURE_2D, seq->getTexture());
     110  glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
    132111  obj->draw();
    133112
     
    135114}
    136115
    137 
    138116void Framework::moduleHelp(void) const
    139117{
Note: See TracChangeset for help on using the changeset viewer.