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

Unified Diff: webrtc/video/video_quality_test.cc

Issue 2047513002: Add proper lifetime of encoder-specific settings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: feedback 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
Index: webrtc/video/video_quality_test.cc
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 66210d08643e62fc93bccff52f0eea2ba70f8b04..e292578dc3627d7b2c541a5950102f089458c8be 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -913,21 +913,23 @@ void VideoQualityTest::SetupScreenshare() {
// Fill out codec settings.
video_encoder_config_.content_type = VideoEncoderConfig::ContentType::kScreen;
if (params_.common.codec == "VP8") {
- codec_settings_.VP8 = VideoEncoder::GetDefaultVp8Settings();
- codec_settings_.VP8.denoisingOn = false;
- codec_settings_.VP8.frameDroppingOn = false;
- codec_settings_.VP8.numberOfTemporalLayers =
+ VideoCodecVP8 vp8_settings = VideoEncoder::GetDefaultVp8Settings();
+ vp8_settings.denoisingOn = false;
+ vp8_settings.frameDroppingOn = false;
+ vp8_settings.numberOfTemporalLayers =
static_cast<unsigned char>(params_.common.num_temporal_layers);
- video_encoder_config_.encoder_specific_settings = &codec_settings_.VP8;
+ video_encoder_config_.encoder_specific_settings = new rtc::RefCountedObject<
+ VideoEncoderConfig::Vp8EncoderSpecificSettings>(vp8_settings);
} else if (params_.common.codec == "VP9") {
- codec_settings_.VP9 = VideoEncoder::GetDefaultVp9Settings();
- codec_settings_.VP9.denoisingOn = false;
- codec_settings_.VP9.frameDroppingOn = false;
- codec_settings_.VP9.numberOfTemporalLayers =
+ VideoCodecVP9 vp9_settings = VideoEncoder::GetDefaultVp9Settings();
+ vp9_settings.denoisingOn = false;
+ vp9_settings.frameDroppingOn = false;
+ vp9_settings.numberOfTemporalLayers =
static_cast<unsigned char>(params_.common.num_temporal_layers);
- video_encoder_config_.encoder_specific_settings = &codec_settings_.VP9;
- codec_settings_.VP9.numberOfSpatialLayers =
+ vp9_settings.numberOfSpatialLayers =
static_cast<unsigned char>(params_.ss.num_spatial_layers);
+ video_encoder_config_.encoder_specific_settings = new rtc::RefCountedObject<
+ VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
}
// Setup frame generator.

Powered by Google App Engine
This is Rietveld 408576698