diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 07:03:09 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 07:03:09 +0000 |
| commit | 23de8745d5ed47d7ebcd517ef1df56839df41adf (patch) | |
| tree | de5f67f0b48304752d53035697cadff0b4bab4bf /webkit/media/crypto/ppapi/clear_key_cdm.cc | |
| parent | b46b8e605ea31dd78b656e5d1108cfa683bb63d2 (diff) | |
| download | chromium_src-23de8745d5ed47d7ebcd517ef1df56839df41adf.zip chromium_src-23de8745d5ed47d7ebcd517ef1df56839df41adf.tar.gz chromium_src-23de8745d5ed47d7ebcd517ef1df56839df41adf.tar.bz2 | |
Add decoder de-initialization and reset to the Pepper CDM API.
Adds pepper type PP_StreamType for identifying type of decoder.
BUG=141780
TEST=
Review URL: https://chromiumcodereview.appspot.com/11028087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/crypto/ppapi/clear_key_cdm.cc')
| -rw-r--r-- | webkit/media/crypto/ppapi/clear_key_cdm.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 750814e..4f0eaef 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -239,19 +239,19 @@ cdm::Status ClearKeyCdm::InitializeVideoDecoder( return cdm::kSessionError; } -cdm::Status ClearKeyCdm::DecryptAndDecodeFrame( - const cdm::InputBuffer& encrypted_buffer, - cdm::VideoFrame* video_frame) { +void ClearKeyCdm::ResetDecoder(cdm::StreamType) { NOTIMPLEMENTED(); - return cdm::kDecryptError; } -void ClearKeyCdm::ResetVideoDecoder() { +void ClearKeyCdm::DeinitializeDecoder(cdm::StreamType) { NOTIMPLEMENTED(); } -void ClearKeyCdm::StopVideoDecoder() { +cdm::Status ClearKeyCdm::DecryptAndDecodeFrame( + const cdm::InputBuffer& encrypted_buffer, + cdm::VideoFrame* video_frame) { NOTIMPLEMENTED(); + return cdm::kDecryptError; } } // namespace webkit_media |