Changeset 7216 in orxonox.OLD for branches/std/src/world_entities/recorder.cc

Timestamp:

Mar 12, 2006, 8:54:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/std:: compile and run again, with many more std::strings….

File:

• branches/std/src/world_entities/recorder.cc (modified) (18 diffs)

branches/std/src/world_entities/recorder.cc

@@ -54 +54 @@
 
   LoadParam(root, "duration", this, Recorder, setStreamDuration);
+
   LoadParam(root, "fps", this, Recorder, setFPS);
+
   LoadParam(root, "name", this, Recorder, initVideo);
 }
@@ -71 +73 @@
 
 
-void Recorder::initVideo(const char* filename)
+void Recorder::initVideo(const std::string& filename)
 {
   frame_count = 0;
@@ -78 +80 @@
 
   // auto detect the output format from the name, default is mpeg
-  output_format = guess_format(NULL, filename, NULL);
+  output_format = guess_format(NULL, filename.c_str(), NULL);
   if (!output_format)
   {
@@ -93 +95 @@
 
   format_context->oformat = output_format;
-  snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename);
+  snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename.c_str());
 
   // add video stream using the default format codec and initialize the codec
@@ -104 +106 @@
 
   // print some information
-  dump_format(format_context, 0, filename, 1);
+  dump_format(format_context, 0, filename.c_str(), 1);
 
   // now that all the parameters are set, we can open the
@@ -110 +112 @@
   if(video_stream)
     this->openVideo();
-  
+
   // open the output file, if needed
   if(!(output_format->flags & AVFMT_NOFILE))
   {
-    if(url_fopen(&format_context->pb, filename, URL_WRONLY) < 0)
-      PRINTF(1)("Could not open %s\n", filename);
+    if(url_fopen(&format_context->pb, filename.c_str(), URL_WRONLY) < 0)
+      PRINTF(1)("Could not open %s\n", filename.c_str());
   }
 
   // write the stream header, if any
-  av_write_header(format_context); 
+  av_write_header(format_context);
 }
 
@@ -129 +131 @@
   av_free(buffer);
 
-  // write the trailer, if any 
+  // write the trailer, if any
   av_write_trailer(format_context);
-  
+
   // free the streams
   for(int i = 0; i < format_context->nb_streams; i++)
@@ -175 +177 @@
 
 void Recorder::allocPicture()
-{ 
+{
   picture = avcodec_alloc_frame();
   if(!picture)
@@ -189 +191 @@
       return;
   }
-  avpicture_fill((AVPicture *)picture, picture_buf, 
+  avpicture_fill((AVPicture *)picture, picture_buf,
                   codec_context->pix_fmt, width, height);
 
@@ -211 +213 @@
   if (!video_stream)
     PRINTF(1)("Could not alloc stream\n");
-  
+
   codec_context = video_stream->codec;
   codec_context->codec_id = output_format->video_codec;
@@ -219 +221 @@
   codec_context->bit_rate = 400000;
   // resolution must be a multiple of two
-  codec_context->width = State::getResX();  
+  codec_context->width = State::getResX();
   codec_context->height = State::getResY();
 
@@ -229 +231 @@
   // timebase should be 1/framerate and timestamp increments should be
   // identically 1
-  codec_context->time_base.den = (int)stream_frame_rate;  
+  codec_context->time_base.den = (int)stream_frame_rate;
   codec_context->time_base.num = 1;
   codec_context->gop_size = 12;  // emit one intra frame every twelve frames at most
@@ -235 +237 @@
 
   if (codec_context->codec_id == CODEC_ID_MPEG1VIDEO)
-      // needed to avoid using macroblocks in which some coeffs overflow 
-      // this doesnt happen with normal video, it just happens here as the 
+      // needed to avoid using macroblocks in which some coeffs overflow
+      // this doesnt happen with normal video, it just happens here as the
       // motion of the chroma plane doesnt match the luma plane
       codec_context->mb_decision=2;
@@ -275 +277 @@
 {
   int out_size, err;
-  
+
   codec_context = video_stream->codec;
-  
+
   if(frame_count >= stream_nb_frames)
   {
@@ -287 +289 @@
     this->fillYuvImage();
 
-  
+
   if(format_context->oformat->flags & AVFMT_RAWPICTURE)
   {
@@ -293 +295 @@
     // futur for that
     av_init_packet(&packet);
-    
+
     packet.flags |= PKT_FLAG_KEY;
     packet.stream_index= video_stream->index;
     packet.data= (uint8_t *)picture;
     packet.size= sizeof(AVPicture);
-    
+
     err = av_write_frame(format_context, &packet);
   }
@@ -309 +311 @@
     {
       av_init_packet(&packet);
-      
+
       packet.pts= av_rescale_q(codec_context->coded_frame->pts, codec_context->time_base, video_stream->time_base);
       if(codec_context->coded_frame->key_frame)
@@ -316 +318 @@
       packet.data= buffer;
       packet.size= out_size;
-      
+
       // write the compressed frame in the media file
       err = av_write_frame(format_context, &packet);