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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 // Cache InternalSource() to have this available from IntraFrameRequest() | 129 // Cache InternalSource() to have this available from IntraFrameRequest() |
130 // without having to acquire encoder_crit_ (avoid blocking on encoder use). | 130 // without having to acquire encoder_crit_ (avoid blocking on encoder use). |
131 encoder_has_internal_source_ = _encoder->InternalSource(); | 131 encoder_has_internal_source_ = _encoder->InternalSource(); |
132 } | 132 } |
133 | 133 |
134 LOG(LS_VERBOSE) << " max bitrate " << sendCodec->maxBitrate | 134 LOG(LS_VERBOSE) << " max bitrate " << sendCodec->maxBitrate |
135 << " start bitrate " << sendCodec->startBitrate | 135 << " start bitrate " << sendCodec->startBitrate |
136 << " max frame rate " << sendCodec->maxFramerate | 136 << " max frame rate " << sendCodec->maxFramerate |
137 << " max payload size " << maxPayloadSize; | 137 << " max payload size " << maxPayloadSize; |
138 _mediaOpt.SetEncodingData(sendCodec->maxBitrate * 1000, | 138 _mediaOpt.SetEncodingData(sendCodec->maxBitrate * 1000, |
139 sendCodec->startBitrate * 1000, sendCodec->width, | 139 sendCodec->startBitrate * 1000, |
140 sendCodec->height, sendCodec->maxFramerate, | 140 sendCodec->maxFramerate); |
141 numLayers, maxPayloadSize); | |
142 return VCM_OK; | 141 return VCM_OK; |
143 } | 142 } |
144 | 143 |
145 // Register an external decoder object. | 144 // Register an external decoder object. |
146 // This can not be used together with external decoder callbacks. | 145 // This can not be used together with external decoder callbacks. |
147 void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder, | 146 void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder, |
148 uint8_t payloadType, | 147 uint8_t payloadType, |
149 bool internalSource /*= false*/) { | 148 bool internalSource /*= false*/) { |
150 RTC_DCHECK(sequenced_checker_.CalledSequentially()); | 149 RTC_DCHECK(sequenced_checker_.CalledSequentially()); |
151 | 150 |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 } | 406 } |
408 | 407 |
409 int32_t VideoSender::EnableFrameDropper(bool enable) { | 408 int32_t VideoSender::EnableFrameDropper(bool enable) { |
410 rtc::CritScope lock(&encoder_crit_); | 409 rtc::CritScope lock(&encoder_crit_); |
411 frame_dropper_enabled_ = enable; | 410 frame_dropper_enabled_ = enable; |
412 _mediaOpt.EnableFrameDropper(enable); | 411 _mediaOpt.EnableFrameDropper(enable); |
413 return VCM_OK; | 412 return VCM_OK; |
414 } | 413 } |
415 } // namespace vcm | 414 } // namespace vcm |
416 } // namespace webrtc | 415 } // namespace webrtc |
OLD | NEW |