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

Side by Side Diff: webrtc/api/rtcstatscollector.cc

Issue 2623513006: RTCMediaStreamTrackStats.kind added and collected. (Closed)
Patch Set: Rebase with master Created 3 years, 11 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 /* 1 /*
2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2016 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 // Audio Tracks 347 // Audio Tracks
348 for (const rtc::scoped_refptr<AudioTrackInterface>& audio_track : 348 for (const rtc::scoped_refptr<AudioTrackInterface>& audio_track :
349 stream->GetAudioTracks()) { 349 stream->GetAudioTracks()) {
350 std::string id = RTCMediaStreamTrackStatsIDFromTrackID( 350 std::string id = RTCMediaStreamTrackStatsIDFromTrackID(
351 audio_track->id(), is_local); 351 audio_track->id(), is_local);
352 if (report->Get(id)) { 352 if (report->Get(id)) {
353 // Skip track, stats already exist for it. 353 // Skip track, stats already exist for it.
354 continue; 354 continue;
355 } 355 }
356 std::unique_ptr<RTCMediaStreamTrackStats> audio_track_stats( 356 std::unique_ptr<RTCMediaStreamTrackStats> audio_track_stats(
357 new RTCMediaStreamTrackStats(id, timestamp_us)); 357 new RTCMediaStreamTrackStats(id, timestamp_us,
358 RTCMediaStreamTrackKind::kAudio));
358 stream_stats->track_ids->push_back(audio_track_stats->id()); 359 stream_stats->track_ids->push_back(audio_track_stats->id());
359 SetMediaStreamTrackStatsFromMediaStreamTrackInterface( 360 SetMediaStreamTrackStatsFromMediaStreamTrackInterface(
360 *audio_track.get(), 361 *audio_track.get(),
361 audio_track_stats.get()); 362 audio_track_stats.get());
362 audio_track_stats->remote_source = !is_local; 363 audio_track_stats->remote_source = !is_local;
363 audio_track_stats->detached = false; 364 audio_track_stats->detached = false;
364 int signal_level; 365 int signal_level;
365 if (audio_track->GetSignalLevel(&signal_level)) { 366 if (audio_track->GetSignalLevel(&signal_level)) {
366 // Convert signal level from [0,32767] int to [0,1] double. 367 // Convert signal level from [0,32767] int to [0,1] double.
367 RTC_DCHECK_GE(signal_level, 0); 368 RTC_DCHECK_GE(signal_level, 0);
(...skipping 17 matching lines...) Expand all
385 // Video Tracks 386 // Video Tracks
386 for (const rtc::scoped_refptr<VideoTrackInterface>& video_track : 387 for (const rtc::scoped_refptr<VideoTrackInterface>& video_track :
387 stream->GetVideoTracks()) { 388 stream->GetVideoTracks()) {
388 std::string id = RTCMediaStreamTrackStatsIDFromTrackID( 389 std::string id = RTCMediaStreamTrackStatsIDFromTrackID(
389 video_track->id(), is_local); 390 video_track->id(), is_local);
390 if (report->Get(id)) { 391 if (report->Get(id)) {
391 // Skip track, stats already exist for it. 392 // Skip track, stats already exist for it.
392 continue; 393 continue;
393 } 394 }
394 std::unique_ptr<RTCMediaStreamTrackStats> video_track_stats( 395 std::unique_ptr<RTCMediaStreamTrackStats> video_track_stats(
395 new RTCMediaStreamTrackStats(id, timestamp_us)); 396 new RTCMediaStreamTrackStats(id, timestamp_us,
397 RTCMediaStreamTrackKind::kVideo));
396 stream_stats->track_ids->push_back(video_track_stats->id()); 398 stream_stats->track_ids->push_back(video_track_stats->id());
397 SetMediaStreamTrackStatsFromMediaStreamTrackInterface( 399 SetMediaStreamTrackStatsFromMediaStreamTrackInterface(
398 *video_track.get(), 400 *video_track.get(),
399 video_track_stats.get()); 401 video_track_stats.get());
400 video_track_stats->remote_source = !is_local; 402 video_track_stats->remote_source = !is_local;
401 video_track_stats->detached = false; 403 video_track_stats->detached = false;
402 if (video_track->GetSource()) { 404 if (video_track->GetSource()) {
403 VideoTrackSourceInterface::Stats video_track_source_stats; 405 VideoTrackSourceInterface::Stats video_track_source_stats;
404 if (video_track->GetSource()->GetStats(&video_track_source_stats)) { 406 if (video_track->GetSource()->GetStats(&video_track_source_stats)) {
405 video_track_stats->frame_width = static_cast<uint32_t>( 407 video_track_stats->frame_width = static_cast<uint32_t>(
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 const std::string& type) { 1074 const std::string& type) {
1073 return CandidateTypeToRTCIceCandidateType(type); 1075 return CandidateTypeToRTCIceCandidateType(type);
1074 } 1076 }
1075 1077
1076 const char* DataStateToRTCDataChannelStateForTesting( 1078 const char* DataStateToRTCDataChannelStateForTesting(
1077 DataChannelInterface::DataState state) { 1079 DataChannelInterface::DataState state) {
1078 return DataStateToRTCDataChannelState(state); 1080 return DataStateToRTCDataChannelState(state);
1079 } 1081 }
1080 1082
1081 } // namespace webrtc 1083 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698