Merge remote tracking branch 'upstream-master'

Bug: 153469641
Test: run cuttlefish locally
Change-Id: Ida3bfe62ef5c6549278f4c155a1f690b008e9b9d

1 files changed, 61 insertions, 3 deletions

diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc
index 453acce925..2fe85468c8 100644
--- a/stats/rtcstats_objects.cc
+++ b/stats/rtcstats_objects.cc
@@ -124,7 +124,7 @@ RTCCodecStats::~RTCCodecStats() {}
 WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel",
     &label,
     &protocol,
-    &datachannelid,
+    &data_channel_identifier,
     &state,
     &messages_sent,
     &bytes_sent,
@@ -140,7 +140,7 @@ RTCDataChannelStats::RTCDataChannelStats(std::string&& id, int64_t timestamp_us)
     : RTCStats(std::move(id), timestamp_us),
       label("label"),
       protocol("protocol"),
-      datachannelid("datachannelid"),
+      data_channel_identifier("dataChannelIdentifier"),
       state("state"),
       messages_sent("messagesSent"),
       bytes_sent("bytesSent"),
@@ -151,7 +151,7 @@ RTCDataChannelStats::RTCDataChannelStats(const RTCDataChannelStats& other)
     : RTCStats(other.id(), other.timestamp_us()),
       label(other.label),
       protocol(other.protocol),
-      datachannelid(other.datachannelid),
+      data_channel_identifier(other.data_channel_identifier),
       state(other.state),
       messages_sent(other.messages_sent),
       bytes_sent(other.bytes_sent),
@@ -604,6 +604,18 @@ WEBRTC_RTCSTATS_IMPL(
     &packets_lost,
     &last_packet_received_timestamp,
     &jitter,
+    &jitter_buffer_delay,
+    &jitter_buffer_emitted_count,
+    &total_samples_received,
+    &concealed_samples,
+    &silent_concealed_samples,
+    &concealment_events,
+    &inserted_samples_for_deceleration,
+    &removed_samples_for_acceleration,
+    &audio_level,
+    &total_audio_energy,
+    &total_samples_duration,
+    &frames_received,
     &round_trip_time,
     &packets_discarded,
     &packets_repaired,
@@ -615,8 +627,13 @@ WEBRTC_RTCSTATS_IMPL(
     &burst_discard_rate,
     &gap_loss_rate,
     &gap_discard_rate,
+    &frame_width,
+    &frame_height,
+    &frame_bit_depth,
+    &frames_per_second,
     &frames_decoded,
     &key_frames_decoded,
+    &frames_dropped,
     &total_decode_time,
     &total_inter_frame_delay,
     &total_squared_inter_frame_delay,
@@ -640,6 +657,18 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(std::string&& id,
       packets_lost("packetsLost"),
       last_packet_received_timestamp("lastPacketReceivedTimestamp"),
       jitter("jitter"),
+      jitter_buffer_delay("jitterBufferDelay"),
+      jitter_buffer_emitted_count("jitterBufferEmittedCount"),
+      total_samples_received("totalSamplesReceived"),
+      concealed_samples("concealedSamples"),
+      silent_concealed_samples("silentConcealedSamples"),
+      concealment_events("concealmentEvents"),
+      inserted_samples_for_deceleration("insertedSamplesForDeceleration"),
+      removed_samples_for_acceleration("removedSamplesForAcceleration"),
+      audio_level("audioLevel"),
+      total_audio_energy("totalAudioEnergy"),
+      total_samples_duration("totalSamplesDuration"),
+      frames_received("framesReceived"),
       round_trip_time("roundTripTime"),
       packets_discarded("packetsDiscarded"),
       packets_repaired("packetsRepaired"),
@@ -651,8 +680,13 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(std::string&& id,
       burst_discard_rate("burstDiscardRate"),
       gap_loss_rate("gapLossRate"),
       gap_discard_rate("gapDiscardRate"),
+      frame_width("frameWidth"),
+      frame_height("frameHeight"),
+      frame_bit_depth("frameBitDepth"),
+      frames_per_second("framesPerSecond"),
       frames_decoded("framesDecoded"),
       key_frames_decoded("keyFramesDecoded"),
+      frames_dropped("framesDropped"),
       total_decode_time("totalDecodeTime"),
       total_inter_frame_delay("totalInterFrameDelay"),
       total_squared_inter_frame_delay("totalSquaredInterFrameDelay"),
@@ -671,6 +705,19 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(
       packets_lost(other.packets_lost),
       last_packet_received_timestamp(other.last_packet_received_timestamp),
       jitter(other.jitter),
+      jitter_buffer_delay(other.jitter_buffer_delay),
+      jitter_buffer_emitted_count(other.jitter_buffer_emitted_count),
+      total_samples_received(other.total_samples_received),
+      concealed_samples(other.concealed_samples),
+      silent_concealed_samples(other.silent_concealed_samples),
+      concealment_events(other.concealment_events),
+      inserted_samples_for_deceleration(
+          other.inserted_samples_for_deceleration),
+      removed_samples_for_acceleration(other.removed_samples_for_acceleration),
+      audio_level(other.audio_level),
+      total_audio_energy(other.total_audio_energy),
+      total_samples_duration(other.total_samples_duration),
+      frames_received(other.frames_received),
       round_trip_time(other.round_trip_time),
       packets_discarded(other.packets_discarded),
       packets_repaired(other.packets_repaired),
@@ -682,8 +729,13 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(
       burst_discard_rate(other.burst_discard_rate),
       gap_loss_rate(other.gap_loss_rate),
       gap_discard_rate(other.gap_discard_rate),
+      frame_width(other.frame_width),
+      frame_height(other.frame_height),
+      frame_bit_depth(other.frame_bit_depth),
+      frames_per_second(other.frames_per_second),
       frames_decoded(other.frames_decoded),
       key_frames_decoded(other.key_frames_decoded),
+      frames_dropped(other.frames_dropped),
       total_decode_time(other.total_decode_time),
       total_inter_frame_delay(other.total_inter_frame_delay),
       total_squared_inter_frame_delay(other.total_squared_inter_frame_delay),
@@ -906,7 +958,9 @@ RTCVideoSourceStats::~RTCVideoSourceStats() {}
 // clang-format off
 WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport",
     &bytes_sent,
+    &packets_sent,
     &bytes_received,
+    &packets_received,
     &rtcp_transport_stats_id,
     &dtls_state,
     &selected_candidate_pair_id,
@@ -925,7 +979,9 @@ RTCTransportStats::RTCTransportStats(const std::string& id,
 RTCTransportStats::RTCTransportStats(std::string&& id, int64_t timestamp_us)
     : RTCStats(std::move(id), timestamp_us),
       bytes_sent("bytesSent"),
+      packets_sent("packetsSent"),
       bytes_received("bytesReceived"),
+      packets_received("packetsReceived"),
       rtcp_transport_stats_id("rtcpTransportStatsId"),
       dtls_state("dtlsState"),
       selected_candidate_pair_id("selectedCandidatePairId"),
@@ -939,7 +995,9 @@ RTCTransportStats::RTCTransportStats(std::string&& id, int64_t timestamp_us)
 RTCTransportStats::RTCTransportStats(const RTCTransportStats& other)
     : RTCStats(other.id(), other.timestamp_us()),
       bytes_sent(other.bytes_sent),
+      packets_sent(other.packets_sent),
       bytes_received(other.bytes_received),
+      packets_received(other.packets_received),
       rtcp_transport_stats_id(other.rtcp_transport_stats_id),
       dtls_state(other.dtls_state),
       selected_candidate_pair_id(other.selected_candidate_pair_id),