Clean up media::DecryptingDemuxerStream.

media/filters/decrypting_demuxer_stream.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_DEMUXER_STREAM_H_
 #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
@@ skipping 38 matching lines @@
   // TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
   enum State {
     kUninitialized = 0,
     kDecryptorRequested,
     kIdle,
     kPendingDemuxerRead,
     kPendingDecrypt,
     kWaitingForKey,
   };
 
-  // Carries out the initialization operation scheduled by Initialize().
-  void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
-                    const PipelineStatusCB& status_cb);
-
   // Callback for DecryptorHost::RequestDecryptor().
   void SetDecryptor(Decryptor* decryptor);
 
   // Callback for DemuxerStream::Read().
   void DecryptBuffer(DemuxerStream::Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
 
-  // Carries out the buffer decryption operation scheduled by DecryptBuffer().
-  void DoDecryptBuffer(DemuxerStream::Status status,
-                       const scoped_refptr<DecoderBuffer>& buffer);
-
   void DecryptPendingBuffer();
 
   // Callback for Decryptor::Decrypt().
   void DeliverBuffer(Decryptor::Status status,
                      const scoped_refptr<DecoderBuffer>& decrypted_buffer);
 
-  // Carries out the frame delivery operation scheduled by DeliverBuffer().
-  void DoDeliverBuffer(Decryptor::Status status,
-                       const scoped_refptr<DecoderBuffer>& decrypted_buffer);
-
   // 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();
 
   // Returns Decryptor::StreamType converted from |stream_type_|.
   Decryptor::StreamType GetDecryptorStreamType() const;
 
-  // Sets |{audio|video}_config_| from |stream|.
-  void SetDecoderConfig(const scoped_refptr<DemuxerStream>& stream);
+  // Creates and initializes either |audio_config_| or |video_config_| based on
+  // |demuxer_stream_|.
+  void InitializeDecoderConfig();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   State state_;
 
   PipelineStatusCB init_cb_;
   ReadCB read_cb_;
   base::Closure reset_cb_;
 
   // Pointer to the input demuxer stream that will feed us encrypted buffers.
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
-  Type stream_type_;
   scoped_ptr<AudioDecoderConfig> audio_config_;
   scoped_ptr<VideoDecoderConfig> video_config_;
 
   // Callback to request/cancel decryptor creation notification.
   SetDecryptorReadyCB set_decryptor_ready_cb_;
 
   Decryptor* decryptor_;
 
   // The buffer returned by the demuxer that needs to be decrypted.
   scoped_refptr<media::DecoderBuffer> pending_buffer_to_decrypt_;
 
   // Indicates the situation where new key is added during pending decryption
   // (in other words, this variable can only be set in state kPendingDecrypt).
   // If this variable is true and kNoKey is returned then we need to try
   // decrypting again in case the newly added key is the correct decryption key.
   bool key_added_while_decrypt_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingDemuxerStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_