Encrypted Media: Support Audio Decrypt-Only.

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 13 matching lines @@
 // encrypted audio buffers and return decrypted and decompressed audio frames.
 // All public APIs and callbacks are trampolined to the |message_loop_| so
 // that no locks are required for thread safety.
 //
 // TODO(xhwang): For now, DecryptingAudioDecoder relies on the decryptor to do
 // both decryption and audio decoding. Add the path to use the decryptor for
 // decryption only and use other AudioDecoder implementations within
 // DecryptingAudioDecoder for audio decoding.
 class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
  public:
-  // Callback to notify decryptor creation.
-  typedef base::Callback<void(Decryptor*)> DecryptorNotificationCB;
-  // Callback to request/cancel decryptor creation notification.
-  // Calling this callback with a non-null callback registers decryptor creation
-  // notification. When the decryptor is created, notification will be sent
-  // through the provided callback.
-  // Calling this callback with a null callback cancels previously registered
-  // decryptor creation notification. Any previously provided callback will be
-  // fired immediately with NULL.
-  typedef base::Callback<void(const DecryptorNotificationCB&)>
-      RequestDecryptorNotificationCB;
-
   DecryptingAudioDecoder(
       const scoped_refptr<base::MessageLoopProxy>& message_loop,
-      const RequestDecryptorNotificationCB& request_decryptor_notification_cb);
+      const SetDecryptorReadyCB& set_decryptor_ready_cb);
 
   // AudioDecoder implementation.
   virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) OVERRIDE;
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual int bits_per_channel() OVERRIDE;
   virtual ChannelLayout channel_layout() OVERRIDE;
   virtual int samples_per_second() OVERRIDE;
@@ skipping 69 matching lines @@
 
   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_;
+  SetDecryptorReadyCB set_decryptor_ready_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
@@ skipping 11 matching lines @@
 
   base::TimeDelta output_timestamp_base_;
   int total_samples_decoded_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_