Update FFmpegAudioDecoder to support multi-frame packets.

media/filters/ffmpeg_audio_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
+#include <vector>
 
 #include "base/callback.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/demuxer_stream.h"
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 
 class DataBuffer;
 class DecoderBuffer;
+struct QueuedAudioBuffer;
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   typedef base::Callback<
       scoped_refptr<base::MessageLoopProxy>()> MessageLoopFactoryCB;
   explicit FFmpegAudioDecoder(
       const MessageLoopFactoryCB& message_loop_factory_cb);
 
   // AudioDecoder implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
@@ skipping 50 matching lines @@
 
   // Number of output sample bytes to drop before generating
   // output buffers.
   int output_bytes_to_drop_;
 
   // Holds decoded audio.
   AVFrame* av_frame_;
 
   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);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_