diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:02:25 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:02:25 +0000 |
| commit | 741c28f9db1521cb02c6b89fe2966f67f4329dff (patch) | |
| tree | f2374aebedd9c46a28d513b4b713a55d44f4a4e2 /webkit/media/crypto/ppapi/clear_key_cdm.cc | |
| parent | 4eb2f2630d82f0ebd859092a99c7e900dc9360f5 (diff) | |
| download | chromium_src-741c28f9db1521cb02c6b89fe2966f67f4329dff.zip chromium_src-741c28f9db1521cb02c6b89fe2966f67f4329dff.tar.gz chromium_src-741c28f9db1521cb02c6b89fe2966f67f4329dff.tar.bz2 | |
Update PluginInstance for decrypt-and-decode video.
- Hook up PpapiDecryptor and PluginInstance in terms of decrypt-and-decode calls.
- Enable empty input buffer and empty video frame to be passed to/from the plugin. This is used for end-of-stream buffer/frames.
- Add logs in DecryptingVideoDecoder.
BUG=141780,141784
TEST=Decrypt-and-decode of video is working with a fake video decoder in clearkey CDM.
Review URL: https://chromiumcodereview.appspot.com/11091005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162657 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 1fb0b62..af526c9 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -15,6 +15,7 @@ static const char kClearKeyCdmVersion[] = "0.1.0.0"; static scoped_refptr<media::DecoderBuffer> CopyDecoderBufferFrom( const cdm::InputBuffer& input_buffer) { + DCHECK(input_buffer.data); // TODO(tomfinegan): Get rid of this copy. scoped_refptr<media::DecoderBuffer> output_buffer = media::DecoderBuffer::CopyFrom(input_buffer.data, input_buffer.data_size); |