Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / filters / opus_audio_decoder.h

diff --git a/src/media/filters/opus_audio_decoder.h b/src/media/filters/opus_audio_decoder.h
index 2faaced..b69af92 100644 (file)
--- a/src/media/filters/opus_audio_decoder.h
+++ b/src/media/filters/opus_audio_decoder.h
@@ -6,7 +6,6 @@
 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
 
 #include "base/callback.h"
-#include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/demuxer_stream.h"
@@ -21,7 +20,7 @@ class SingleThreadTaskRunner;
 namespace media {
 
 class AudioBuffer;
-class AudioTimestampHelper;
+class AudioDiscardHelper;
 class DecoderBuffer;
 struct QueuedAudioBuffer;
 
@@ -32,24 +31,19 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder {
   virtual ~OpusAudioDecoder();
 
   // AudioDecoder implementation.
-  virtual void Initialize(DemuxerStream* stream,
+  virtual std::string GetDisplayName() const OVERRIDE;
+  virtual void Initialize(const AudioDecoderConfig& config,
                           const PipelineStatusCB& status_cb,
-                          const StatisticsCB& statistics_cb) OVERRIDE;
-  virtual void Read(const ReadCB& read_cb) OVERRIDE;
-  virtual int bits_per_channel() OVERRIDE;
-  virtual ChannelLayout channel_layout() OVERRIDE;
-  virtual int samples_per_second() OVERRIDE;
+                          const OutputCB& output_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(const base::Closure& closure) OVERRIDE;
 
  private:
-  void DoReset();
-  void DoStop();
-
   // Reads from the demuxer stream with corresponding callback method.
   void ReadFromDemuxerStream();
-  void BufferReady(DemuxerStream::Status status,
-                   const scoped_refptr<DecoderBuffer>& input);
+  void DecodeBuffer(const scoped_refptr<DecoderBuffer>& input,
+                    const DecodeCB& decode_cb);
 
   bool ConfigureDecoder();
   void CloseDecoder();
@@ -58,43 +52,16 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder {
               scoped_refptr<AudioBuffer>* output_buffer);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  base::WeakPtrFactory<OpusAudioDecoder> weak_factory_;
-  base::WeakPtr<OpusAudioDecoder> weak_this_;
 
-  DemuxerStream* demuxer_stream_;
-  StatisticsCB statistics_cb_;
+  AudioDecoderConfig config_;
+  OutputCB output_cb_;
   OpusMSDecoder* opus_decoder_;
 
-  // Decoded audio format.
-  ChannelLayout channel_layout_;
-  int samples_per_second_;
-  const SampleFormat sample_format_;
-  const int bits_per_channel_;
-
-  // Used for computing output timestamps.
-  scoped_ptr<AudioTimestampHelper> output_timestamp_helper_;
-  base::TimeDelta last_input_timestamp_;
-
-  ReadCB read_cb_;
-  base::Closure reset_cb_;
-  base::Closure stop_cb_;
-
-  // Number of frames to be discarded from the start of the packet. This value
-  // is respected for all packets except for the first one in the stream. For
-  // the first packet in the stream, |frame_delay_at_start_| is used. This is
-  // usually set to the SeekPreRoll value from the container whenever a seek
-  // happens.
-  int frames_to_discard_;
-
-  // Number of frames to be discarded at the start of the stream. This value
-  // is typically the CodecDelay value from the container.  This value should
-  // only be applied when input timestamp is |start_input_timestamp_|.
-  int frame_delay_at_start_;
+  // When the input timestamp is |start_input_timestamp_| the decoder needs to
+  // drop |config_.codec_delay()| frames.
   base::TimeDelta start_input_timestamp_;
 
-  // Timestamp to be subtracted from all the frames. This is typically computed
-  // from the CodecDelay value in the container.
-  base::TimeDelta timestamp_offset_;
+  scoped_ptr<AudioDiscardHelper> discard_helper_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);
 };