| 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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 468 static_cast<unsigned int>(streams[i].max_qp)); | 468 static_cast<unsigned int>(streams[i].max_qp)); |
| 469 } | 469 } |
| 470 | 470 |
| 471 // Set to zero to not update the bitrate controller from ViEEncoder, as | 471 // Set to zero to not update the bitrate controller from ViEEncoder, as |
| 472 // the bitrate controller is already set from Call. | 472 // the bitrate controller is already set from Call. |
| 473 video_codec.startBitrate = 0; | 473 video_codec.startBitrate = 0; |
| 474 | 474 |
| 475 RTC_DCHECK_GT(streams[0].max_framerate, 0); | 475 RTC_DCHECK_GT(streams[0].max_framerate, 0); |
| 476 video_codec.maxFramerate = streams[0].max_framerate; | 476 video_codec.maxFramerate = streams[0].max_framerate; |
| 477 | 477 |
| 478 if (!SetSendCodec(video_codec)) | 478 if (!SetSendCodec(video_codec)) { |
| 479 LOG(LS_WARNING) << "(Re)configureVideoEncoder: SetSendCodec failed " |
| 480 "for config: " |
| 481 << config.ToString(); |
| 479 return false; | 482 return false; |
| 480 | 483 } |
| 481 // Clear stats for disabled layers. | 484 // Clear stats for disabled layers. |
| 482 for (size_t i = video_codec.numberOfSimulcastStreams; | 485 for (size_t i = video_codec.numberOfSimulcastStreams; |
| 483 i < config_.rtp.ssrcs.size(); ++i) { | 486 i < config_.rtp.ssrcs.size(); ++i) { |
| 484 stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]); | 487 stats_proxy_.OnInactiveSsrc(config_.rtp.ssrcs[i]); |
| 485 } | 488 } |
| 486 | 489 |
| 487 stats_proxy_.SetContentType(config.content_type); | 490 stats_proxy_.SetContentType(config.content_type); |
| 488 | 491 |
| 489 RTC_DCHECK_GE(config.min_transmit_bitrate_bps, 0); | 492 RTC_DCHECK_GE(config.min_transmit_bitrate_bps, 0); |
| 490 vie_encoder_.SetMinTransmitBitrate(config.min_transmit_bitrate_bps / 1000); | 493 vie_encoder_.SetMinTransmitBitrate(config.min_transmit_bitrate_bps / 1000); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 615 return false; | 618 return false; |
| 616 } | 619 } |
| 617 | 620 |
| 618 // Restart the media flow | 621 // Restart the media flow |
| 619 vie_encoder_.Restart(); | 622 vie_encoder_.Restart(); |
| 620 | 623 |
| 621 return true; | 624 return true; |
| 622 } | 625 } |
| 623 } // namespace internal | 626 } // namespace internal |
| 624 } // namespace webrtc | 627 } // namespace webrtc |
| OLD | NEW |