ffmpeg chromium glue

media/test/ffmpeg_tests/ffmpeg_tests.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Software qualification test for FFmpeg.  This test is used to certify that
 // software decoding quality and performance of FFmpeg meets a mimimum
 // standard.
 
 #include <iomanip>
 #include <iostream>
@@ skipping 112 matching lines @@
   // path bytes through verbatim.
 #if defined(OS_WIN)
   std::string string_path = WideToASCII(in_path.value());
 #else
   const std::string& string_path = in_path.value();
 #endif
   int result = av_open_input_file(&format_context, string_path.c_str(),
                                   NULL, 0, NULL);
   if (result < 0) {
     switch (result) {
-      case AVERROR_NOFMT:
+      case AVERROR(EINVAL):
         std::cerr << "Error: File format not supported "
                   << in_path.value() << std::endl;
         break;
       default:
         std::cerr << "Error: Could not open input for "
                   << in_path.value() << std::endl;
         break;
     }
     return 1;
   }
@@ skipping 15 matching lines @@
               << in_path.value() << std::endl;
     return 1;
   }
 
   // Find our target stream(s)
   int video_stream = -1;
   int audio_stream = -1;
   for (size_t i = 0; i < format_context->nb_streams; ++i) {
     AVCodecContext* codec_context = format_context->streams[i]->codec;
 
-    if (codec_context->codec_type == CODEC_TYPE_VIDEO && video_stream < 0) {
+    if (codec_context->codec_type == AVMEDIA_TYPE_VIDEO && video_stream < 0) {
 #if SHOW_VERBOSE
       *log_out << "V ";
 #endif
       video_stream = i;
     } else {
-      if (codec_context->codec_type == CODEC_TYPE_AUDIO && audio_stream < 0) {
+      if (codec_context->codec_type == AVMEDIA_TYPE_AUDIO && audio_stream < 0) {
 #if SHOW_VERBOSE
         *log_out << "A ";
 #endif
         audio_stream = i;
       } else {
 #if SHOW_VERBOSE
       *log_out << "  ";
 #endif
       }
     }
 
 #if SHOW_VERBOSE
     AVCodec* codec = avcodec_find_decoder(codec_context->codec_id);
-    if (!codec || (codec_context->codec_type == CODEC_TYPE_UNKNOWN)) {
+    if (!codec || (codec_context->codec_type == AVMEDIA_TYPE_UNKNOWN)) {
       *log_out << "Stream #" << i << ": Unknown" << std::endl;
     } else {
       // Print out stream information
       *log_out << "Stream #" << i << ": " << codec->name << " ("
                << codec->long_name << ")" << std::endl;
     }
 #endif
   }
   int target_stream = video_stream;
-  CodecType target_codec = CODEC_TYPE_VIDEO;
+  AVMediaType target_codec = AVMEDIA_TYPE_VIDEO;
   if (target_stream < 0) {
     target_stream = audio_stream;
-    target_codec = CODEC_TYPE_AUDIO;
+    target_codec = AVMEDIA_TYPE_AUDIO;
   }
 
   // Only continue if we found our target stream.
   if (target_stream < 0) {
     std::cerr << "Error: Could not find target stream "
               << target_stream << " for " << in_path.value() << std::endl;
     return 1;
   }
 
   // Prepare FFmpeg structures.
@@ skipping 12 matching lines @@
   if (codec_context->codec_id == CODEC_ID_THEORA) {
     std::cerr << "Warning: Disabling threads to avoid Theora bug "
               << in_path.value() << std::endl;
     video_threads = 1;
   }
 
   codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
   codec_context->error_recognition = FF_ER_CAREFUL;
 
   // Initialize threaded decode.
-  if (target_codec == CODEC_TYPE_VIDEO && video_threads > 0) {
-    if (avcodec_thread_init(codec_context, video_threads) < 0) {
-      std::cerr << "Warning: Could not initialize threading!\n"
-                << "Did you build with pthread/w32thread support?" << std::endl;
-    }
+  if (target_codec == AVMEDIA_TYPE_VIDEO && video_threads > 0) {
+    codec_context->thread_count = video_threads;
+    // avcodec_thread_init deprecated

[scherkus (not reviewing), 2011/06/29 17:00:36]

you can remove this comment

[ilja, 2011/06/29 21:40:05]

Done.

   }
 
   // Initialize our codec.
   if (avcodec_open(codec_context, codec) < 0) {
     std::cerr << "Error: Could not open codec "
               << codec_context->codec->name << " for "
               << in_path.value() << std::endl;
     return 1;
   }
 
@@ skipping 34 matching lines @@
         packet.stream_index = target_stream;
         packet.size = 0;
       } else {
         break;
       }
     }
 
     // Only decode packets from our target stream.
     if (packet.stream_index == target_stream) {
       int result = -1;
-      if (target_codec == CODEC_TYPE_AUDIO) {
+      if (target_codec == AVMEDIA_TYPE_AUDIO) {
         int size_out = AVCODEC_MAX_AUDIO_FRAME_SIZE;
 
         base::TimeTicks decode_start = base::TimeTicks::HighResNow();
         result = avcodec_decode_audio3(codec_context, samples.get(), &size_out,
                                        &packet);
         base::TimeDelta delta = base::TimeTicks::HighResNow() - decode_start;
 
         if (size_out) {
           decode_times.push_back(delta.InMillisecondsF());
           ++frames;
@@ skipping 11 matching lines @@
 
           const uint8* u8_samples =
               reinterpret_cast<const uint8*>(samples.get());
           if (hash_djb2) {
             hash_value = DJB2Hash(u8_samples, size_out, hash_value);
           }
           if (hash_md5) {
             MD5Update(&ctx, u8_samples, size_out);
           }
         }
-      } else if (target_codec == CODEC_TYPE_VIDEO) {
+      } else if (target_codec == AVMEDIA_TYPE_VIDEO) {
         int got_picture = 0;
 
         base::TimeTicks decode_start = base::TimeTicks::HighResNow();
         result = avcodec_decode_video2(codec_context, frame.get(),
                                        &got_picture, &packet);
         base::TimeDelta delta = base::TimeTicks::HighResNow() - decode_start;
 
         if (got_picture) {
           decode_times.push_back(delta.InMillisecondsF());
           ++frames;
@@ skipping 81 matching lines @@
   if (format_context)
     av_close_input_file(format_context);
 
   // Calculate the sum of times.  Note that some of these may be zero.
   double sum = 0;
   for (size_t i = 0; i < decode_times.size(); ++i) {
     sum += decode_times[i];
   }
 
   if (sum > 0) {
-    if (target_codec == CODEC_TYPE_AUDIO) {
+    if (target_codec == AVMEDIA_TYPE_AUDIO) {
       // Calculate the average milliseconds per frame.
       // Audio decoding is usually in the millisecond or range, and
       // best expressed in time (ms) rather than FPS, which can approach
       // infinity.
       double ms = sum / frames;
       // Print our results.
       log_out->setf(std::ios::fixed);
       log_out->precision(2);
       *log_out << "TIME PER FRAME (MS):" << std::setw(11) << ms << std::endl;
-    } else if (target_codec == CODEC_TYPE_VIDEO) {
+    } else if (target_codec == AVMEDIA_TYPE_VIDEO) {
       // Calculate the average frames per second.
       // Video decoding is expressed in Frames Per Second - a term easily
       // understood and should exceed a typical target of 30 fps.
       double fps = frames * 1000.0 / sum;
       // Print our results.
       log_out->setf(std::ios::fixed);
       log_out->precision(2);
       *log_out << "FPS:" << std::setw(11) << fps << std::endl;
     }
   }
@@ skipping 46 matching lines @@
   } __except(EXCEPTION_EXECUTE_HANDLER) {
     *log_out << "  Exception:" << std::setw(11) << GetExceptionCode()
              << " " << in_path.value() << std::endl;
     return 1;
   }
 #endif
   CommandLine::Reset();
   return 0;
 }