Changes to support CDM_7

ppapi/api/private/ppb_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>PPB_ContentDecryptor_Private</code>
  * interface. Note: This is a special interface, only to be used for Content
  * Decryption Modules, not normal plugins.
  */
 
 [generate_thunk]
 
 label Chrome {
-  M36 = 0.12
+  M41 = 0.13
 };
 
 /**
  * <code>PPB_ContentDecryptor_Private</code> structure contains the function
  * pointers the browser must implement to support plugins implementing the
  * <code>PPP_ContentDecryptor_Private</code> interface. This interface provides
  * browser side support for the Content Decryption Module (CDM) for Encrypted
  * Media Extensions: http://www.w3.org/TR/encrypted-media/
  */
 interface PPB_ContentDecryptor_Private {
@@ skipping 12 matching lines @@
    * @param[in] promise_id Identifies the promise that the CDM resolved.
    *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session's ID attribute.
    */
   void PromiseResolvedWithSession(
       [in] PP_Instance instance,
       [in] uint32_t promise_id,
       [in] PP_Var web_session_id);
 
-  /**
-   * A promise that returns a set of key IDs has been resolved by the CDM.
-   *
-   * @param[in] promise_id Identifies the promise that the CDM resolved.
-   *
-   * @param[in] key_ids A <code>PP_Var</code> of type
-   * <code>PP_VARTYPE_ARRAY</code> containing elements of type
-   * <code>PP_VARTYPE_ARRAYBUFFER</code> that are the session's usable key IDs.
-   */
-  void PromiseResolvedWithKeyIds(
-      [in] PP_Instance instance,
-      [in] uint32_t promise_id,
-      [in] PP_Var key_ids_array);
 
   /**
    * A promise has been rejected by the CDM due to an error.
    *
    * @param[in] promise_id Identifies the promise that the CDM rejected.
    *
    * @param[in] exception_code A <code>PP_CdmExceptionCode</code> containing
    * the exception code.
    *
    * @param[in] system_code A system error code.
@@ skipping 19 matching lines @@
    * Note that <code>SessionMessage()</code> can be used for purposes other than
    * responses to <code>CreateSession()</code> calls. See also the text
    * in the comment for <code>SessionReady()</code>, which describes a sequence
    * of <code>UpdateSession()</code> and <code>SessionMessage()</code> calls
    * required to prepare for decryption.
    *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the ID of a session for
    * which this message is intended.
    *
+   * @param[in] message_type A <code>PP_MessageType</code> containing the
+   * message type.
+   *
    * @param[in] message A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_ARRAY_BUFFER</code> that contains the message.
-   *
-   * @param[in] destination_url A <code>PP_Var</code> of type
-   * <code>PP_VARTYPE_STRING</code> containing the destination URL for the
-   * message.
    */
   void SessionMessage(
       [in] PP_Instance instance,
       [in] PP_Var web_session_id,
-      [in] PP_Var message,
-      [in] PP_Var destination_url);
+      [in] PP_MessageType message_type,
+      [in] PP_Var message);
 
   /**
    * The keys for a session have changed.
    *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the ID of the session that has
    * a change in keys.
    *
    * @param[in] has_additional_usable_key A <code>PP_Bool</code> indicating if
    * a new usable key has been added.
+   *
+   * @param[in] key_ids A <code>PP_Var</code> of type
+   * <code>PP_VARTYPE_ARRAY</code> containing elements of type
+   * <code>PP_VARTYPE_ARRAYBUFFER</code> that are the session's usable key IDs.

[ddorwin, 2014/12/17 01:01:15]

Update this line
Specifically, not just "usable" keys. And the type might be wrong too.

[jrummell, 2014/12/17 19:17:19]

Done.

    */
   void SessionKeysChange(
       [in] PP_Instance instance,
       [in] PP_Var web_session_id,
-      [in] PP_Bool has_additional_usable_key);
+      [in] PP_Bool has_additional_usable_key,
+      [in] PP_Var key_information_array);
 
   /**
    * The expiration time for a session has changed.
    *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the ID of the session that has
    * a new expiration time.
    *
    * @param[in] new_expiry_time A <code>PP_Time</code> indicating the new
    * expiry time of the session. The value is defined as the number of seconds
    * since the Epoch (00:00:00 UTC, January 1, 1970).
    */
   void SessionExpirationChange(
       [in] PP_Instance instance,
       [in] PP_Var web_session_id,
       [in] PP_Time new_expiry_time);
 
   /**

[ddorwin, 2014/12/17 01:01:15]

Wasn't SessionReady used for prefixed's keyadded event? If so, do we have
another way of triggering that event?

[jrummell, 2014/12/17 19:17:19]

Neither CDM_6 nor CDM_7 generate the ready event. Currently ready is generated
for the prefixed API when the update() promise is resolved
(https://code.google.com/p/chromium/codesearch#chromium/src/media/cdm/proxy_de...).

-   * The session is now ready to decrypt the media stream.
-   *
-   * Note: The above describes the most simple case. Depending on the key
-   * system, a series of <code>SessionMessage()</code> calls from the CDM will
-   * be sent to the browser, and then on to the web application. The web
-   * application must then provide more data to the CDM by directing the browser
-   * to pass the data to the CDM via calls to <code>UpdateSession()</code> on
-   * the <code>PPP_ContentDecryptor_Private</code> interface.
-   * The CDM must call <code>SessionReady()</code> when the sequence is
-   * completed, and, in response, the browser must notify the web application.
-   *
-   * @param[in] web_session_id A <code>PP_Var</code> of type
-   * <code>PP_VARTYPE_STRING</code> containing the session's ID attribute of
-   * the session that is now ready.
-   */
-  void SessionReady(
-      [in] PP_Instance instance,
-      [in] PP_Var web_session_id);
-
-  /**
    * The session has been closed as the result of a call to the
    * <code>ReleaseSession()</code> method on the
    * <code>PPP_ContentDecryptor_Private</code> interface, or due to other
    * factors as determined by the CDM.
    *
    * @param[in] web_session_id A <code>PP_Var</code> of type
    * <code>PP_VARTYPE_STRING</code> containing the session's ID attribute of
    * the session that is now closed.
    */
   void SessionClosed(
@@ skipping 152 matching lines @@
    *
    * @param[in] decrypted_sample_info A <code>PP_DecryptedSampleInfo</code> that
    * contains the tracking info and result code associated with the decrypted
    * samples.
    */
   void DeliverSamples(
       [in] PP_Instance instance,
       [in] PP_Resource audio_frames,
       [in] PP_DecryptedSampleInfo decrypted_sample_info);
 };