diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 07:23:13 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-27 07:23:13 +0000 |
| commit | c8d4028a56c2baf53a33f94656c72d68c83bf46a (patch) | |
| tree | feb8699122c3c6940ac3f67232d1b6b3747b8e5d /media/webm | |
| parent | cea1dd7e12a2aba1d1ef7015c4e0d0dd826466bc (diff) | |
| download | chromium_src-c8d4028a56c2baf53a33f94656c72d68c83bf46a.zip chromium_src-c8d4028a56c2baf53a33f94656c72d68c83bf46a.tar.gz chromium_src-c8d4028a56c2baf53a33f94656c72d68c83bf46a.tar.bz2 | |
Add "type" in GenerateKeyRequest() and OnNeedKey().
The "type" information could help the CDM to parse the initialization data correctly.
See for details: https://www.w3.org/Bugs/Public/show_bug.cgi?id=19096
TBR=viettrungluu@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11313016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
| -rw-r--r-- | media/webm/webm_stream_parser.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc index 2e34ed9..8cf0999 100644 --- a/media/webm/webm_stream_parser.cc +++ b/media/webm/webm_stream_parser.cc @@ -19,6 +19,9 @@ namespace media { +// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed. +static const char kWebMInitDataType[] = "video/webm"; + // Helper class that uses FFmpeg to create AudioDecoderConfig & // VideoDecoderConfig objects. // @@ -474,7 +477,7 @@ void WebMStreamParser::FireNeedKey(const std::string& key_id) { DCHECK_GT(key_id_size, 0); scoped_array<uint8> key_id_array(new uint8[key_id_size]); memcpy(key_id_array.get(), key_id.data(), key_id_size); - need_key_cb_.Run(key_id_array.Pass(), key_id_size); + need_key_cb_.Run(kWebMInitDataType, key_id_array.Pass(), key_id_size); } } // namespace media |