OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/webm/webm_stream_parser.h" | 5 #include "media/webm/webm_stream_parser.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 return -1; | 312 return -1; |
313 } | 313 } |
314 | 314 |
315 if (cluster_ended) | 315 if (cluster_ended) |
316 end_of_segment_cb_.Run(); | 316 end_of_segment_cb_.Run(); |
317 | 317 |
318 return bytes_parsed; | 318 return bytes_parsed; |
319 } | 319 } |
320 | 320 |
321 void WebMStreamParser::FireNeedKey(const std::string& key_id) { | 321 void WebMStreamParser::FireNeedKey(const std::string& key_id) { |
322 int key_id_size = key_id.size(); | 322 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); |
323 DCHECK_GT(key_id_size, 0); | 323 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); |
324 scoped_ptr<uint8[]> key_id_array(new uint8[key_id_size]); | |
325 memcpy(key_id_array.get(), key_id.data(), key_id_size); | |
326 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array.Pass(), key_id_size); | |
327 } | 324 } |
328 | 325 |
329 } // namespace media | 326 } // namespace media |
OLD | NEW |