Update FFmpegAudioDecoder to support multi-frame packets.

media/filters/audio_file_reader.cc

 // 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/base/audio_bus.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace media {
 
 AudioFileReader::AudioFileReader(FFmpegURLProtocol* protocol)
     : protocol_(protocol),
       format_context_(NULL),
-      codec_context_(NULL) {
+      codec_context_(NULL),
+      stream_index_(0) {
 }
 
 AudioFileReader::~AudioFileReader() {
   Close();
 }
 
 int AudioFileReader::channels() const {
   return codec_context_->channels;
 }
 
@@ skipping 33 matching lines @@
 
   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;
+      stream_index_ = i;
       break;
     }
   }
 
   // Get the codec.
   if (!codec_context_)
     return false;
 
   avformat_find_stream_info(format_context_, NULL);
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
@@ skipping 33 matching lines @@
   if (audio_bus->channels() != channels)
     return false;
 
   size_t bytes_per_sample = av_get_bytes_per_sample(codec_context_->sample_fmt);
 
   // Holds decoded audio.
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame(avcodec_alloc_frame());
 
   // Read until we hit EOF or we've read the requested number of frames.
   AVPacket packet;
-  int result = 0;
   int current_frame = 0;
+  bool continue_decoding = true;
 
-  while (current_frame < audio_bus->frames() &&
-         (result = av_read_frame(format_context_, &packet)) >= 0) {
-    avcodec_get_frame_defaults(av_frame.get());
-    int frame_decoded = 0;
-    int result = avcodec_decode_audio4(
-        codec_context_, av_frame.get(), &frame_decoded, &packet);
-    av_free_packet(&packet);
-
-    if (result < 0) {
-      DLOG(WARNING)
-          << "AudioFileReader::Read() : error in avcodec_decode_audio3() -"
-          << result;
-      break;
+  while (current_frame < audio_bus->frames() && continue_decoding &&
+         av_read_frame(format_context_, &packet) >= 0 &&
+         av_dup_packet(&packet) >= 0) {
+    // Skip packets from other streams.

[DaleCurtis, 2012/08/28 20:19:17]

Noticed this while testing, previously handing a container with multiple streams
to WebAudio would fail on the first packet not belonging to this decoder.

+    if (packet.stream_index != stream_index_) {
+      av_free_packet(&packet);
+      continue;
     }
 
-    if (!frame_decoded)
-      continue;
+    // Make a shallow copy of packet so we can slide packet.data as frames are
+    // decoded from the packet; otherwise av_free_packet() will corrupt memory.
+    AVPacket packet_temp = packet;
+    do {
+      avcodec_get_frame_defaults(av_frame.get());
+      int frame_decoded = 0;
+      int result = avcodec_decode_audio4(
+          codec_context_, av_frame.get(), &frame_decoded, &packet_temp);
 
-    // Determine the number of sample-frames we just decoded.  Check overflow.
-    int frames_read = av_frame->nb_samples;
-    if (frames_read < 0)
-      break;
+      if (result < 0) {
+        DLOG(WARNING)
+            << "AudioFileReader::Read() : error in avcodec_decode_audio4() -"
+            << result;
+        continue_decoding = false;
+        break;
+      }
 
-    // Truncate, if necessary, if the destination isn't big enough.
-    if (current_frame + frames_read > audio_bus->frames())
-      frames_read = audio_bus->frames() - current_frame;
+      // Update packet size and data pointer in case we need to call the decoder
+      // with the remaining bytes from this packet.
+      packet_temp.size -= result;
+      packet_temp.data += result;
 
-    // Deinterleave each channel and convert to 32bit floating-point
-    // with nominal range -1.0 -> +1.0.
-    audio_bus->FromInterleavedPartial(
-        av_frame->data[0], current_frame, frames_read, bytes_per_sample);
+      if (!frame_decoded)

[acolwell GONE FROM CHROMIUM, 2012/08/28 20:31:53]

Does there need to be a if (packet_temp.size == 0) break; here so that more
packets can be fetched?

[DaleCurtis, 2012/08/28 21:41:17]

I'm not sure I follow; this continue affects the inner loop so it should go to
the while (packet_temp.size() > 0) check below?

[acolwell GONE FROM CHROMIUM, 2012/08/28 21:45:04]

oh.. right..nevermind. I'm so used to 'continue' meaning go up to the top I
forgot about the while check below. :)

+        continue;
 
-    current_frame += frames_read;
+      // Determine the number of sample-frames we just decoded.  Check overflow.
+      int frames_read = av_frame->nb_samples;
+      if (frames_read < 0) {
+        continue_decoding = false;
+        break;
+      }
+
+      // Truncate, if necessary, if the destination isn't big enough.
+      if (current_frame + frames_read > audio_bus->frames())
+        frames_read = audio_bus->frames() - current_frame;
+
+      // Deinterleave each channel and convert to 32bit floating-point
+      // with nominal range -1.0 -> +1.0.
+      audio_bus->FromInterleavedPartial(
+          av_frame->data[0], current_frame, frames_read, bytes_per_sample);
+
+      current_frame += frames_read;
+    } while (packet_temp.size > 0);
+    av_free_packet(&packet);
   }
 
   // Zero any remaining frames.
   audio_bus->ZeroFramesPartial(
       current_frame, audio_bus->frames() - current_frame);
 
   // Fail if nothing has been decoded, otherwise return partial data.
   return current_frame > 0;
 }
 
 }  // namespace media