| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 stats_proxy_->OnSendEncodedImage(encoded_image, codec_specific_info); | 205 stats_proxy_->OnSendEncodedImage(encoded_image, codec_specific_info); |
| 206 } | 206 } |
| 207 | 207 |
| 208 EncodedImageCallback::Result result = | 208 EncodedImageCallback::Result result = |
| 209 sink_->OnEncodedImage(encoded_image, codec_specific_info, fragmentation); | 209 sink_->OnEncodedImage(encoded_image, codec_specific_info, fragmentation); |
| 210 | 210 |
| 211 overuse_detector_->FrameSent(encoded_image._timeStamp); | 211 overuse_detector_->FrameSent(encoded_image._timeStamp); |
| 212 return result; | 212 return result; |
| 213 } | 213 } |
| 214 | 214 |
| 215 void ViEEncoder::SendStatistics(uint32_t bit_rate, | 215 void ViEEncoder::SendStatistics(uint32_t bit_rate, uint32_t frame_rate) { |
| 216 uint32_t frame_rate, | |
| 217 const std::string& encoder_name) { | |
| 218 if (stats_proxy_) | 216 if (stats_proxy_) |
| 219 stats_proxy_->OnEncoderStatsUpdate(frame_rate, bit_rate, encoder_name); | 217 stats_proxy_->OnEncoderStatsUpdate(frame_rate, bit_rate); |
| 220 } | 218 } |
| 221 | 219 |
| 222 void ViEEncoder::OnReceivedSLI(uint8_t picture_id) { | 220 void ViEEncoder::OnReceivedSLI(uint8_t picture_id) { |
| 223 rtc::CritScope lock(&data_cs_); | 221 rtc::CritScope lock(&data_cs_); |
| 224 picture_id_sli_ = picture_id; | 222 picture_id_sli_ = picture_id; |
| 225 has_received_sli_ = true; | 223 has_received_sli_ = true; |
| 226 } | 224 } |
| 227 | 225 |
| 228 void ViEEncoder::OnReceivedRPSI(uint64_t picture_id) { | 226 void ViEEncoder::OnReceivedRPSI(uint64_t picture_id) { |
| 229 rtc::CritScope lock(&data_cs_); | 227 rtc::CritScope lock(&data_cs_); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 } | 263 } |
| 266 | 264 |
| 267 if (stats_proxy_ && video_suspension_changed) { | 265 if (stats_proxy_ && video_suspension_changed) { |
| 268 LOG(LS_INFO) << "Video suspend state changed to: " | 266 LOG(LS_INFO) << "Video suspend state changed to: " |
| 269 << (video_is_suspended ? "suspended" : "not suspended"); | 267 << (video_is_suspended ? "suspended" : "not suspended"); |
| 270 stats_proxy_->OnSuspendChange(video_is_suspended); | 268 stats_proxy_->OnSuspendChange(video_is_suspended); |
| 271 } | 269 } |
| 272 } | 270 } |
| 273 | 271 |
| 274 } // namespace webrtc | 272 } // namespace webrtc |
| OLD | NEW |