| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 // Unset max bitrate -> cap to one bit per pixel. | 333 // Unset max bitrate -> cap to one bit per pixel. |
| 334 video_codec.maxBitrate = | 334 video_codec.maxBitrate = |
| 335 (video_codec.width * video_codec.height * video_codec.maxFramerate) / | 335 (video_codec.width * video_codec.height * video_codec.maxFramerate) / |
| 336 1000; | 336 1000; |
| 337 } | 337 } |
| 338 if (video_codec.maxBitrate < kEncoderMinBitrateKbps) | 338 if (video_codec.maxBitrate < kEncoderMinBitrateKbps) |
| 339 video_codec.maxBitrate = kEncoderMinBitrateKbps; | 339 video_codec.maxBitrate = kEncoderMinBitrateKbps; |
| 340 | 340 |
| 341 RTC_DCHECK_GT(streams[0].max_framerate, 0); | 341 RTC_DCHECK_GT(streams[0].max_framerate, 0); |
| 342 video_codec.maxFramerate = streams[0].max_framerate; | 342 video_codec.maxFramerate = streams[0].max_framerate; |
| 343 video_codec.expect_encode_from_texture = config.expect_encode_from_texture; |
| 343 | 344 |
| 344 return video_codec; | 345 return video_codec; |
| 345 } | 346 } |
| 346 | 347 |
| 347 } // namespace | 348 } // namespace |
| 348 | 349 |
| 349 namespace internal { | 350 namespace internal { |
| 350 VideoSendStream::VideoSendStream( | 351 VideoSendStream::VideoSendStream( |
| 351 int num_cpu_cores, | 352 int num_cpu_cores, |
| 352 ProcessThread* module_process_thread, | 353 ProcessThread* module_process_thread, |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 &module_nack_rate); | 822 &module_nack_rate); |
| 822 *sent_video_rate_bps += module_video_rate; | 823 *sent_video_rate_bps += module_video_rate; |
| 823 *sent_nack_rate_bps += module_nack_rate; | 824 *sent_nack_rate_bps += module_nack_rate; |
| 824 *sent_fec_rate_bps += module_fec_rate; | 825 *sent_fec_rate_bps += module_fec_rate; |
| 825 } | 826 } |
| 826 return 0; | 827 return 0; |
| 827 } | 828 } |
| 828 | 829 |
| 829 } // namespace internal | 830 } // namespace internal |
| 830 } // namespace webrtc | 831 } // namespace webrtc |
| OLD | NEW |