Fix media code to work with new ffmpeg.

media/filters/audio_file_reader.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #include "media/filters/audio_file_reader.h"
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/audio/audio_util.h"
@@ skipping 32 matching lines @@
 }
 
 bool AudioFileReader::Open() {
   // Add our data reader to the protocol list and get our unique key.
   std::string key = FFmpegGlue::GetInstance()->AddProtocol(protocol_);
 
   // Open FFmpeg AVFormatContext.
   DCHECK(!format_context_);
   AVFormatContext* context = NULL;
 
-  int result = av_open_input_file(&context, key.c_str(), NULL, 0, NULL);
+  int result = avformat_open_input(&context, key.c_str(), NULL, NULL);
 
-  // Remove our data reader from protocol list since av_open_input_file() setup
+  // Remove our data reader from protocol list since avformat_open_input() setup
   // the AVFormatContext with the data reader.
   FFmpegGlue::GetInstance()->RemoveProtocol(protocol_);
 
   if (result) {
     DLOG(WARNING)
-        << "AudioFileReader::Open() : error in av_open_input_file() -"
+        << "AudioFileReader::Open() : error in avformat_open_input() -"
         << " result: " << result;
     return false;
   }
 
   DCHECK(context);
   format_context_ = context;
 
   // Get the codec context.
   codec_context_ = NULL;
   for (size_t i = 0; i < format_context_->nb_streams; ++i) {
     AVCodecContext* c = format_context_->streams[i]->codec;
     if (c->codec_type == AVMEDIA_TYPE_AUDIO) {
       codec_context_ = c;
       break;
     }
   }
 
   // Get the codec.
   if (!codec_context_)
     return false;
 
-  av_find_stream_info(format_context_);
+  avformat_find_stream_info(format_context_, NULL);
   codec_ = avcodec_find_decoder(codec_context_->codec_id);
   if (codec_) {
-    if ((result = avcodec_open(codec_context_, codec_)) < 0) {
+    if ((result = avcodec_open2(codec_context_, codec_, NULL)) < 0) {
       DLOG(WARNING) << "AudioFileReader::Open() : could not open codec -"
           << " result: " << result;
       return false;
     }
 
     if ((result = av_seek_frame(format_context_, 0, 0, 0)) < 0) {
       DLOG(WARNING) << "AudioFileReader::Open() : could not seek frame -"
           << " result: " << result;
       return false;
     }
   } else {
     DLOG(WARNING) << "AudioFileReader::Open() : could not find codec -"
         << " result: " << result;
     return false;
   }
 
   return true;
 }
 
 void AudioFileReader::Close() {
   if (codec_context_ && codec_)
     avcodec_close(codec_context_);
 
   codec_context_ = NULL;
   codec_ = NULL;
 
   if (format_context_) {
-    av_close_input_file(format_context_);
+    avformat_close_input(&format_context_);
     format_context_ = NULL;
   }
 }
 
 bool AudioFileReader::Read(const std::vector<float*>& audio_data,
                            size_t number_of_frames) {
   size_t channels = this->channels();
   DCHECK_EQ(audio_data.size(), channels);
   if (audio_data.size() != channels)
     return false;
@@ skipping 24 matching lines @@
 
     if (result < 0) {
       DLOG(WARNING)
           << "AudioFileReader::Read() : error in avcodec_decode_audio3() -"
           << result;
       return false;
     }
 
     // Determine the number of sample-frames we just decoded.
     size_t bytes_per_sample =
-        av_get_bits_per_sample_fmt(codec_context_->sample_fmt) >> 3;
+        av_get_bytes_per_sample(codec_context_->sample_fmt);
     size_t frames_read = out_size / (channels * bytes_per_sample);
 
     // Truncate, if necessary, if the destination isn't big enough.
     if (current_frame + frames_read > number_of_frames)
       frames_read = number_of_frames - current_frame;
 
     // Deinterleave each channel and convert to 32bit floating-point
     // with nominal range -1.0 -> +1.0.
     for (size_t channel_index = 0; channel_index < channels;
          ++channel_index) {
@@ skipping 11 matching lines @@
       }
     }
 
     current_frame += frames_read;
   }
 
   return true;
 }
 
 }  // namespace media