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

media/filters/vpx_video_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_VPX_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/video_decoder.h"
@@ skipping 16 matching lines @@
 // decoder is faster than the libvpx VP8 decoder.
 class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder {
  public:
   explicit VpxVideoDecoder(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
   virtual ~VpxVideoDecoder();
 
   // 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;
 
  private:
   enum DecoderState {
     kUninitialized,
     kNormal,
     kFlushCodec,
@@ skipping 12 matching lines @@
                  scoped_refptr<VideoFrame>* video_frame);
 
   void CopyVpxImageTo(const vpx_image* vpx_image,
                       const struct vpx_image* vpx_image_alpha,
                       scoped_refptr<VideoFrame>* video_frame);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DecoderState state_;
 
-  OutputCB output_cb_;
-
   // TODO(xhwang): Merge DecodeBuffer() into Decode() and remove this.
   DecodeCB decode_cb_;
 
   VideoDecoderConfig config_;
 
   vpx_codec_ctx* vpx_codec_;
   vpx_codec_ctx* vpx_codec_alpha_;
 
   // Memory pool used for VP9 decoding.
   class MemoryPool;
   scoped_refptr<MemoryPool> memory_pool_;
 
   VideoFramePool frame_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_