Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: webrtc/media/engine/fakewebrtccall.cc

Issue 2248713003: Revert of Add task queue to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_getpadding
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtccall.cc
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc
index 193831598c2f6a6e52126fafea41384bf0c7d7df..fdf7cf36fc4bb678d09d9dc6a66c00a2c24a9d8f 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -98,22 +98,21 @@
}
FakeVideoSendStream::FakeVideoSendStream(
- webrtc::VideoSendStream::Config config,
- webrtc::VideoEncoderConfig encoder_config)
+ const webrtc::VideoSendStream::Config& config,
+ const webrtc::VideoEncoderConfig& encoder_config)
: sending_(false),
- config_(std::move(config)),
+ config_(config),
codec_settings_set_(false),
num_swapped_frames_(0) {
RTC_DCHECK(config.encoder_settings.encoder != NULL);
- ReconfigureVideoEncoder(std::move(encoder_config));
-}
-
-const webrtc::VideoSendStream::Config& FakeVideoSendStream::GetConfig() const {
+ ReconfigureVideoEncoder(encoder_config);
+}
+
+webrtc::VideoSendStream::Config FakeVideoSendStream::GetConfig() const {
return config_;
}
-const webrtc::VideoEncoderConfig& FakeVideoSendStream::GetEncoderConfig()
- const {
+webrtc::VideoEncoderConfig FakeVideoSendStream::GetEncoderConfig() const {
return encoder_config_;
}
@@ -178,7 +177,8 @@
}
void FakeVideoSendStream::ReconfigureVideoEncoder(
- webrtc::VideoEncoderConfig config) {
+ const webrtc::VideoEncoderConfig& config) {
+ encoder_config_ = config;
if (config.encoder_specific_settings != NULL) {
if (config_.encoder_settings.payload_name == "VP8") {
vpx_settings_.vp8 = *reinterpret_cast<const webrtc::VideoCodecVP8*>(
@@ -199,7 +199,6 @@
<< config_.encoder_settings.payload_name;
}
}
- encoder_config_ = std::move(config);
codec_settings_set_ = config.encoder_specific_settings != NULL;
++num_encoder_reconfigurations_;
}
@@ -360,10 +359,10 @@
}
webrtc::VideoSendStream* FakeCall::CreateVideoSendStream(
- webrtc::VideoSendStream::Config config,
- webrtc::VideoEncoderConfig encoder_config) {
+ const webrtc::VideoSendStream::Config& config,
+ const webrtc::VideoEncoderConfig& encoder_config) {
FakeVideoSendStream* fake_stream =
- new FakeVideoSendStream(std::move(config), std::move(encoder_config));
+ new FakeVideoSendStream(config, encoder_config);
video_send_streams_.push_back(fake_stream);
++num_created_send_streams_;
return fake_stream;
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698