Changes to the EME Pepper API

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.
  */
 label Chrome {
-  M24 = 0.6
+  M31 = 0.7
 };
 
 /**
  * <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 {
   /**
+   * Initialize for the specified key system.
+   *
+   * @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] key_system_flags A <code>PP_KeySystemFlags</code> that
+   * contains additional information on <code>key_system</code>.

[ddorwin, 2013/09/18 21:26:53]

contains configuration information.

or something like that. It doesn't necessarily describe the key system.

[jrummell, 2013/09/19 00:37:28]

Done.

+   */
+  void Initialize(
+      [in] PP_Instance instance,
+      [in] PP_Var key_system,
+      [in] PP_KeySystemFlags key_system_flags);

[dmichael (off chromium), 2013/09/18 22:52:32]

Do you expect there to be a lot of these? I don't really see much benefit to
using a struct for this.

If you think they'll all be bools, you could use a bitfield, which would then at
least make it ABI compatible if you add more later.

[jrummell, 2013/09/19 00:37:28]

Switched to a bool.

+
+  /**
    * Generates a key request. key_system specifies the key or licensing system
    * to use. type contains the MIME type of init_data. 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] type A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the MIME type for init_data.
    *
    * @param[in] init_data A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAYBUFFER</code> containing container specific
    * initialization data.
    */
   void GenerateKeyRequest(
       [in] PP_Instance instance,
-      [in] PP_Var key_system,
       [in] PP_Var type,
       [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
@@ skipping 153 matching lines @@
    * @param[in] encrypted_block_info A <code>PP_EncryptedBlockInfo</code> that
    * contains all auxiliary information needed for decryption of the
    * <code>encrypted_block</code>.
    */
   void DecryptAndDecode(
       [in] PP_Instance instance,
       [in] PP_DecryptorStreamType decoder_type,
       [in] PP_Resource encrypted_buffer,
       [in] PP_EncryptedBlockInfo encrypted_block_info);
 };