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

Side by Side Diff: media/blink/webmediaplayer_impl.cc

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid
Patch Set: Remove Demuxer::GetDemuxerStreamByTrackId Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 #include <string> 10 #include <string>
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 std::unique_ptr<MediaTracks> tracks) { 838 std::unique_ptr<MediaTracks> tracks) {
839 // For MSE/chunk_demuxer case the media track updates are handled by 839 // For MSE/chunk_demuxer case the media track updates are handled by
840 // WebSourceBufferImpl. 840 // WebSourceBufferImpl.
841 DCHECK(demuxer_.get()); 841 DCHECK(demuxer_.get());
842 DCHECK(!chunk_demuxer_); 842 DCHECK(!chunk_demuxer_);
843 843
844 // Report the media track information to blink. 844 // Report the media track information to blink.
845 for (const auto& track : tracks->tracks()) { 845 for (const auto& track : tracks->tracks()) {
846 if (track->type() == MediaTrack::Audio) { 846 if (track->type() == MediaTrack::Audio) {
847 auto track_id = client_->addAudioTrack( 847 auto track_id = client_->addAudioTrack(
848 blink::WebString::fromUTF8( 848 blink::WebString::fromUTF8(track->id()),
849 base::UintToString(track->bytestream_track_id())),
850 blink::WebMediaPlayerClient::AudioTrackKindMain, 849 blink::WebMediaPlayerClient::AudioTrackKindMain,
851 blink::WebString::fromUTF8(track->label()), 850 blink::WebString::fromUTF8(track->label()),
852 blink::WebString::fromUTF8(track->language()), 851 blink::WebString::fromUTF8(track->language()),
853 /*enabled*/ true); 852 /*enabled*/ true);
854 (void)track_id; 853 (void)track_id;
855 } else if (track->type() == MediaTrack::Video) { 854 } else if (track->type() == MediaTrack::Video) {
856 auto track_id = client_->addVideoTrack( 855 auto track_id = client_->addVideoTrack(
857 blink::WebString::fromUTF8( 856 blink::WebString::fromUTF8(track->id()),
858 base::UintToString(track->bytestream_track_id())),
859 blink::WebMediaPlayerClient::VideoTrackKindMain, 857 blink::WebMediaPlayerClient::VideoTrackKindMain,
860 blink::WebString::fromUTF8(track->label()), 858 blink::WebString::fromUTF8(track->label()),
861 blink::WebString::fromUTF8(track->language()), 859 blink::WebString::fromUTF8(track->language()),
862 /*selected*/ true); 860 /*selected*/ true);
863 (void)track_id; 861 (void)track_id;
864 } else { 862 } else {
865 // Text tracks are not supported through this code path yet. 863 // Text tracks are not supported through this code path yet.
866 NOTREACHED(); 864 NOTREACHED();
867 } 865 }
868 } 866 }
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1616 << ", Video: " << stats.video_memory_usage << ", DataSource: " 1614 << ", Video: " << stats.video_memory_usage << ", DataSource: "
1617 << (data_source_ ? data_source_->GetMemoryUsage() : 0) 1615 << (data_source_ ? data_source_->GetMemoryUsage() : 0)
1618 << ", Demuxer: " << demuxer_memory_usage; 1616 << ", Demuxer: " << demuxer_memory_usage;
1619 1617
1620 const int64_t delta = current_memory_usage - last_reported_memory_usage_; 1618 const int64_t delta = current_memory_usage - last_reported_memory_usage_;
1621 last_reported_memory_usage_ = current_memory_usage; 1619 last_reported_memory_usage_ = current_memory_usage;
1622 adjust_allocated_memory_cb_.Run(delta); 1620 adjust_allocated_memory_cb_.Run(delta);
1623 } 1621 }
1624 1622
1625 } // namespace media 1623 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698