diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:49:20 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 20:49:20 +0000 |
| commit | 8f5a9a5c300c46c7f54f6b9b89894e71f3bea324 (patch) | |
| tree | 3393ba4c924fd4e254df3fb66ffa0f551a2a4e43 /ppapi/thunk/interfaces_ppb_private.h | |
| parent | 2789ef864c34809072799238e0af41c5ea9783fb (diff) | |
| download | chromium_src-8f5a9a5c300c46c7f54f6b9b89894e71f3bea324.zip chromium_src-8f5a9a5c300c46c7f54f6b9b89894e71f3bea324.tar.gz chromium_src-8f5a9a5c300c46c7f54f6b9b89894e71f3bea324.tar.bz2 | |
Encrypted Media: Return and handle NeedMoreData correctly.
Also did some clean-up:
- Removed PP_DECRYPTEDFRAMEFORMAT_EMPTY.
- Returns kAborted for AudioDecoder::Reset().
- Added helper function to make return type conversion.
BUG=156425
TEST=media_unittests, clearkey CDM decrypt-and-decode with fake video decoder
Review URL: https://chromiumcodereview.appspot.com/11234019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk/interfaces_ppb_private.h')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h index 8e8b986..d6023b8 100644 --- a/ppapi/thunk/interfaces_ppb_private.h +++ b/ppapi/thunk/interfaces_ppb_private.h @@ -49,8 +49,8 @@ PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, PPB_BrowserFont_Trusted_1_0) PROXIED_IFACE(PPB_Instance, - PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_4, - PPB_ContentDecryptor_Private_0_4) + PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_5, + PPB_ContentDecryptor_Private_0_5) PROXIED_IFACE(PPB_Instance, PPB_CHARSET_TRUSTED_INTERFACE_1_0, PPB_CharSet_Trusted_1_0) PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, |