media: Make MediaKeys ref-counted.

media/base/android/media_codec_player.h

 // Copyright 2015 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_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 139 matching lines @@
 //        |                                  |         |
 //        v                                  |         |
 //                                           |         |
 //  [  Stopping   ] -----------------------> |         |
 //                  StopDone                 --       --
 //                    w/pending seek:
 //                      demuxer.RequestSeek
 
 namespace media {
 
-class BrowserCdm;
 class MediaCodecAudioDecoder;
 class MediaCodecVideoDecoder;
 
 class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
                                       public DemuxerAndroidClient {
  public:
   // Typedefs for the notification callbacks
   typedef base::Callback<void(base::TimeDelta, const gfx::Size&)>
       MetadataChangedCallback;
 
@@ skipping 36 matching lines @@
   void SetVolume(double volume) override;
   int GetVideoWidth() override;
   int GetVideoHeight() override;
   base::TimeDelta GetCurrentTime() override;
   base::TimeDelta GetDuration() override;
   bool IsPlaying() override;
   bool CanPause() override;
   bool CanSeekForward() override;
   bool CanSeekBackward() override;
   bool IsPlayerReady() override;
-  void SetCdm(BrowserCdm* cdm) override;
+  void SetCdm(const scoped_refptr<MediaKeys>& cdm) override;
 
   // DemuxerAndroidClient implementation.
   void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override;
   void OnDemuxerDataAvailable(const DemuxerData& params) override;
   void OnDemuxerSeekDone(base::TimeDelta actual_browser_seek_time) override;
   void OnDemuxerDurationChanged(base::TimeDelta duration) override;
 
   // For testing only.
   void SetDecodersTimeCallbackForTests(DecodersTimeCallback cb);
   void SetCodecCreatedCallbackForTests(CodecCreatedCallback cb);
@@ skipping 65 matching lines @@
   void OnError();
   void OnStarvation(DemuxerStream::Type stream_type);
   void OnTimeIntervalUpdate(DemuxerStream::Type stream_type,
                             base::TimeDelta now_playing,
                             base::TimeDelta last_buffered,
                             bool postpone);
 
   // Callbacks from video decoder
   void OnVideoResolutionChanged(const gfx::Size& size);
 
-  // Callbacks from CDM
+  // Callbacks from MediaDrmBridge.
   void OnMediaCryptoReady(MediaDrmBridge::JavaObjectPtr media_crypto,
                           bool needs_protected_surface);
   void OnKeyAdded();
-  void OnCdmUnset();
 
   // Operations called from the state machine.
   void SetState(PlayerState new_state);
   void SetPendingStart(bool need_to_start);
   bool HasPendingStart() const;
   void SetPendingSeek(base::TimeDelta timestamp);
   base::TimeDelta GetPendingSeek() const;
   bool HasVideo() const;
   bool HasAudio() const;
   void SetDemuxerConfigs(const DemuxerConfigs& configs);
@@ skipping 70 matching lines @@
 
   // Configuration data for the manager, accessed on the UI thread.
   MediaMetadata metadata_cache_;
 
   // Cached current time, accessed on UI thread.
   base::TimeDelta current_time_cache_;
 
   // For testing only.
   DecodersTimeCallback decoders_time_cb_;
 
-  // DRM
+  // Holds a ref-count to the CDM to keep |media_crypto_| valid.
+  scoped_refptr<MediaKeys> cdm_;
+
   MediaDrmBridge::JavaObjectPtr media_crypto_;
 
-  MediaDrmBridge* drm_bridge_;
   int cdm_registration_id_;
 
   // The flag is set when the player receives the error from decoder that the
   // decoder needs a new decryption key. Cleared on starting the playback.
   bool key_is_required_;
 
   // The flag is set after the new encryption key is added to MediaDrm. Cleared
   // on starting the playback.
   bool key_is_added_;
 
   // Gathers and reports playback quality statistics to UMA.
   // Use pointer to enable replacement of this object for tests.
   scoped_ptr<MediaStatistics> media_stat_;
 
   base::WeakPtr<MediaCodecPlayer> media_weak_this_;
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaCodecPlayer> media_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecPlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_PLAYER_H_