zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix no_exit_time_destructors in ortc.

Browse Source 
Non trivially destructible objects with static storage are disallowed
by the style guide.

This CL just removes 'static' since these objects are constructed once
or twice in the entire application.

Bug: webrtc:9693
Change-Id: I7509e2c088dd5ec0ac13f08053ecb76cf8259d90
Reviewed-on: https://webrtc-review.googlesource.com/98840
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24634}
This commit is contained in:
Mirko Bonadei
2018-09-07 22:15:07 +02:00
committed by Commit Bot
parent d7b79af9df
commit 5af3051f84
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ortc/BUILD.gn
View File

@ -14,7 +14,6 @@ if (is_android) {
rtc_static_library("ortc") {
defines = []
configs += [ "..:no_exit_time_destructors" ]
sources = [
"ortcfactory.cc",
"ortcfactory.h",

5
ortc/rtptransportcontrolleradapter.cc
View File

@ -626,9 +626,8 @@ RtpTransportControllerAdapter::RtpTransportControllerAdapter(
// currently reject empty lists of codecs. Note that these codecs will never
// actually be used, because when parameters are set, the dummy codecs will
// be replaced by actual codecs before any send/receive streams are created.
static const cricket::AudioCodec dummy_audio(0, cricket::kPcmuCodecName, 8000,
0, 1);
static const cricket::VideoCodec dummy_video(96, cricket::kVp8CodecName);
const cricket::AudioCodec dummy_audio(0, cricket::kPcmuCodecName, 8000, 0, 1);
const cricket::VideoCodec dummy_video(96, cricket::kVp8CodecName);
local_audio_description_.AddCodec(dummy_audio);
remote_audio_description_.AddCodec(dummy_audio);
local_video_description_.AddCodec(dummy_video);