Update FFmpegAudioDecoder to support multi-frame packets.

media/filters/ffmpeg_audio_decoder.h

Index: media/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index 8e67f59c72c2dff6aec55b82d50f68f6d6517110..d199309de368fbf56e57eae7e1826554819f88fb 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -6,6 +6,7 @@
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
+#include <vector>
 
 #include "base/callback.h"
 #include "media/base/audio_decoder.h"
@@ -22,6 +23,7 @@ namespace media {
 
 class DataBuffer;
 class DecoderBuffer;
+struct QueuedAudioBuffer;
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
@@ -92,6 +94,10 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
 
   ReadCB read_cb_;
 
+  // Since multiple frames may be decoded from the same packet we need to queue
+  // them up and hand them out as we receive Read() calls.
+  std::vector<QueuedAudioBuffer> queued_audio_;

[acolwell GONE FROM CHROMIUM, 2012/08/28 14:40:49]

use a std::list here so popping from the front doesn't require copying all the
elements to shift them.

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

Oh no, I'm in CS 101 all over again. /hangs head in shame.

+
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };