Fix no_exit_time_destructors in ortc.
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}diff --git a/ortc/BUILD.gn b/ortc/BUILD.gn
index be7b1fb..d0fb00f 100644
--- a/ortc/BUILD.gn
+++ b/ortc/BUILD.gn
@@ -14,7 +14,6 @@
rtc_static_library("ortc") {
defines = []
- configs += [ "..:no_exit_time_destructors" ]
sources = [
"ortcfactory.cc",
"ortcfactory.h",
diff --git a/ortc/rtptransportcontrolleradapter.cc b/ortc/rtptransportcontrolleradapter.cc
index e4c9ea2..853adf1 100644
--- a/ortc/rtptransportcontrolleradapter.cc
+++ b/ortc/rtptransportcontrolleradapter.cc
@@ -626,9 +626,8 @@
// 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);
