Index: content/renderer/media/video_track_recorder.cc |
diff --git a/content/renderer/media/video_track_recorder.cc b/content/renderer/media/video_track_recorder.cc |
index c92c7b66a24e5ee4613332ca2c7ff7ea033e6e76..39f8000eb0dc93b97ceb443d68ddc6eeaf70e81e 100644 |
--- a/content/renderer/media/video_track_recorder.cc |
+++ b/content/renderer/media/video_track_recorder.cc |
@@ -101,8 +101,10 @@ class CodecEnumerator { |
DISALLOW_COPY_AND_ASSIGN(CodecEnumerator); |
}; |
-static base::LazyInstance<CodecEnumerator>::Leaky g_codec_enumerator = |
- LAZY_INSTANCE_INITIALIZER; |
+static CodecEnumerator* GetCodecEnumerator() { |
Mark Mentovai
2017/01/31 21:33:56
No need to write “static” in an unnamed namespace.
DaleCurtis
2017/01/31 22:04:33
Done.
|
+ static CodecEnumerator* enumerator = new CodecEnumerator(); |
+ return enumerator; |
+} |
CodecEnumerator::CodecEnumerator() { |
#if defined(OS_CHROMEOS) |
@@ -1118,7 +1120,7 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { |
// static |
VideoTrackRecorder::CodecId VideoTrackRecorder::GetPreferredCodecId() { |
- return g_codec_enumerator.Get().GetPreferredCodecId(); |
+ return GetCodecEnumerator()->GetPreferredCodecId(); |
} |
VideoTrackRecorder::VideoTrackRecorder( |
@@ -1190,7 +1192,7 @@ void VideoTrackRecorder::InitializeEncoder( |
const gfx::Size& input_size = frame->visible_rect().size(); |
const auto& vea_supported_profile = |
- g_codec_enumerator.Get().CodecIdToVEAProfile(codec); |
+ GetCodecEnumerator()->CodecIdToVEAProfile(codec); |
if (vea_supported_profile != media::VIDEO_CODEC_PROFILE_UNKNOWN && |
input_size.width() >= kVEAEncoderMinResolutionWidth && |
input_size.height() >= kVEAEncoderMinResolutionHeight) { |