blob: aecc60cde8b361ccf50e30f2d1bf40175bcfe692 [file] [log] [blame]
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +00001/*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 *
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
6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree.
9 */
10
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000011
henrik.lundin@webrtc.org1a3a6e52013-10-28 10:16:14 +000012#include <algorithm> // std::max
13
tommi@webrtc.orge07710c2015-02-19 17:43:25 +000014#include "webrtc/base/checks.h"
pbos854e84c2015-11-16 16:39:06 -080015#include "webrtc/base/logging.h"
philipel5908c712015-12-21 08:23:20 -080016#include "webrtc/common_types.h"
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000017#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
Henrik Kjellander2557b862015-11-18 22:00:21 +010018#include "webrtc/modules/video_coding/include/video_codec_interface.h"
19#include "webrtc/modules/video_coding/encoded_frame.h"
kjellander@webrtc.orgb7ce9642015-11-18 23:04:10 +010020#include "webrtc/modules/video_coding/utility/quality_scaler.h"
Henrik Kjellander2557b862015-11-18 22:00:21 +010021#include "webrtc/modules/video_coding/video_coding_impl.h"
Henrik Kjellander98f53512015-10-28 18:17:40 +010022#include "webrtc/system_wrappers/include/clock.h"
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000023
24namespace webrtc {
25namespace vcm {
26
stefan@webrtc.org34c5da62014-04-11 14:08:35 +000027VideoSender::VideoSender(Clock* clock,
pbos@webrtc.org891d4832015-02-26 13:15:22 +000028 EncodedImageCallback* post_encode_callback,
perkj376b1922016-05-02 11:35:24 -070029 VCMSendStatisticsCallback* send_stats_callback)
stefan@webrtc.org34c5da62014-04-11 14:08:35 +000030 : clock_(clock),
Peter Boström9dbbcfb2015-04-21 15:55:11 +020031 _encoder(nullptr),
stefan@webrtc.org34c5da62014-04-11 14:08:35 +000032 _mediaOpt(clock_),
perkj376b1922016-05-02 11:35:24 -070033 _encodedFrameCallback(post_encode_callback, &_mediaOpt),
34 send_stats_callback_(send_stats_callback),
perkjf5b2e512016-07-05 08:34:04 -070035 _codecDataBase(&_encodedFrameCallback),
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000036 frame_dropper_enabled_(true),
andresp@webrtc.orge682aa52013-12-19 10:59:48 +000037 _sendStatsTimer(1000, clock_),
tommi@webrtc.orge07710c2015-02-19 17:43:25 +000038 current_codec_(),
Peter Boström233bfd22016-01-18 20:23:40 +010039 encoder_params_({0, 0, 0, 0}),
40 encoder_has_internal_source_(false),
41 next_frame_types_(1, kVideoFrameDelta) {
Peter Boströmad6fc5a2016-05-12 03:01:31 +020042 _mediaOpt.Reset();
tommi@webrtc.org658d2012015-03-05 12:21:54 +000043 // Allow VideoSender to be created on one thread but used on another, post
44 // construction. This is currently how this class is being used by at least
45 // one external project (diffractor).
perkjefd902c2016-07-14 02:33:20 -070046 main_thread_.DetachFromThread();
tommi@webrtc.orge07710c2015-02-19 17:43:25 +000047}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000048
Peter Boströmdcb89982015-09-15 14:43:47 +020049VideoSender::~VideoSender() {}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000050
pbosa26ac922016-02-25 04:50:01 -080051void VideoSender::Process() {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000052 if (_sendStatsTimer.TimeUntilProcess() == 0) {
perkj376b1922016-05-02 11:35:24 -070053 // |_sendStatsTimer.Processed()| must be called. Otherwise
54 // VideoSender::Process() will be called in an infinite loop.
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000055 _sendStatsTimer.Processed();
perkj376b1922016-05-02 11:35:24 -070056 if (send_stats_callback_) {
tommi@webrtc.orge07710c2015-02-19 17:43:25 +000057 uint32_t bitRate = _mediaOpt.SentBitRate();
58 uint32_t frameRate = _mediaOpt.SentFrameRate();
perkj376b1922016-05-02 11:35:24 -070059 std::string encoder_name;
60 {
61 rtc::CritScope cs(&params_crit_);
62 // Copy the string here so that we don't hold |params_crit_| in the CB.
63 encoder_name = encoder_name_;
64 }
65 send_stats_callback_->SendStatistics(bitRate, frameRate, encoder_name);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000066 }
67 }
68
Erik Språng66a641a2015-06-11 14:20:07 +020069 {
Peter Boström233bfd22016-01-18 20:23:40 +010070 rtc::CritScope cs(&params_crit_);
Erik Språng66a641a2015-06-11 14:20:07 +020071 // Force an encoder parameters update, so that incoming frame rate is
72 // updated even if bandwidth hasn't changed.
73 encoder_params_.input_frame_rate = _mediaOpt.InputFrameRate();
Erik Språng66a641a2015-06-11 14:20:07 +020074 }
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000075}
76
pkasting@chromium.org0b1534c2014-12-15 22:09:40 +000077int64_t VideoSender::TimeUntilNextProcess() {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000078 return _sendStatsTimer.TimeUntilProcess();
79}
80
81// Register the send codec to be used.
82int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
83 uint32_t numberOfCores,
84 uint32_t maxPayloadSize) {
perkjefd902c2016-07-14 02:33:20 -070085 RTC_DCHECK(main_thread_.CalledOnValidThread());
Peter Boström233bfd22016-01-18 20:23:40 +010086 rtc::CritScope lock(&encoder_crit_);
mflodmanfcf54bd2015-04-14 21:28:08 +020087 if (sendCodec == nullptr) {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000088 return VCM_PARAMETER_ERROR;
89 }
90
Peter Boström4f5db112015-10-29 16:53:59 +010091 bool ret =
92 _codecDataBase.SetSendCodec(sendCodec, numberOfCores, maxPayloadSize);
pbos@webrtc.orgda2c4ce2013-09-17 09:38:41 +000093
94 // Update encoder regardless of result to make sure that we're not holding on
95 // to a deleted instance.
96 _encoder = _codecDataBase.GetEncoder();
tommi@webrtc.orge07710c2015-02-19 17:43:25 +000097 // Cache the current codec here so they can be fetched from this thread
98 // without requiring the _sendCritSect lock.
99 current_codec_ = *sendCodec;
pbos@webrtc.orgda2c4ce2013-09-17 09:38:41 +0000100
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000101 if (!ret) {
pbos@webrtc.org0b52ceb2015-03-24 11:20:54 +0000102 LOG(LS_ERROR) << "Failed to initialize set encoder with payload name '"
103 << sendCodec->plName << "'.";
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000104 return VCM_CODEC_ERROR;
105 }
106
Peter Boström233bfd22016-01-18 20:23:40 +0100107 // SetSendCodec succeeded, _encoder should be set.
108 RTC_DCHECK(_encoder);
109
ivicac7199c22015-10-07 06:43:33 -0700110 int numLayers;
111 if (sendCodec->codecType == kVideoCodecVP8) {
112 numLayers = sendCodec->codecSpecific.VP8.numberOfTemporalLayers;
113 } else if (sendCodec->codecType == kVideoCodecVP9) {
114 numLayers = sendCodec->codecSpecific.VP9.numberOfTemporalLayers;
115 } else {
116 numLayers = 1;
117 }
118
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000119 // If we have screensharing and we have layers, we disable frame dropper.
120 bool disable_frame_dropper =
121 numLayers > 1 && sendCodec->mode == kScreensharing;
122 if (disable_frame_dropper) {
123 _mediaOpt.EnableFrameDropper(false);
124 } else if (frame_dropper_enabled_) {
125 _mediaOpt.EnableFrameDropper(true);
126 }
Peter Boström233bfd22016-01-18 20:23:40 +0100127 {
128 rtc::CritScope cs(&params_crit_);
129 next_frame_types_.clear();
130 next_frame_types_.resize(VCM_MAX(sendCodec->numberOfSimulcastStreams, 1),
131 kVideoFrameKey);
132 // Cache InternalSource() to have this available from IntraFrameRequest()
133 // without having to acquire encoder_crit_ (avoid blocking on encoder use).
134 encoder_has_internal_source_ = _encoder->InternalSource();
135 }
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000136
isheriff7620be82016-03-06 23:22:33 -0800137 LOG(LS_VERBOSE) << " max bitrate " << sendCodec->maxBitrate
138 << " start bitrate " << sendCodec->startBitrate
139 << " max frame rate " << sendCodec->maxFramerate
140 << " max payload size " << maxPayloadSize;
Per69b332d2016-06-02 15:45:42 +0200141 _mediaOpt.SetEncodingData(sendCodec->maxBitrate * 1000,
philipel5908c712015-12-21 08:23:20 -0800142 sendCodec->startBitrate * 1000, sendCodec->width,
143 sendCodec->height, sendCodec->maxFramerate,
144 numLayers, maxPayloadSize);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000145 return VCM_OK;
146}
147
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000148// Register an external decoder object.
149// This can not be used together with external decoder callbacks.
Peter Boström795dbe42015-11-27 14:09:07 +0100150void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder,
philipel5908c712015-12-21 08:23:20 -0800151 uint8_t payloadType,
152 bool internalSource /*= false*/) {
perkjefd902c2016-07-14 02:33:20 -0700153 RTC_DCHECK(main_thread_.CalledOnValidThread());
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000154
Peter Boström233bfd22016-01-18 20:23:40 +0100155 rtc::CritScope lock(&encoder_crit_);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000156
mflodmanfcf54bd2015-04-14 21:28:08 +0200157 if (externalEncoder == nullptr) {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000158 bool wasSendCodec = false;
Peter Boström795dbe42015-11-27 14:09:07 +0100159 RTC_CHECK(
160 _codecDataBase.DeregisterExternalEncoder(payloadType, &wasSendCodec));
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000161 if (wasSendCodec) {
162 // Make sure the VCM doesn't use the de-registered codec
Peter Boström233bfd22016-01-18 20:23:40 +0100163 rtc::CritScope params_lock(&params_crit_);
mflodmanfcf54bd2015-04-14 21:28:08 +0200164 _encoder = nullptr;
Peter Boström233bfd22016-01-18 20:23:40 +0100165 encoder_has_internal_source_ = false;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000166 }
Peter Boström795dbe42015-11-27 14:09:07 +0100167 return;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000168 }
philipel5908c712015-12-21 08:23:20 -0800169 _codecDataBase.RegisterExternalEncoder(externalEncoder, payloadType,
170 internalSource);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000171}
172
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000173// Get encode bitrate
174int VideoSender::Bitrate(unsigned int* bitrate) const {
perkjefd902c2016-07-14 02:33:20 -0700175 RTC_DCHECK(main_thread_.CalledOnValidThread());
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000176 // Since we're running on the thread that's the only thread known to modify
177 // the value of _encoder, we don't need to grab the lock here.
178
Peter Boström69ccb332015-10-29 16:30:23 +0100179 if (!_encoder)
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000180 return VCM_UNINITIALIZED;
Peter Boström69ccb332015-10-29 16:30:23 +0100181 *bitrate = _encoder->GetEncoderParameters().target_bitrate;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000182 return 0;
183}
184
185// Get encode frame rate
186int VideoSender::FrameRate(unsigned int* framerate) const {
perkjefd902c2016-07-14 02:33:20 -0700187 RTC_DCHECK(main_thread_.CalledOnValidThread());
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000188 // Since we're running on the thread that's the only thread known to modify
189 // the value of _encoder, we don't need to grab the lock here.
190
Peter Boström69ccb332015-10-29 16:30:23 +0100191 if (!_encoder)
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000192 return VCM_UNINITIALIZED;
Peter Boström69ccb332015-10-29 16:30:23 +0100193
194 *framerate = _encoder->GetEncoderParameters().input_frame_rate;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000195 return 0;
196}
197
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000198int32_t VideoSender::SetChannelParameters(uint32_t target_bitrate,
199 uint8_t lossRate,
pkasting@chromium.org16825b12015-01-12 21:51:21 +0000200 int64_t rtt) {
Per69b332d2016-06-02 15:45:42 +0200201 uint32_t target_rate =
202 _mediaOpt.SetTargetRates(target_bitrate, lossRate, rtt);
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000203
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000204 uint32_t input_frame_rate = _mediaOpt.InputFrameRate();
205
noahricd4badbc2016-04-13 14:59:48 -0700206 EncoderParameters encoder_params = {target_rate, lossRate, rtt,
207 input_frame_rate};
208 bool encoder_has_internal_source;
209 {
210 rtc::CritScope cs(&params_crit_);
211 encoder_params_ = encoder_params;
212 encoder_has_internal_source = encoder_has_internal_source_;
213 }
214
215 // For encoders with internal sources, we need to tell the encoder directly,
216 // instead of waiting for an AddVideoFrame that will never come (internal
217 // source encoders don't get input frames).
218 if (encoder_has_internal_source) {
219 rtc::CritScope cs(&encoder_crit_);
220 if (_encoder) {
perkj57c21f92016-06-17 07:27:16 -0700221 SetEncoderParameters(encoder_params, encoder_has_internal_source);
noahricd4badbc2016-04-13 14:59:48 -0700222 }
223 }
Erik Språng66a641a2015-06-11 14:20:07 +0200224
225 return VCM_OK;
226}
227
perkj57c21f92016-06-17 07:27:16 -0700228void VideoSender::SetEncoderParameters(EncoderParameters params,
229 bool has_internal_source) {
perkjfea93092016-05-14 00:58:48 -0700230 // |target_bitrate == 0 | means that the network is down or the send pacer is
perkj57c21f92016-06-17 07:27:16 -0700231 // full. We currently only report this if the encoder has an internal source.
232 // If the encoder does not have an internal source, higher levels are expected
233 // to not call AddVideoFrame. We do this since its unclear how current
234 // encoder implementations behave when given a zero target bitrate.
235 // TODO(perkj): Make sure all known encoder implementations handle zero
236 // target bitrate and remove this check.
237 if (!has_internal_source && params.target_bitrate == 0)
Peter Boströmdcb89982015-09-15 14:43:47 +0200238 return;
tommi@webrtc.org558dc402015-03-07 20:55:56 +0000239
Erik Språng66a641a2015-06-11 14:20:07 +0200240 if (params.input_frame_rate == 0) {
241 // No frame rate estimate available, use default.
242 params.input_frame_rate = current_codec_.maxFramerate;
243 }
Peter Boström69ccb332015-10-29 16:30:23 +0100244 if (_encoder != nullptr)
245 _encoder->SetEncoderParameters(params);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000246}
247
Per69b332d2016-06-02 15:45:42 +0200248// Deprecated:
249// TODO(perkj): Remove once no projects call this method. It currently do
250// nothing.
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000251int32_t VideoSender::RegisterProtectionCallback(
andresp@webrtc.orge682aa52013-12-19 10:59:48 +0000252 VCMProtectionCallback* protection_callback) {
Per69b332d2016-06-02 15:45:42 +0200253 // Deprecated:
254 // TODO(perkj): Remove once no projects call this method. It currently do
255 // nothing.
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000256 return VCM_OK;
257}
258
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000259// Add one raw video frame to the encoder, blocking.
Miguel Casas-Sanchez47650702015-05-29 17:21:40 -0700260int32_t VideoSender::AddVideoFrame(const VideoFrame& videoFrame,
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000261 const CodecSpecificInfo* codecSpecificInfo) {
Peter Boströmdcb89982015-09-15 14:43:47 +0200262 EncoderParameters encoder_params;
Peter Boström233bfd22016-01-18 20:23:40 +0100263 std::vector<FrameType> next_frame_types;
perkj57c21f92016-06-17 07:27:16 -0700264 bool encoder_has_internal_source = false;
Peter Boströmdcb89982015-09-15 14:43:47 +0200265 {
Peter Boström233bfd22016-01-18 20:23:40 +0100266 rtc::CritScope lock(&params_crit_);
Peter Boströmdcb89982015-09-15 14:43:47 +0200267 encoder_params = encoder_params_;
Peter Boström233bfd22016-01-18 20:23:40 +0100268 next_frame_types = next_frame_types_;
perkj57c21f92016-06-17 07:27:16 -0700269 encoder_has_internal_source = encoder_has_internal_source_;
Peter Boströmdcb89982015-09-15 14:43:47 +0200270 }
Peter Boström233bfd22016-01-18 20:23:40 +0100271 rtc::CritScope lock(&encoder_crit_);
Peter Boström69ccb332015-10-29 16:30:23 +0100272 if (_encoder == nullptr)
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000273 return VCM_UNINITIALIZED;
perkj57c21f92016-06-17 07:27:16 -0700274 SetEncoderParameters(encoder_params, encoder_has_internal_source);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000275 if (_mediaOpt.DropFrame()) {
isheriff7620be82016-03-06 23:22:33 -0800276 LOG(LS_VERBOSE) << "Drop Frame "
277 << "target bitrate " << encoder_params.target_bitrate
278 << " loss rate " << encoder_params.loss_rate << " rtt "
279 << encoder_params.rtt << " input frame rate "
280 << encoder_params.input_frame_rate;
jackychen61b4d512015-04-21 15:30:11 -0700281 _encoder->OnDroppedFrame();
stefan@webrtc.org34c5da62014-04-11 14:08:35 +0000282 return VCM_OK;
283 }
pbos@webrtc.org67a9e402015-03-05 13:57:37 +0000284 // TODO(pbos): Make sure setting send codec is synchronized with video
285 // processing so frame size always matches.
286 if (!_codecDataBase.MatchesCurrentResolution(videoFrame.width(),
287 videoFrame.height())) {
288 LOG(LS_ERROR) << "Incoming frame doesn't match set resolution. Dropping.";
289 return VCM_PARAMETER_ERROR;
290 }
Peter Boströmeb66e802015-06-05 11:08:03 +0200291 VideoFrame converted_frame = videoFrame;
nisse26acec42016-04-15 03:43:39 -0700292 if (converted_frame.video_frame_buffer()->native_handle() &&
293 !_encoder->SupportsNativeHandle()) {
Peter Boströmeb66e802015-06-05 11:08:03 +0200294 // This module only supports software encoding.
295 // TODO(pbos): Offload conversion from the encoder thread.
nisseca6d5d12016-06-17 05:03:04 -0700296 rtc::scoped_refptr<VideoFrameBuffer> converted_buffer(
297 converted_frame.video_frame_buffer()->NativeToI420Buffer());
298
299 if (!converted_buffer) {
300 LOG(LS_ERROR) << "Frame conversion failed, dropping frame.";
301 return VCM_PARAMETER_ERROR;
302 }
303 converted_frame = VideoFrame(converted_buffer,
304 converted_frame.timestamp(),
305 converted_frame.render_time_ms(),
306 converted_frame.rotation());
Peter Boströmeb66e802015-06-05 11:08:03 +0200307 }
stefan@webrtc.org34c5da62014-04-11 14:08:35 +0000308 int32_t ret =
Peter Boström233bfd22016-01-18 20:23:40 +0100309 _encoder->Encode(converted_frame, codecSpecificInfo, next_frame_types);
stefan@webrtc.org34c5da62014-04-11 14:08:35 +0000310 if (ret < 0) {
311 LOG(LS_ERROR) << "Failed to encode frame. Error code: " << ret;
312 return ret;
313 }
perkj376b1922016-05-02 11:35:24 -0700314
Peter Boström233bfd22016-01-18 20:23:40 +0100315 {
Peter Boström233bfd22016-01-18 20:23:40 +0100316 rtc::CritScope lock(&params_crit_);
perkj376b1922016-05-02 11:35:24 -0700317 encoder_name_ = _encoder->ImplementationName();
318
319 // Change all keyframe requests to encode delta frames the next time.
Peter Boström233bfd22016-01-18 20:23:40 +0100320 for (size_t i = 0; i < next_frame_types_.size(); ++i) {
321 // Check for equality (same requested as before encoding) to not
322 // accidentally drop a keyframe request while encoding.
323 if (next_frame_types[i] == next_frame_types_[i])
324 next_frame_types_[i] = kVideoFrameDelta;
325 }
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000326 }
327 return VCM_OK;
328}
329
perkj600246e2016-05-04 11:26:51 -0700330int32_t VideoSender::IntraFrameRequest(size_t stream_index) {
Peter Boström233bfd22016-01-18 20:23:40 +0100331 {
332 rtc::CritScope lock(&params_crit_);
perkj600246e2016-05-04 11:26:51 -0700333 if (stream_index >= next_frame_types_.size()) {
Peter Boström233bfd22016-01-18 20:23:40 +0100334 return -1;
335 }
336 next_frame_types_[stream_index] = kVideoFrameKey;
337 if (!encoder_has_internal_source_)
338 return VCM_OK;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000339 }
Peter Boström233bfd22016-01-18 20:23:40 +0100340 // TODO(pbos): Remove when InternalSource() is gone. Both locks have to be
341 // held here for internal consistency, since _encoder could be removed while
342 // not holding encoder_crit_. Checks have to be performed again since
343 // params_crit_ was dropped to not cause lock-order inversions with
344 // encoder_crit_.
345 rtc::CritScope lock(&encoder_crit_);
346 rtc::CritScope params_lock(&params_crit_);
perkj600246e2016-05-04 11:26:51 -0700347 if (stream_index >= next_frame_types_.size())
Peter Boström233bfd22016-01-18 20:23:40 +0100348 return -1;
mflodmanfcf54bd2015-04-14 21:28:08 +0200349 if (_encoder != nullptr && _encoder->InternalSource()) {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000350 // Try to request the frame if we have an external encoder with
351 // internal source since AddVideoFrame never will be called.
Peter Boström233bfd22016-01-18 20:23:40 +0100352 if (_encoder->RequestFrame(next_frame_types_) == WEBRTC_VIDEO_CODEC_OK) {
353 // Try to remove just-performed keyframe request, if stream still exists.
354 next_frame_types_[stream_index] = kVideoFrameDelta;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000355 }
356 }
357 return VCM_OK;
358}
359
360int32_t VideoSender::EnableFrameDropper(bool enable) {
Peter Boström233bfd22016-01-18 20:23:40 +0100361 rtc::CritScope lock(&encoder_crit_);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000362 frame_dropper_enabled_ = enable;
363 _mediaOpt.EnableFrameDropper(enable);
364 return VCM_OK;
365}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000366} // namespace vcm
367} // namespace webrtc