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_tracks_parser.h" | 5 #include "media/formats/webm/webm_tracks_parser.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "media/base/media_util.h" | 10 #include "media/base/media_util.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 return false; | 214 return false; |
215 } | 215 } |
216 audio_default_duration_ = default_duration_; | 216 audio_default_duration_ = default_duration_; |
217 | 217 |
218 DCHECK(!audio_decoder_config_.IsValidConfig()); | 218 DCHECK(!audio_decoder_config_.IsValidConfig()); |
219 if (!audio_client_.InitializeConfig( | 219 if (!audio_client_.InitializeConfig( |
220 codec_id_, codec_private_, seek_preroll_, codec_delay_, | 220 codec_id_, codec_private_, seek_preroll_, codec_delay_, |
221 encryption_scheme, &audio_decoder_config_)) { | 221 encryption_scheme, &audio_decoder_config_)) { |
222 return false; | 222 return false; |
223 } | 223 } |
224 media_tracks_->AddAudioTrack(audio_decoder_config_, | 224 media_tracks_->AddAudioTrack( |
225 base::Uint64ToString(track_num_), "main", | 225 audio_decoder_config_, |
226 track_name_, track_language_); | 226 static_cast<StreamParser::TrackId>(track_num_), "main", track_name_, |
| 227 track_language_); |
227 } else { | 228 } else { |
228 MEDIA_LOG(DEBUG, media_log_) << "Ignoring audio track " << track_num_; | 229 MEDIA_LOG(DEBUG, media_log_) << "Ignoring audio track " << track_num_; |
229 ignored_tracks_.insert(track_num_); | 230 ignored_tracks_.insert(track_num_); |
230 } | 231 } |
231 } else if (track_type_ == kWebMTrackTypeVideo) { | 232 } else if (track_type_ == kWebMTrackTypeVideo) { |
232 detected_video_track_count_++; | 233 detected_video_track_count_++; |
233 if (video_track_num_ == -1) { | 234 if (video_track_num_ == -1) { |
234 video_track_num_ = track_num_; | 235 video_track_num_ = track_num_; |
235 video_encryption_key_id_ = encryption_key_id; | 236 video_encryption_key_id_ = encryption_key_id; |
236 | 237 |
237 if (default_duration_ == 0) { | 238 if (default_duration_ == 0) { |
238 MEDIA_LOG(ERROR, media_log_) << "Illegal 0ns video TrackEntry " | 239 MEDIA_LOG(ERROR, media_log_) << "Illegal 0ns video TrackEntry " |
239 "DefaultDuration"; | 240 "DefaultDuration"; |
240 return false; | 241 return false; |
241 } | 242 } |
242 video_default_duration_ = default_duration_; | 243 video_default_duration_ = default_duration_; |
243 | 244 |
244 DCHECK(!video_decoder_config_.IsValidConfig()); | 245 DCHECK(!video_decoder_config_.IsValidConfig()); |
245 if (!video_client_.InitializeConfig(codec_id_, codec_private_, | 246 if (!video_client_.InitializeConfig(codec_id_, codec_private_, |
246 encryption_scheme, | 247 encryption_scheme, |
247 &video_decoder_config_)) { | 248 &video_decoder_config_)) { |
248 return false; | 249 return false; |
249 } | 250 } |
250 media_tracks_->AddVideoTrack(video_decoder_config_, | 251 media_tracks_->AddVideoTrack( |
251 base::Uint64ToString(track_num_), "main", | 252 video_decoder_config_, |
252 track_name_, track_language_); | 253 static_cast<StreamParser::TrackId>(track_num_), "main", track_name_, |
| 254 track_language_); |
253 } else { | 255 } else { |
254 MEDIA_LOG(DEBUG, media_log_) << "Ignoring video track " << track_num_; | 256 MEDIA_LOG(DEBUG, media_log_) << "Ignoring video track " << track_num_; |
255 ignored_tracks_.insert(track_num_); | 257 ignored_tracks_.insert(track_num_); |
256 } | 258 } |
257 } else if (track_type_ == kWebMTrackTypeSubtitlesOrCaptions || | 259 } else if (track_type_ == kWebMTrackTypeSubtitlesOrCaptions || |
258 track_type_ == kWebMTrackTypeDescriptionsOrMetadata) { | 260 track_type_ == kWebMTrackTypeDescriptionsOrMetadata) { |
259 detected_text_track_count_++; | 261 detected_text_track_count_++; |
260 if (ignore_text_tracks_) { | 262 if (ignore_text_tracks_) { |
261 MEDIA_LOG(DEBUG, media_log_) << "Ignoring text track " << track_num_; | 263 MEDIA_LOG(DEBUG, media_log_) << "Ignoring text track " << track_num_; |
262 ignored_tracks_.insert(track_num_); | 264 ignored_tracks_.insert(track_num_); |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 } else { | 365 } else { |
364 track_language_ = str; | 366 track_language_ = str; |
365 } | 367 } |
366 return true; | 368 return true; |
367 } | 369 } |
368 | 370 |
369 return true; | 371 return true; |
370 } | 372 } |
371 | 373 |
372 } // namespace media | 374 } // namespace media |
OLD | NEW |