Reland r212023 "Rename VideoDecoder::ReadCB to VideoDecoder::DecodeCB."

media/filters/video_frame_stream.h

 // Copyright (c) 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_VIDEO_FRAME_STREAM_H_
 #define MEDIA_FILTERS_VIDEO_FRAME_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
 class DecryptingDemuxerStream;
 class VideoDecoderSelector;
 
 // Wraps a DemuxerStream and a list of VideoDecoders and provides decoded
 // VideoFrames to its client (e.g. VideoRendererBase).
 class MEDIA_EXPORT VideoFrameStream {
  public:
   // Indicates completion of VideoFrameStream initialization.
   typedef base::Callback<void(bool success, bool has_alpha)> InitCB;
 
+  enum Status {
+    OK,  // Everything went as planned.
+    ABORTED,  // Read aborted due to Reset() during pending read.
+    DEMUXER_READ_ABORTED,  // Demuxer returned aborted read.
+    DECODE_ERROR,  // Decoder returned decode error.
+    DECRYPT_ERROR  // Decoder returned decrypt error.
+  };
+
+  // Indicates completion of a VideoFrameStream read.
+  typedef base::Callback<void(Status, const scoped_refptr<VideoFrame>&)> ReadCB;
+
   VideoFrameStream(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                    ScopedVector<VideoDecoder> decoders,
                    const SetDecryptorReadyCB& set_decryptor_ready_cb);
   virtual ~VideoFrameStream();
 
   // Initializes the VideoFrameStream and returns the initialization result
   // through |init_cb|. Note that |init_cb| is always called asynchronously.
   void Initialize(DemuxerStream* stream,
                   const StatisticsCB& statistics_cb,
                   const InitCB& init_cb);
 
   // Reads a decoded VideoFrame and returns it via the |read_cb|. Note that
   // |read_cb| is always called asynchronously. This method should only be
   // called after initialization has succeeded and must not be called during
   // any pending Reset() and/or Stop().
-  void Read(const VideoDecoder::ReadCB& read_cb);
+  void Read(const ReadCB& read_cb);
 
   // Resets the decoder, flushes all decoded frames and/or internal buffers,
   // fires any existing pending read callback and calls |closure| on completion.
   // Note that |closure| is always called asynchronously. This method should
   // only be called after initialization has succeeded and must not be called
   // during any pending Reset() and/or Stop().
   void Reset(const base::Closure& closure);
 
   // Stops the decoder, fires any existing pending read callback or reset
   // callback and calls |closure| on completion. Note that |closure| is always
@@ skipping 19 matching lines @@
   };
 
   // Called when |decoder_selector| selected the |selected_decoder|.
   // |decrypting_demuxer_stream| was also populated if a DecryptingDemuxerStream
   // is created to help decrypt the encrypted stream.
   void OnDecoderSelected(
       scoped_ptr<VideoDecoder> selected_decoder,
       scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
 
   // Satisfy pending |read_cb_| with |status| and |frame|.
-  void SatisfyRead(VideoDecoder::Status status,
-                   const scoped_refptr<VideoFrame>& frame);
+  void SatisfyRead(Status status, const scoped_refptr<VideoFrame>& frame);
 
   // Abort pending |read_cb_|.
   void AbortRead();
 
   // Decodes |buffer| and returns the result via OnFrameReady().
   void Decode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Flushes the decoder with an EOS buffer to retrieve internally buffered
   // video frames.
   void FlushDecoder();
@@ skipping 23 matching lines @@
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WeakPtrFactory<VideoFrameStream> weak_factory_;
   base::WeakPtr<VideoFrameStream> weak_this_;
 
   State state_;
 
   StatisticsCB statistics_cb_;
   InitCB init_cb_;
 
-  VideoDecoder::ReadCB read_cb_;
+  ReadCB read_cb_;
   base::Closure reset_cb_;
   base::Closure stop_cb_;
 
   DemuxerStream* stream_;
 
   scoped_ptr<VideoDecoderSelector> decoder_selector_;
 
   // These two will be set by VideoDecoderSelector::SelectVideoDecoder().
   scoped_ptr<VideoDecoder> decoder_;
   scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoFrameStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_FRAME_STREAM_H_