generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dangling pointer in screenshare_loopback

Browse Source 
BUG=
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/52369004

Cr-Commit-Position: refs/heads/master@{#9098}
This commit is contained in:
Erik Språng 2015-04-28 14:00:58 +02:00
parent beb9798ab4
commit 9d657cfd66
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/video/screenshare_loopback.cc
View File

@ -109,7 +109,12 @@ DEFINE_string(
class ScreenshareLoopback : public test::Loopback {
public:
explicit ScreenshareLoopback(const Config& config) : Loopback(config) {}
explicit ScreenshareLoopback(const Config& config) : Loopback(config) {
vp8_settings_ = VideoEncoder::GetDefaultVp8Settings();
vp8_settings_.denoisingOn = false;
vp8_settings_.frameDroppingOn = false;
vp8_settings_.numberOfTemporalLayers = 2;
}
virtual ~ScreenshareLoopback() {}
protected:
@ -118,11 +123,7 @@ class ScreenshareLoopback : public test::Loopback {
VideoStream* stream = &encoder_config.streams[0];
encoder_config.content_type = VideoEncoderConfig::ContentType::kScreen;
encoder_config.min_transmit_bitrate_bps = flags::MinTransmitBitrate();
VideoCodecVP8 vp8_settings = VideoEncoder::GetDefaultVp8Settings();
vp8_settings.denoisingOn = false;
vp8_settings.frameDroppingOn = false;
vp8_settings.numberOfTemporalLayers = 2;
encoder_config.encoder_specific_settings = &vp8_settings;
encoder_config.encoder_specific_settings = &vp8_settings_;
stream->temporal_layer_thresholds_bps.clear();
stream->target_bitrate_bps =
static_cast<int>(config_.start_bitrate_kbps) * 1000;
@ -145,6 +146,8 @@ class ScreenshareLoopback : public test::Loopback {
EXPECT_TRUE(capturer->Init());
return capturer;
}
VideoCodecVP8 vp8_settings_;
};
void Loopback() {