| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 cluster_parser_.reset(new WebMClusterParser( | 233 cluster_parser_.reset(new WebMClusterParser( |
| 234 info_parser.timecode_scale(), | 234 info_parser.timecode_scale(), |
| 235 tracks_parser.audio_track_num(), | 235 tracks_parser.audio_track_num(), |
| 236 tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us), | 236 tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us), |
| 237 tracks_parser.video_track_num(), | 237 tracks_parser.video_track_num(), |
| 238 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), | 238 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), |
| 239 tracks_parser.text_tracks(), | 239 tracks_parser.text_tracks(), |
| 240 tracks_parser.ignored_tracks(), | 240 tracks_parser.ignored_tracks(), |
| 241 tracks_parser.audio_encryption_key_id(), | 241 tracks_parser.audio_encryption_key_id(), |
| 242 tracks_parser.video_encryption_key_id(), | 242 tracks_parser.video_encryption_key_id(), |
| 243 audio_config, |
| 243 log_cb_)); | 244 log_cb_)); |
| 244 | 245 |
| 245 if (!init_cb_.is_null()) | 246 if (!init_cb_.is_null()) |
| 246 base::ResetAndReturn(&init_cb_).Run(true, params); | 247 base::ResetAndReturn(&init_cb_).Run(true, params); |
| 247 | 248 |
| 248 return bytes_parsed; | 249 return bytes_parsed; |
| 249 } | 250 } |
| 250 | 251 |
| 251 int WebMStreamParser::ParseCluster(const uint8* data, int size) { | 252 int WebMStreamParser::ParseCluster(const uint8* data, int size) { |
| 252 if (!cluster_parser_) | 253 if (!cluster_parser_) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 275 | 276 |
| 276 return bytes_parsed; | 277 return bytes_parsed; |
| 277 } | 278 } |
| 278 | 279 |
| 279 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) { | 280 void WebMStreamParser::OnEncryptedMediaInitData(const std::string& key_id) { |
| 280 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); | 281 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); |
| 281 encrypted_media_init_data_cb_.Run(kWebMInitDataType, key_id_vector); | 282 encrypted_media_init_data_cb_.Run(kWebMInitDataType, key_id_vector); |
| 282 } | 283 } |
| 283 | 284 |
| 284 } // namespace media | 285 } // namespace media |
| OLD | NEW |