Add support for midstream audio configuration changes.

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 "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
   virtual ~DecryptingAudioDecoder();
 
   // AudioDecoder implementation.
   virtual void Initialize(const AudioDecoderConfig& config,
                           const PipelineStatusCB& status_cb) OVERRIDE;
   virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
                       const DecodeCB& decode_cb) OVERRIDE;
   virtual scoped_refptr<AudioBuffer> GetDecodeOutput() OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop(const base::Closure& closure) OVERRIDE;
-  virtual int bits_per_channel() OVERRIDE;
-  virtual ChannelLayout channel_layout() OVERRIDE;
-  virtual int samples_per_second() OVERRIDE;
 
  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 State {
     kUninitialized = 0,
     kDecryptorRequested,
     kPendingDecoderInit,
@@ skipping 17 matching lines @@
                     Decryptor::Status status,
                     const Decryptor::AudioBuffers& frames);
 
   // 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();
 
-  // Updates audio configs from |demuxer_stream_| and resets
-  // |output_timestamp_base_| and |total_samples_decoded_|.
-  void UpdateDecoderConfig();
-
   // 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);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   State state_;
 
   PipelineStatusCB init_cb_;
   DecodeCB decode_cb_;
@@ skipping 13 matching lines @@
 
   // 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_decode_pending_;
 
   Decryptor::AudioBuffers queued_audio_frames_;
 
-  // Decoded audio format.
-  int bits_per_channel_;
-  ChannelLayout channel_layout_;
-  int samples_per_second_;
-
   scoped_ptr<AudioTimestampHelper> timestamp_helper_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecryptingAudioDecoder> weak_factory_;
   base::WeakPtr<DecryptingAudioDecoder> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_