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

media/filters/decoder_stream.h

 // Copyright 2014 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_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 70 matching lines @@
   // it is stopped. This method can be called at any time but not during another
   // pending Stop().
   void Stop(const base::Closure& closure);
 
   // Returns true if the decoder currently has the ability to decode and return
   // an Output.
   // TODO(rileya): Remove the need for this by refactoring Decoder queueing
   // behavior.
   bool CanReadWithoutStalling() const;
 
-  // Returns maximum concurrent decode requests for the current |decoder_|.
-  int GetMaxDecodeRequests() const;
-
   // Returns true if one more decode request can be submitted to the decoder.
   bool CanDecodeMore() const;
 
   // Allows callers to register for notification of splice buffers from the
   // demuxer.  I.e., DecoderBuffer::splice_timestamp() is not kNoTimestamp().
   //
   // The observer will be notified of all buffers with a splice_timestamp() and
   // the first buffer after which has a splice_timestamp() of kNoTimestamp().
   typedef base::Callback<void(base::TimeDelta)> SpliceObserverCB;
   void set_splice_observer(const SpliceObserverCB& splice_observer) {
@@ skipping 33 matching lines @@
                    const scoped_refptr<Output>& output);
 
   // Decodes |buffer| and returns the result via OnDecodeOutputReady().
   void Decode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Flushes the decoder with an EOS buffer to retrieve internally buffered
   // decoder output.
   void FlushDecoder();
 
   // Callback for Decoder::Decode().
-  void OnDecodeDone(int buffer_size, bool end_of_stream, DecoderStatus status);
-
-  // Output callback passed to Decoder::Initialize().
-  void OnDecodeOutputReady(const scoped_refptr<Output>& output);
+  void OnDecodeOutputReady(int buffer_size,
+                           DecoderStatus status,
+                           const scoped_refptr<Output>& output);
 
   // Reads a buffer from |stream_| and returns the result via OnBufferReady().
   void ReadFromDemuxerStream();
 
   // Callback for DemuxerStream::Read().
   void OnBufferReady(DemuxerStream::Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
 
   void ReinitializeDecoder();
 
@@ skipping 44 matching lines @@
 
   // This is required so the VideoFrameStream can access private members in
   // FinishInitialization() and ReportStatistics().
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderStream);
 };
 
 template <>
 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
 
 template <>
-int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
+bool DecoderStream<DemuxerStream::AUDIO>::CanDecodeMore() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_