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

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

Issue 2347843002: Add proper lifetime of encoder-specific settings (Closed)
Patch Set: nitpicks Created 4 years, 3 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/config.cc ('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 9437fa0fbaec234ec1d81d6815e0da795a84240f..9670f1371066318e68ea413de7c0b7d9b05387d6 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -186,15 +186,13 @@ void FakeVideoSendStream::ReconfigureVideoEncoder(
webrtc::VideoEncoderConfig config) {
if (config.encoder_specific_settings != NULL) {
if (config_.encoder_settings.payload_name == "VP8") {
- vpx_settings_.vp8 = *reinterpret_cast<const webrtc::VideoCodecVP8*>(
- config.encoder_specific_settings);
+ config.encoder_specific_settings->FillVideoCodecVp8(&vpx_settings_.vp8);
if (!config.streams.empty()) {
vpx_settings_.vp8.numberOfTemporalLayers = static_cast<unsigned char>(
config.streams.back().temporal_layer_thresholds_bps.size() + 1);
}
} else if (config_.encoder_settings.payload_name == "VP9") {
- vpx_settings_.vp9 = *reinterpret_cast<const webrtc::VideoCodecVP9*>(
- config.encoder_specific_settings);
+ config.encoder_specific_settings->FillVideoCodecVp9(&vpx_settings_.vp9);
if (!config.streams.empty()) {
vpx_settings_.vp9.numberOfTemporalLayers = static_cast<unsigned char>(
config.streams.back().temporal_layer_thresholds_bps.size() + 1);
@@ -204,8 +202,8 @@ void FakeVideoSendStream::ReconfigureVideoEncoder(
<< config_.encoder_settings.payload_name;
}
}
- encoder_config_ = std::move(config);
codec_settings_set_ = config.encoder_specific_settings != NULL;
+ encoder_config_ = std::move(config);
++num_encoder_reconfigurations_;
}
« no previous file with comments | « webrtc/config.cc ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698