| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/formats/webm/webm_stream_parser.h" | 5 #include "media/formats/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/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 if (cluster_ended) { | 270 if (cluster_ended) { |
| 271 ChangeState(kParsingHeaders); | 271 ChangeState(kParsingHeaders); |
| 272 end_of_segment_cb_.Run(); | 272 end_of_segment_cb_.Run(); |
| 273 } | 273 } |
| 274 | 274 |
| 275 return bytes_parsed; | 275 return bytes_parsed; |
| 276 } | 276 } |
| 277 | 277 |
| 278 void WebMStreamParser::FireNeedKey(const std::string& key_id) { | 278 void WebMStreamParser::FireNeedKey(const std::string& key_id) { |
| 279 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); | 279 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); |
| 280 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); | 280 need_key_cb_.Run(kWebMInitDataType, key_id_vector); |
| 281 } | 281 } |
| 282 | 282 |
| 283 } // namespace media | 283 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 610733002:
Rename kWebMEncryptInitDataType to kWebMInitDataType (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master