Chromium Code Reviews| Index: webrtc/stats/rtcstats_objects.cc |
| diff --git a/webrtc/stats/rtcstats_objects.cc b/webrtc/stats/rtcstats_objects.cc |
| index 5397ef782cca502ff4508e2118b38a251c0b4af3..22debda3ee622fa6b7c4b06141672701d8f8c398 100644 |
| --- a/webrtc/stats/rtcstats_objects.cc |
| +++ b/webrtc/stats/rtcstats_objects.cc |
| @@ -348,33 +348,38 @@ RTCMediaStreamStats::RTCMediaStreamStats( |
| RTCMediaStreamStats::~RTCMediaStreamStats() { |
| } |
| -WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, RTCStats, "track", |
| - &track_identifier, |
| - &remote_source, |
| - &ended, |
| - &detached, |
| - &kind, |
| - &frame_width, |
| - &frame_height, |
| - &frames_per_second, |
| - &frames_sent, |
| - &frames_received, |
| - &frames_decoded, |
| - &frames_dropped, |
| - &frames_corrupted, |
| - &partial_frames_lost, |
| - &full_frames_lost, |
| - &audio_level, |
| - &echo_return_loss, |
| - &echo_return_loss_enhancement); |
| +WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, |
| + RTCStats, |
| + "track", |
|
hbos
2017/07/07 12:52:24
Place RTCMediaStreamTrackStats, RTCStats, "track"
Zach Stein
2017/07/07 21:27:37
Done. "git cl format" changed it and I didn't noti
|
| + &track_identifier, |
| + &remote_source, |
| + &ended, |
| + &detached, |
| + &kind, |
| + &frame_width, |
| + &frame_height, |
| + &frames_per_second, |
| + &frames_sent, |
| + &frames_received, |
| + &frames_decoded, |
| + &frames_dropped, |
| + &frames_corrupted, |
| + &partial_frames_lost, |
| + &full_frames_lost, |
| + &audio_level, |
| + &total_audio_energy, |
| + &total_samples_duration, |
| + &echo_return_loss, |
| + &echo_return_loss_enhancement); |
| RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( |
| const std::string& id, int64_t timestamp_us, const char* kind) |
| : RTCMediaStreamTrackStats(std::string(id), timestamp_us, kind) { |
| } |
| -RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( |
| - std::string&& id, int64_t timestamp_us, const char* kind) |
| +RTCMediaStreamTrackStats::RTCMediaStreamTrackStats(std::string&& id, |
| + int64_t timestamp_us, |
| + const char* kind) |
| : RTCStats(std::move(id), timestamp_us), |
| track_identifier("trackIdentifier"), |
| remote_source("remoteSource"), |
| @@ -392,6 +397,8 @@ RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( |
| partial_frames_lost("partialFramesLost"), |
| full_frames_lost("fullFramesLost"), |
| audio_level("audioLevel"), |
| + total_audio_energy("totalAudioEnergy"), |
| + total_samples_duration("totalSamplesDuration"), |
| echo_return_loss("echoReturnLoss"), |
| echo_return_loss_enhancement("echoReturnLossEnhancement") { |
| RTC_DCHECK(kind == RTCMediaStreamTrackKind::kAudio || |
| @@ -417,9 +424,10 @@ RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( |
| partial_frames_lost(other.partial_frames_lost), |
| full_frames_lost(other.full_frames_lost), |
| audio_level(other.audio_level), |
| + total_audio_energy(other.total_audio_energy), |
| + total_samples_duration(other.total_samples_duration), |
| echo_return_loss(other.echo_return_loss), |
| - echo_return_loss_enhancement(other.echo_return_loss_enhancement) { |
| -} |
| + echo_return_loss_enhancement(other.echo_return_loss_enhancement) {} |
| RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats() { |
| } |