Configure MediaCodec with CDM in ADVA

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 <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_codec_bridge.h"
+#include "media/base/android/media_drm_bridge.h"
+#include "media/base/media_keys.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace gfx {
 class SurfaceTexture;
 }
 
 namespace content {
 
 // A VideoDecodeAccelerator implementation for Android.
 // This class decodes the input encoded stream by using Android's MediaCodec
@@ skipping 109 matching lines @@
   void QueueInput();
 
   // Dequeues output from |media_codec_| and feeds the decoded frame to the
   // client.  Returns a hint about whether calling again might produce
   // more output.
   bool DequeueOutput();
 
   // Requests picture buffers from the client.
   void RequestPictureBuffers();
 
+  // This callback is called after CDM obtained a MediaCrypto object.
+  void OnCdmMediaCryptoReady(media::MediaDrmBridge::JavaObjectPtr media_crypto,
+                             bool needs_protected_surface);
+
+  // This callback is called when a new key is added to CDM.
+  void OnCdmKeyAdded();

[xhwang, 2015/12/04 20:22:03]

OnKeyAdded() to be consistent with other places:

https://code.google.com/p/chromium/codesearch#search/&q=OnKeyAdded&sq=package...

[Tima Vaisburd, 2015/12/04 22:54:51]

Done.

+
   // 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);
 
   // Notifies the client that the input buffer identifed by input_buffer_id has
   // been processed.
   void NotifyEndOfBitstreamBuffer(int input_buffer_id);
 
@@ skipping 69 matching lines @@
 
   // Owner of the GL context. Used to restore the context state.
   base::WeakPtr<gpu::gles2::GLES2Decoder> gl_decoder_;
 
   // Repeating timer responsible for draining pending IO to the codec.
   base::RepeatingTimer io_timer_;
 
   // Backing strategy that we'll use to connect PictureBuffers to frames.
   scoped_ptr<BackingStrategy> strategy_;
 
+  // CDM related stuff.
+
+  // Holds a ref-count to the CDM.
+  scoped_refptr<media::MediaKeys> cdm_;
+
+  // 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_;
+
   // 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_