media: Add MediaDrmBridgeCdmContext.

content/common/gpu/media/android_video_decode_accelerator.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 CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/avda_state_provider.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "media/base/android/media_drm_bridge.h"
+#include "media/base/android/media_drm_bridge_cdm_context.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/base/media_keys.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 namespace gfx {
 class SurfaceTexture;
 }
 
 namespace content {
@@ skipping 142 matching lines @@
   bool DequeueOutput();
 
   // Requests picture buffers from the client.
   void RequestPictureBuffers();
 
   // Decode the content in the |bitstream_buffer|. Note that a
   // |bitstream_buffer| of id as -1 indicates a flush command.
   void DecodeBuffer(const media::BitstreamBuffer& bitstream_buffer);
 
   // This callback is called after CDM obtained a MediaCrypto object.
-  void OnMediaCryptoReady(media::MediaDrmBridge::JavaObjectPtr media_crypto,
-                          bool needs_protected_surface);
+  void OnMediaCryptoReady(
+      media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto,
+      bool needs_protected_surface);
 
   // This callback is called when a new key is added to CDM.
   void OnKeyAdded();
 
   // Notifies the client of the CDM setting result.
   void NotifyCdmAttached(bool success);
 
   // Notifies the client about the availability of a picture.
   void NotifyPictureReady(const media::Picture& picture);
 
@@ skipping 106 matching lines @@
 
   // Helper class that manages asynchronous OnFrameAvailable callbacks.
   class OnFrameAvailableHandler;
   scoped_refptr<OnFrameAvailableHandler> on_frame_available_handler_;
 
   // Time at which we last did useful work on io_timer_.
   base::TimeTicks most_recent_work_;
 
   // CDM related stuff.
 
-  // Holds a ref-count to the CDM.
-  scoped_refptr<media::MediaKeys> cdm_;
+  // Holds a ref-count to the CDM to avoid using the CDM after it's destroyed.
+  scoped_refptr<media::MediaKeys> cdm_for_reference_holding_only_;
+
+  media::MediaDrmBridgeCdmContext* media_drm_bridge_cdm_context_;
 
   // MediaDrmBridge requires registration/unregistration of the player, this
   // registration id is used for this.
   int cdm_registration_id_;
 
   // The MediaCrypto object is used in the MediaCodec.configure() in case of
   // an encrypted stream.
-  media::MediaDrmBridge::JavaObjectPtr media_crypto_;
+  media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto_;
 
   // Index of the dequeued and filled buffer that we keep trying to enqueue.
   // Such buffer appears in MEDIA_CODEC_NO_KEY processing.
   int pending_input_buf_index_;
 
   // Monotonically increasing value that is used to prevent old, delayed errors
   // from being sent after a reset.
   int error_sequence_token_;
 
   // PostError will defer sending an error if and only if this is true.
   bool defer_errors_;
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_