Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 2718483003: Use base::Optional for selected video track. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index aec1ea699ee6effb6145b5264b8744a6cec21558..4d6cd8d41947f23c8cf13abfd48c73cdfa76aadb 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -671,15 +671,12 @@ void WebMediaPlayerImpl::selectedVideoTrackChanged(
blink::WebMediaPlayer::TrackId* selectedTrackId) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
- std::ostringstream logstr;
- std::vector<MediaTrack::Id> selectedVideoMediaTrackId;
- if (selectedTrackId && !video_track_disabled_) {
- selectedVideoMediaTrackId.push_back(selectedTrackId->utf8().data());
- logstr << selectedVideoMediaTrackId[0];
- }
- MEDIA_LOG(INFO, media_log_) << "Selected video track: [" << logstr.str()
- << "]";
- pipeline_.OnSelectedVideoTrackChanged(selectedVideoMediaTrackId);
+ base::Optional<MediaTrack::Id> selected_video_track_id;
+ if (selectedTrackId && !video_track_disabled_)
+ selected_video_track_id = MediaTrack::Id(selectedTrackId->utf8().data());
+ MEDIA_LOG(INFO, media_log_) << "Selected video track: ["
+ << selected_video_track_id.value_or("") << "]";
+ pipeline_.OnSelectedVideoTrackChanged(selected_video_track_id);
}
blink::WebSize WebMediaPlayerImpl::naturalSize() const {
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698