| 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), | 212 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), |
| 213 tracks_parser.text_tracks(), | 213 tracks_parser.text_tracks(), |
| 214 tracks_parser.ignored_tracks(), | 214 tracks_parser.ignored_tracks(), |
| 215 tracks_parser.audio_encryption_key_id(), | 215 tracks_parser.audio_encryption_key_id(), |
| 216 tracks_parser.video_encryption_key_id(), | 216 tracks_parser.video_encryption_key_id(), |
| 217 log_cb_)); | 217 log_cb_)); |
| 218 | 218 |
| 219 ChangeState(kParsingClusters); | 219 ChangeState(kParsingClusters); |
| 220 | 220 |
| 221 if (!init_cb_.is_null()) | 221 if (!init_cb_.is_null()) |
| 222 base::ResetAndReturn(&init_cb_).Run(true, duration, false); | 222 base::ResetAndReturn(&init_cb_).Run( |
| 223 true, duration, info_parser.date_utc(), false); |
| 223 | 224 |
| 224 return bytes_parsed; | 225 return bytes_parsed; |
| 225 } | 226 } |
| 226 | 227 |
| 227 int WebMStreamParser::ParseCluster(const uint8* data, int size) { | 228 int WebMStreamParser::ParseCluster(const uint8* data, int size) { |
| 228 if (!cluster_parser_) | 229 if (!cluster_parser_) |
| 229 return -1; | 230 return -1; |
| 230 | 231 |
| 231 int id; | 232 int id; |
| 232 int64 element_size; | 233 int64 element_size; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 285 |
| 285 return bytes_parsed; | 286 return bytes_parsed; |
| 286 } | 287 } |
| 287 | 288 |
| 288 void WebMStreamParser::FireNeedKey(const std::string& key_id) { | 289 void WebMStreamParser::FireNeedKey(const std::string& key_id) { |
| 289 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); | 290 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); |
| 290 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); | 291 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); |
| 291 } | 292 } |
| 292 | 293 |
| 293 } // namespace media | 294 } // namespace media |
| OLD | NEW |