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/mp4/mp4_stream_parser.h" | 5 #include "media/formats/mp4/mp4_stream_parser.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <limits> | 8 #include <limits> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/callback_helpers.h" | 12 #include "base/callback_helpers.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
15 #include "build/build_config.h" | 15 #include "build/build_config.h" |
16 #include "media/base/audio_decoder_config.h" | 16 #include "media/base/audio_decoder_config.h" |
| 17 #include "media/base/media_tracks.h" |
17 #include "media/base/stream_parser_buffer.h" | 18 #include "media/base/stream_parser_buffer.h" |
18 #include "media/base/text_track_config.h" | 19 #include "media/base/text_track_config.h" |
19 #include "media/base/timestamp_constants.h" | 20 #include "media/base/timestamp_constants.h" |
20 #include "media/base/video_decoder_config.h" | 21 #include "media/base/video_decoder_config.h" |
21 #include "media/base/video_util.h" | 22 #include "media/base/video_util.h" |
22 #include "media/formats/mp4/box_definitions.h" | 23 #include "media/formats/mp4/box_definitions.h" |
23 #include "media/formats/mp4/box_reader.h" | 24 #include "media/formats/mp4/box_reader.h" |
24 #include "media/formats/mp4/es_descriptor.h" | 25 #include "media/formats/mp4/es_descriptor.h" |
25 #include "media/formats/mp4/rcheck.h" | 26 #include "media/formats/mp4/rcheck.h" |
26 #include "media/formats/mpeg/adts_constants.h" | 27 #include "media/formats/mpeg/adts_constants.h" |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 // SPS/PPS are embedded in the video stream | 347 // SPS/PPS are embedded in the video stream |
347 std::vector<uint8_t>(), is_video_track_encrypted_); | 348 std::vector<uint8_t>(), is_video_track_encrypted_); |
348 has_video_ = true; | 349 has_video_ = true; |
349 video_track_id_ = track->header.track_id; | 350 video_track_id_ = track->header.track_id; |
350 } | 351 } |
351 } | 352 } |
352 | 353 |
353 if (!moov_->pssh.empty()) | 354 if (!moov_->pssh.empty()) |
354 OnEncryptedMediaInitData(moov_->pssh); | 355 OnEncryptedMediaInitData(moov_->pssh); |
355 | 356 |
356 RCHECK(config_cb_.Run(audio_config, video_config, TextTrackConfigMap())); | 357 scoped_ptr<MediaTracks> media_tracks(new MediaTracks()); |
| 358 if (audio_config.IsValidConfig()) { |
| 359 media_tracks->AddAudioTrack(audio_config, "audio", "", "", ""); |
| 360 } |
| 361 if (video_config.IsValidConfig()) { |
| 362 media_tracks->AddVideoTrack(video_config, "video", "", "", ""); |
| 363 } |
| 364 RCHECK(config_cb_.Run(std::move(media_tracks), TextTrackConfigMap())); |
357 | 365 |
358 StreamParser::InitParameters params(kInfiniteDuration()); | 366 StreamParser::InitParameters params(kInfiniteDuration()); |
359 if (moov_->extends.header.fragment_duration > 0) { | 367 if (moov_->extends.header.fragment_duration > 0) { |
360 params.duration = TimeDeltaFromRational( | 368 params.duration = TimeDeltaFromRational( |
361 moov_->extends.header.fragment_duration, moov_->header.timescale); | 369 moov_->extends.header.fragment_duration, moov_->header.timescale); |
362 params.liveness = DemuxerStream::LIVENESS_RECORDED; | 370 params.liveness = DemuxerStream::LIVENESS_RECORDED; |
363 } else if (moov_->header.duration > 0 && | 371 } else if (moov_->header.duration > 0 && |
364 moov_->header.duration != std::numeric_limits<uint64_t>::max()) { | 372 moov_->header.duration != std::numeric_limits<uint64_t>::max()) { |
365 params.duration = | 373 params.duration = |
366 TimeDeltaFromRational(moov_->header.duration, moov_->header.timescale); | 374 TimeDeltaFromRational(moov_->header.duration, moov_->header.timescale); |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 runs.AdvanceSample(); | 664 runs.AdvanceSample(); |
657 } | 665 } |
658 runs.AdvanceRun(); | 666 runs.AdvanceRun(); |
659 } | 667 } |
660 | 668 |
661 return true; | 669 return true; |
662 } | 670 } |
663 | 671 |
664 } // namespace mp4 | 672 } // namespace mp4 |
665 } // namespace media | 673 } // namespace media |
OLD | NEW |