OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 2151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2162 // Note, adapt_changes only include changes from the video_adapter. | 2162 // Note, adapt_changes only include changes from the video_adapter. |
2163 if (stats.bw_limited_resolution) | 2163 if (stats.bw_limited_resolution) |
2164 info.adapt_reason |= ADAPTREASON_BANDWIDTH; | 2164 info.adapt_reason |= ADAPTREASON_BANDWIDTH; |
2165 | 2165 |
2166 info.encoder_implementation_name = stats.encoder_implementation_name; | 2166 info.encoder_implementation_name = stats.encoder_implementation_name; |
2167 info.ssrc_groups = ssrc_groups_; | 2167 info.ssrc_groups = ssrc_groups_; |
2168 info.framerate_input = stats.input_frame_rate; | 2168 info.framerate_input = stats.input_frame_rate; |
2169 info.framerate_sent = stats.encode_frame_rate; | 2169 info.framerate_sent = stats.encode_frame_rate; |
2170 info.avg_encode_ms = stats.avg_encode_time_ms; | 2170 info.avg_encode_ms = stats.avg_encode_time_ms; |
2171 info.encode_usage_percent = stats.encode_usage_percent; | 2171 info.encode_usage_percent = stats.encode_usage_percent; |
| 2172 info.frames_encoded = stats.frames_encoded; |
2172 | 2173 |
2173 info.nominal_bitrate = stats.media_bitrate_bps; | 2174 info.nominal_bitrate = stats.media_bitrate_bps; |
2174 info.preferred_bitrate = stats.preferred_media_bitrate_bps; | 2175 info.preferred_bitrate = stats.preferred_media_bitrate_bps; |
2175 | 2176 |
2176 info.send_frame_width = 0; | 2177 info.send_frame_width = 0; |
2177 info.send_frame_height = 0; | 2178 info.send_frame_height = 0; |
2178 for (std::map<uint32_t, webrtc::VideoSendStream::StreamStats>::iterator it = | 2179 for (std::map<uint32_t, webrtc::VideoSendStream::StreamStats>::iterator it = |
2179 stats.substreams.begin(); | 2180 stats.substreams.begin(); |
2180 it != stats.substreams.end(); ++it) { | 2181 it != stats.substreams.end(); ++it) { |
2181 // TODO(pbos): Wire up additional stats, such as padding bytes. | 2182 // TODO(pbos): Wire up additional stats, such as padding bytes. |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2696 rtx_mapping[video_codecs[i].codec.id] != | 2697 rtx_mapping[video_codecs[i].codec.id] != |
2697 ulpfec_config.red_payload_type) { | 2698 ulpfec_config.red_payload_type) { |
2698 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2699 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2699 } | 2700 } |
2700 } | 2701 } |
2701 | 2702 |
2702 return video_codecs; | 2703 return video_codecs; |
2703 } | 2704 } |
2704 | 2705 |
2705 } // namespace cricket | 2706 } // namespace cricket |
OLD | NEW |