Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

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 "base/callback.h"
@@ skipping 19 matching lines @@
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   FFmpegAudioDecoder(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       const LogCB& log_cb);
   virtual ~FFmpegAudioDecoder();
 
   // AudioDecoder implementation.
   virtual void Initialize(const AudioDecoderConfig& config,
-                          const PipelineStatusCB& status_cb,
-                          const OutputCB& output_cb) OVERRIDE;
+                          const PipelineStatusCB& status_cb) OVERRIDE;
   virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
                       const DecodeCB& decode_cb) OVERRIDE;
+  virtual scoped_refptr<AudioBuffer> GetDecodeOutput() OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop() OVERRIDE;
 
  private:
   enum DecoderState {
     kUninitialized,
     kNormal,
+    kFlushCodec,
     kDecodeFinished,
     kError
   };
 
   // Reset decoder and call |reset_cb_|.
   void DoReset();
 
   // Handles decoding an unencrypted encoded buffer.
   void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer,
                     const DecodeCB& decode_cb);
   bool FFmpegDecode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Handles (re-)initializing the decoder with a (new) config.
   // Returns true if initialization was successful.
   bool ConfigureDecoder();
 
   // Releases resources associated with |codec_context_| and |av_frame_|
   // and resets them to NULL.
   void ReleaseFFmpegResources();
   void ResetTimestampState();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  OutputCB output_cb_;
-
   DecoderState state_;
 
   // FFmpeg structures owned by this object.
   scoped_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
   scoped_ptr<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   AudioDecoderConfig config_;
 
   // AVSampleFormat initially requested; not Chrome's SampleFormat.
   int av_sample_format_;
 
   scoped_ptr<AudioDiscardHelper> discard_helper_;
 
+  // Since multiple frames may be decoded from the same packet we need to queue
+  // them up.
+  std::list<scoped_refptr<AudioBuffer> > queued_audio_;
+
   LogCB log_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_