Index: media/filters/media_source_state.cc |
diff --git a/media/filters/media_source_state.cc b/media/filters/media_source_state.cc |
index 5ca9df013c2b7152f2ecdf491a5fa7e80645e0ea..a5ccbf898b845d462f05db4045c274e5e0915849 100644 |
--- a/media/filters/media_source_state.cc |
+++ b/media/filters/media_source_state.cc |
@@ -151,8 +151,8 @@ void MediaSourceState::SetGroupStartTimestampIfInSequenceMode( |
void MediaSourceState::SetTracksWatcher( |
const Demuxer::MediaTracksUpdatedCB& tracks_updated_cb) { |
DCHECK(init_segment_received_cb_.is_null()); |
+ DCHECK(!tracks_updated_cb.is_null()); |
init_segment_received_cb_ = tracks_updated_cb; |
- DCHECK(!init_segment_received_cb_.is_null()); |
} |
bool MediaSourceState::Append(const uint8_t* data, |
@@ -480,9 +480,23 @@ bool MediaSourceState::OnNewConfigs( |
const StreamParser::TextTrackConfigMap& text_configs) { |
DCHECK_GE(state_, PENDING_PARSER_CONFIG); |
DCHECK(tracks.get()); |
- media_tracks_ = std::move(tracks); |
- const AudioDecoderConfig& audio_config = media_tracks_->getFirstAudioConfig(); |
- const VideoDecoderConfig& video_config = media_tracks_->getFirstVideoConfig(); |
+ |
+ MediaTrack* audio_track = nullptr; |
+ MediaTrack* video_track = nullptr; |
+ AudioDecoderConfig audio_config; |
+ VideoDecoderConfig video_config; |
+ for (const auto& track : tracks->tracks()) { |
+ if (!audio_track && track->type() == MediaTrack::Audio && |
+ tracks->getAudioConfig(track->byteStreamTrackId()).IsValidConfig()) { |
+ audio_config = tracks->getAudioConfig(track->byteStreamTrackId()); |
+ audio_track = track.get(); |
+ } else if (!video_track && track->type() == MediaTrack::Video && |
+ tracks->getVideoConfig(track->byteStreamTrackId()) |
+ .IsValidConfig()) { |
+ video_config = tracks->getVideoConfig(track->byteStreamTrackId()); |
+ video_track = track.get(); |
+ } |
+ } |
DVLOG(1) << "OnNewConfigs(" << allow_audio << ", " << allow_video << ", " |
<< audio_config.IsValidConfig() << ", " |
@@ -651,12 +665,21 @@ bool MediaSourceState::OnNewConfigs( |
frame_processor_->SetAllTrackBuffersNeedRandomAccessPoint(); |
+ if (audio_track) { |
+ DCHECK(audio_); |
+ audio_track->setId(audio_->media_track_id()); |
+ } |
+ if (video_track) { |
+ DCHECK(video_); |
+ video_track->setId(video_->media_track_id()); |
+ } |
+ |
DVLOG(1) << "OnNewConfigs() : " << (success ? "success" : "failed"); |
if (success) { |
if (state_ == PENDING_PARSER_CONFIG) |
state_ = PENDING_PARSER_INIT; |
DCHECK(!init_segment_received_cb_.is_null()); |
- init_segment_received_cb_.Run(std::move(media_tracks_)); |
+ init_segment_received_cb_.Run(std::move(tracks)); |
} |
return success; |