Add DecryptingDemuxerStream.

media/filters/decrypting_audio_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_DECRYPTING_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder.h"
@@ skipping 50 matching lines @@
   virtual int samples_per_second() OVERRIDE;
 
  protected:
   virtual ~DecryptingAudioDecoder();
 
  private:
   // For a detailed state diagram please see this link: http://goo.gl/8jAok
   // TODO(xhwang): Add a ASCII state diagram in this file after this class
   // stabilizes.
   // TODO(xhwang): Update this diagram for DecryptingAudioDecoder.
-  enum DecoderState {
+  enum State {
     kUninitialized = 0,
     kDecryptorRequested,
     kPendingDecoderInit,
     kIdle,
     kPendingDemuxerRead,
     kPendingDecode,
     kWaitingForKey,
     kDecodeFinished,
   };
 
@@ skipping 27 matching lines @@
   // Callback for Decryptor::DecryptAndDecodeAudio().
   void DeliverFrame(int buffer_size,
                     Decryptor::Status status,
                     const Decryptor::AudioBuffers& frames);
 
   // Carries out the frame delivery operation scheduled by DeliverFrame().
   void DoDeliverFrame(int buffer_size,
                       Decryptor::Status status,
                       const Decryptor::AudioBuffers& frames);
 
-  // Callback for the |decryptor_| to notify the DecryptingAudioDecoder that
-  // a new key has been added.
+  // Callback for the |decryptor_| to notify this object that a new key has been
+  // added.
   void OnKeyAdded();
 
   // Resets decoder and calls |reset_cb_|.
   void DoReset();
 
   // Sets timestamp and duration for |queued_audio_frames_| to make sure the
   // renderer always receives continuous frames without gaps and overlaps.
   void EnqueueFrames(const Decryptor::AudioBuffers& frames);
 
   // Converts number of samples to duration.
   base::TimeDelta NumberOfSamplesToDuration(int number_of_samples) const;
 
   // This is !is_null() iff Initialize() hasn't been called.
   MessageLoopFactoryCB message_loop_factory_cb_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
-  // Current state of the DecryptingAudioDecoder.
-  DecoderState state_;
+  State state_;
 
   PipelineStatusCB init_cb_;
   StatisticsCB statistics_cb_;
   ReadCB read_cb_;
   base::Closure reset_cb_;
 
   // Pointer to the demuxer stream that will feed us compressed buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   // Callback to request/cancel decryptor creation notification.
   RequestDecryptorNotificationCB request_decryptor_notification_cb_;
 
   Decryptor* decryptor_;
 
   // The buffer returned by the demuxer that needs decrypting/decoding.
   scoped_refptr<media::DecoderBuffer> pending_buffer_to_decode_;
 
   // Indicates the situation where new key is added during pending decode
   // (in other words, this variable can only be set in state kPendingDecode).
   // If this variable is true and kNoKey is returned then we need to try
   // decrypting/decoding again in case the newly added key is the correct
   // decryption key.
-  bool key_added_while_pending_decode_;
+  bool key_added_while_decode_pending_;
 
   Decryptor::AudioBuffers queued_audio_frames_;
 
   // Decoded audio format.
   int bits_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
 
   int bytes_per_sample_;
 
   base::TimeDelta output_timestamp_base_;
   int total_samples_decoded_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_