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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 | 174 |
175 WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_); | 175 WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_); |
176 result = tracks_parser.Parse(cur, cur_size); | 176 result = tracks_parser.Parse(cur, cur_size); |
177 | 177 |
178 if (result <= 0) | 178 if (result <= 0) |
179 return result; | 179 return result; |
180 | 180 |
181 bytes_parsed += result; | 181 bytes_parsed += result; |
182 | 182 |
183 double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0; | 183 double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0; |
184 base::TimeDelta duration = kInfiniteDuration(); | 184 StreamParameters params; |
185 | 185 |
186 if (info_parser.duration() > 0) { | 186 if (info_parser.duration() > 0) { |
187 int64 duration_in_us = info_parser.duration() * timecode_scale_in_us; | 187 int64 duration_in_us = info_parser.duration() * timecode_scale_in_us; |
188 duration = base::TimeDelta::FromMicroseconds(duration_in_us); | 188 params.duration = base::TimeDelta::FromMicroseconds(duration_in_us); |
189 } | 189 } |
190 | 190 |
| 191 params.timeline_offset = info_parser.date_utc(); |
| 192 |
191 const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config(); | 193 const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config(); |
192 if (audio_config.is_encrypted()) | 194 if (audio_config.is_encrypted()) |
193 FireNeedKey(tracks_parser.audio_encryption_key_id()); | 195 FireNeedKey(tracks_parser.audio_encryption_key_id()); |
194 | 196 |
195 const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config(); | 197 const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config(); |
196 if (video_config.is_encrypted()) | 198 if (video_config.is_encrypted()) |
197 FireNeedKey(tracks_parser.video_encryption_key_id()); | 199 FireNeedKey(tracks_parser.video_encryption_key_id()); |
198 | 200 |
199 if (!config_cb_.Run(audio_config, | 201 if (!config_cb_.Run(audio_config, |
200 video_config, | 202 video_config, |
(...skipping 11 matching lines...) Expand all Loading... |
212 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), | 214 tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us), |
213 tracks_parser.text_tracks(), | 215 tracks_parser.text_tracks(), |
214 tracks_parser.ignored_tracks(), | 216 tracks_parser.ignored_tracks(), |
215 tracks_parser.audio_encryption_key_id(), | 217 tracks_parser.audio_encryption_key_id(), |
216 tracks_parser.video_encryption_key_id(), | 218 tracks_parser.video_encryption_key_id(), |
217 log_cb_)); | 219 log_cb_)); |
218 | 220 |
219 ChangeState(kParsingClusters); | 221 ChangeState(kParsingClusters); |
220 | 222 |
221 if (!init_cb_.is_null()) | 223 if (!init_cb_.is_null()) |
222 base::ResetAndReturn(&init_cb_).Run( | 224 base::ResetAndReturn(&init_cb_).Run(true, params); |
223 true, duration, info_parser.date_utc(), false); | |
224 | 225 |
225 return bytes_parsed; | 226 return bytes_parsed; |
226 } | 227 } |
227 | 228 |
228 int WebMStreamParser::ParseCluster(const uint8* data, int size) { | 229 int WebMStreamParser::ParseCluster(const uint8* data, int size) { |
229 if (!cluster_parser_) | 230 if (!cluster_parser_) |
230 return -1; | 231 return -1; |
231 | 232 |
232 int id; | 233 int id; |
233 int64 element_size; | 234 int64 element_size; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 | 286 |
286 return bytes_parsed; | 287 return bytes_parsed; |
287 } | 288 } |
288 | 289 |
289 void WebMStreamParser::FireNeedKey(const std::string& key_id) { | 290 void WebMStreamParser::FireNeedKey(const std::string& key_id) { |
290 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); | 291 std::vector<uint8> key_id_vector(key_id.begin(), key_id.end()); |
291 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); | 292 need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector); |
292 } | 293 } |
293 | 294 |
294 } // namespace media | 295 } // namespace media |
OLD | NEW |