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

media/filters/fake_video_decoder.h

 // Copyright 2013 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_FAKE_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
 
 #include <list>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class FakeVideoDecoder : public VideoDecoder {
  public:
   // Constructs an object with a decoding delay of |decoding_delay| frames.
   FakeVideoDecoder(int decoding_delay,
+                   bool supports_get_decode_output,
                    int max_parallel_decoding_requests);
   virtual ~FakeVideoDecoder();
 
   // VideoDecoder implementation.
   virtual void Initialize(const VideoDecoderConfig& config,
                           bool low_delay,
-                          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 void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop() OVERRIDE;
+  virtual scoped_refptr<VideoFrame> GetDecodeOutput() OVERRIDE;
   virtual int GetMaxDecodeRequests() const OVERRIDE;
 
   // Holds the next init/decode/reset callback from firing.
   void HoldNextInit();
   void HoldDecode();
   void HoldNextReset();
 
   // Satisfies the pending init/decode/reset callback, which must be ready to
   // fire when these methods are called.
   void SatisfyInit();
@@ skipping 11 matching lines @@
   enum State {
     STATE_UNINITIALIZED,
     STATE_NORMAL,
     STATE_END_OF_STREAM,
     STATE_ERROR,
   };
 
   // Callback for updating |total_bytes_decoded_|.
   void OnFrameDecoded(int buffer_size,
                       const DecodeCB& decode_cb,
-                      Status status);
+                      Status status,
+                      const scoped_refptr<VideoFrame>& video_frame);
 
   // Runs |decode_cb| or puts it to |held_decode_callbacks_| depending on
   // current value of |hold_decode_|.
   void RunOrHoldDecode(const DecodeCB& decode_cb);
 
   // Runs |decode_cb| with a frame from |decoded_frames_|.
   void RunDecodeCallback(const DecodeCB& decode_cb);
 
   void DoReset();
 
   base::ThreadChecker thread_checker_;
 
   const size_t decoding_delay_;
+  const bool supports_get_decode_output_;
   const int max_parallel_decoding_requests_;
 
   State state_;
 
   CallbackHolder<PipelineStatusCB> init_cb_;
   CallbackHolder<base::Closure> reset_cb_;
 
-  OutputCB output_cb_;
-
   bool hold_decode_;
   std::list<DecodeCB> held_decode_callbacks_;
 
   VideoDecoderConfig current_config_;
 
   std::list<scoped_refptr<VideoFrame> > decoded_frames_;
 
   int total_bytes_decoded_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FakeVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_