OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 2231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2242 for (std::map<uint32_t, webrtc::VideoSendStream::StreamStats>::iterator it = | 2242 for (std::map<uint32_t, webrtc::VideoSendStream::StreamStats>::iterator it = |
2243 stats.substreams.begin(); | 2243 stats.substreams.begin(); |
2244 it != stats.substreams.end(); ++it) { | 2244 it != stats.substreams.end(); ++it) { |
2245 // TODO(pbos): Wire up additional stats, such as padding bytes. | 2245 // TODO(pbos): Wire up additional stats, such as padding bytes. |
2246 webrtc::VideoSendStream::StreamStats stream_stats = it->second; | 2246 webrtc::VideoSendStream::StreamStats stream_stats = it->second; |
2247 info.bytes_sent += stream_stats.rtp_stats.transmitted.payload_bytes + | 2247 info.bytes_sent += stream_stats.rtp_stats.transmitted.payload_bytes + |
2248 stream_stats.rtp_stats.transmitted.header_bytes + | 2248 stream_stats.rtp_stats.transmitted.header_bytes + |
2249 stream_stats.rtp_stats.transmitted.padding_bytes; | 2249 stream_stats.rtp_stats.transmitted.padding_bytes; |
2250 info.packets_sent += stream_stats.rtp_stats.transmitted.packets; | 2250 info.packets_sent += stream_stats.rtp_stats.transmitted.packets; |
2251 info.packets_lost += stream_stats.rtcp_stats.cumulative_lost; | 2251 info.packets_lost += stream_stats.rtcp_stats.cumulative_lost; |
2252 if (stream_stats.width > info.send_frame_width) | 2252 if (stream_stats.width > info.send_frame_width) { |
2253 info.send_frame_width = stream_stats.width; | 2253 info.send_frame_width = stream_stats.width; |
| 2254 info.qp = stream_stats.qp; // Report highest layer. |
| 2255 } |
2254 if (stream_stats.height > info.send_frame_height) | 2256 if (stream_stats.height > info.send_frame_height) |
2255 info.send_frame_height = stream_stats.height; | 2257 info.send_frame_height = stream_stats.height; |
2256 info.firs_rcvd += stream_stats.rtcp_packet_type_counts.fir_packets; | 2258 info.firs_rcvd += stream_stats.rtcp_packet_type_counts.fir_packets; |
2257 info.nacks_rcvd += stream_stats.rtcp_packet_type_counts.nack_packets; | 2259 info.nacks_rcvd += stream_stats.rtcp_packet_type_counts.nack_packets; |
2258 info.plis_rcvd += stream_stats.rtcp_packet_type_counts.pli_packets; | 2260 info.plis_rcvd += stream_stats.rtcp_packet_type_counts.pli_packets; |
2259 } | 2261 } |
2260 | 2262 |
2261 if (!stats.substreams.empty()) { | 2263 if (!stats.substreams.empty()) { |
2262 // TODO(pbos): Report fraction lost per SSRC. | 2264 // TODO(pbos): Report fraction lost per SSRC. |
2263 webrtc::VideoSendStream::StreamStats first_stream_stats = | 2265 webrtc::VideoSendStream::StreamStats first_stream_stats = |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2749 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2751 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2750 } | 2752 } |
2751 } | 2753 } |
2752 | 2754 |
2753 return video_codecs; | 2755 return video_codecs; |
2754 } | 2756 } |
2755 | 2757 |
2756 } // namespace cricket | 2758 } // namespace cricket |
2757 | 2759 |
2758 #endif // HAVE_WEBRTC_VIDEO | 2760 #endif // HAVE_WEBRTC_VIDEO |
OLD | NEW |