Add PlayerTracker and BrowserCdm interfaces.

media/base/android/media_source_player.h

 // Copyright (c) 2013 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_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 43 matching lines @@
   virtual void SetVolume(double volume) OVERRIDE;
   virtual int GetVideoWidth() OVERRIDE;
   virtual int GetVideoHeight() OVERRIDE;
   virtual base::TimeDelta GetCurrentTime() OVERRIDE;
   virtual base::TimeDelta GetDuration() OVERRIDE;
   virtual bool IsPlaying() OVERRIDE;
   virtual bool CanPause() OVERRIDE;
   virtual bool CanSeekForward() OVERRIDE;
   virtual bool CanSeekBackward() OVERRIDE;
   virtual bool IsPlayerReady() OVERRIDE;
-  virtual void SetCdm(MediaKeys* cdm) OVERRIDE;
-  virtual void OnKeyAdded() OVERRIDE;
+  virtual void SetCdm(BrowserCdm* cdm) OVERRIDE;
   virtual bool IsSurfaceInUse() const OVERRIDE;
 
   // DemuxerAndroidClient implementation.
   virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) OVERRIDE;
   virtual void OnDemuxerDataAvailable(const DemuxerData& params) OVERRIDE;
   virtual void OnDemuxerSeekDone(
       base::TimeDelta actual_browser_seek_time) OVERRIDE;
   virtual void OnDemuxerDurationChanged(base::TimeDelta duration) OVERRIDE;
 
  private:
@@ skipping 88 matching lines @@
 
   // Called when a MediaDecoderJob finishes prefetching data. Once all
   // MediaDecoderJobs have prefetched data, then this method updates
   // |start_time_ticks_| and |start_presentation_timestamp_| so that video can
   // resync with audio and starts decoding.
   void OnPrefetchDone();
 
   // Sets the demuxer configs for audio or video stream.
   void SetDemuxerConfigs(const DemuxerConfigs& configs, bool is_audio);
 
+  // Called when new decryption key becomes available.
+  void OnKeyAdded();
+
+  // Called when the CDM is destroyed.

[ddorwin, 2014/06/02 20:20:29]

update comment.

[xhwang, 2014/06/02 21:41:22]

Done.

+  void OnCdmUnset();
+
   // Test-only method to setup hook for the completion of the next decode cycle.
   // This callback state is cleared when it is next run.
   // Prevent usage creep by only calling this from the
   // ReleaseWithOnPrefetchDoneAlreadyPosted MediaSourcePlayerTest.
   void set_decode_callback_for_testing(const base::Closure& test_decode_cb) {
     decode_callback_for_testing_ = test_decode_cb;
   }
 
   // TODO(qinmin/wolenetz): Reorder these based on their priority from
   // ProcessPendingEvents(). Release() and other routines are dependent upon
@@ skipping 82 matching lines @@
   // Track the most recent preroll target. Decoder re-creation needs this to
   // resume any in-progress preroll.
   base::TimeDelta preroll_timestamp_;
 
   // A cancelable task that is posted when the audio decoder starts requesting
   // new data. This callback runs if no data arrives before the timeout period
   // elapses.
   base::CancelableClosure decoder_starvation_callback_;
 
   MediaDrmBridge* drm_bridge_;
+  int cdm_registration_id_;
 
   // No decryption key available to decrypt the encrypted buffer. In this case,
   // the player should pause. When a new key is added (OnKeyAdded()), we should
   // try to start playback again.
   bool is_waiting_for_key_;
 
   // Test-only callback for hooking the completion of the next decode cycle.
   base::Closure decode_callback_for_testing_;
 
   // Whether |surface_| is currently used by the player.
   bool is_surface_in_use_;
 
   // Whether there are pending data requests by the decoder.
   bool has_pending_audio_data_request_;
   bool has_pending_video_data_request_;
 
   // Weak pointer passed to media decoder jobs for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
+  base::WeakPtr<MediaSourcePlayer> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_