Hook up CDM calls in CdmWrapper.

ppapi/api/private/ppp_content_decryptor_private.idl

 /* 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.
  */
 
 /**
  * This file defines the <code>PPP_ContentDecryptor_Private</code>
  * interface. Note: This is a special interface, only to be used for Content
- * Decryption Modules, not normal plugins.
+ * Decryption Modules (CDM), not normal plugins.

[Tom Finegan, 2012/08/22 16:54:31]

The acronym definition was moved down to the block below because a singular
acronym looked weird next to the plural phrase.

[ddorwin, 2012/08/22 18:25:54]

Tom removed this because of the plural - singular mismatch and just left it
below at 19. You can try to fix it another way.

[xhwang, 2012/08/24 22:01:59]

I didn't notice the one on line 19. No need to add one here then.

  */
 label Chrome {
   M23 = 0.1
 };
 
 /**
  * <code>PPP_ContentDecryptor_Private</code> structure contains the function
  * pointers the decryption plugin must implement to provide services needed by
  * the browser. This interface provides the plugin side support for the Content
  * Decryption Module (CDM) for v0.1 of the proposed Encrypted Media Extensions:
  * http://goo.gl/rbdnR
  */
 interface PPP_ContentDecryptor_Private {
   /**
    * Generates a key request. key_system specifies the key or licensing system
    * to use. init_data is a data buffer containing data for use in generating
    * the request.
    *
    * Note: <code>GenerateKeyRequest()</code> must create the session ID used in
    * other methods on this interface. The session ID must be provided to the
    * browser by the CDM via <code>KeyMessage()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface.
    *
    * @param[in] key_system A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the name of the key system.
    *
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call can be forwarded to the CDM

[ddorwin, 2012/08/22 18:25:54]

s/can be/was/

[xhwang, 2012/08/24 22:01:59]

Done.

+   * successfully. <code>PP_TRUE</code> otherwise. Once the call reaches the

[Tom Finegan, 2012/08/22 16:54:31]

I think you meant PP_FALSE here. :)

Also, sentences; 

Returns <code>PP_FALSE</code> otherwise.

Still a fragment, but makes sense contextually.

[ddorwin, 2012/08/22 18:25:54]

PP_FALSE

[xhwang, 2012/08/24 22:01:59]

Done.

+   * CDM, the call result/stuatus can always be reported asynchronously through

[Tom Finegan, 2012/08/22 16:54:31]

s/stuatus/status/
s/can always be/is/

Ditto for repeated blocks.

[ddorwin, 2012/08/22 18:25:54]

s/can always be/should be/ ?

[xhwang, 2012/08/24 22:01:59]

Done.

[xhwang, 2012/08/24 22:01:59]

Done.

+   * the <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool GenerateKeyRequest(
       [in] PP_Instance instance,
       [in] PP_Var key_system,
       [in] PP_Var init_data);
 
   /**
    * Provides a key or license to the decryptor for decrypting media data.
    *
    * When the CDM needs more information to complete addition of the key it
    * will call <code>KeyMessage()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface, which the browser
    * passes to the application. When the key is ready to use, the CDM
    * must call call <code>KeyAdded()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface, and the browser
    * must notify the web application.
    *
    * @param[in] session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session ID.
    *
    * @param[in] key A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing the decryption key, license,
    * or other message for the given session ID.
    *
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
+   *
+   * @return <code>PP_TRUE</code> if this call can be forwarded to the CDM
+   * successfully. <code>PP_TRUE</code> otherwise. Once the call reaches the
+   * CDM, the call result/stuatus can always be reported asynchronously through

[dmichael (off chromium), 2012/08/23 18:11:29]

Here and elsewhere...  can we omit asynchronously? It's not totally clear what
that means to someone writing the PPP side. In reality, I think the PPB call
will ensure that it happens asynchronously, even if it is called immediately
from within the corresponding PPP call.

[xhwang, 2012/08/24 22:01:59]

Done.

+   * the <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool AddKey(
       [in] PP_Instance instance,
       [in] PP_Var session_id,
       [in] PP_Var key,
       [in] PP_Var init_data);
 
   /**
    * Cancels a pending key request for the specified session ID.
    *
    * @param[in] session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session ID.
+   *
+   * @return <code>PP_TRUE</code> if this call can be forwarded to the CDM
+   * successfully. <code>PP_TRUE</code> otherwise. Once the call reaches the
+   * CDM, the call result/stuatus can always be reported asynchronously through
+   * the <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool CancelKeyRequest(
       [in] PP_Instance instance,
       [in] PP_Var session_id);
 
   /**
    * Decrypts the block and returns the unencrypted block via
    * <code>DeliverBlock()</code> on the
    * <code>PPB_ContentDecryptor_Private</code> interface. The returned block
    * contains encoded data.
    *
    * @param[in] resource A <code>PP_Resource</code> corresponding to a
    * <code>PPB_Buffer_Dev</code> resource that contains an encrypted data
    * block.
    *
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call can be forwarded to the CDM
+   * successfully. <code>PP_TRUE</code> otherwise. Once the call reaches the
+   * CDM, the call result/stuatus can always be reported asynchronously through
+   * the <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool Decrypt(
       [in] PP_Instance instance,
       [in] PP_Resource encrypted_block,
       [in] PP_EncryptedBlockInfo encrypted_block_info);
 
   /**
    * Decrypts the block, decodes it, and returns the unencrypted uncompressed
    * (decoded) media to the browser via the
    * <code>PPB_ContentDecryptor_Private</code> interface.
    *
    * Decrypted and decoded video frames are sent to <code>DeliverFrame()</code>,
    * and decrypted and decoded audio samples are sent to
    * <code>DeliverSamples()</code>.
    *
    * @param[in] resource A <code>PP_Resource</code> corresponding to a
    * <code>PPB_Buffer_Dev</code> resource that contains an encrypted data
    * block.
    *
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
+   *
+   * @return <code>PP_TRUE</code> if this call can be forwarded to the CDM
+   * successfully. <code>PP_TRUE</code> otherwise. Once the call reaches the
+   * CDM, the call result/stuatus can always be reported asynchronously through
+   * the <code>PPB_ContentDecryptor_Private</code> interface.
    */
   PP_Bool DecryptAndDecode(
       [in] PP_Instance instance,
       [in] PP_Resource encrypted_block,
       [in] PP_EncryptedBlockInfo encrypted_block_info);
 };