| Index: content/renderer/media_recorder/video_track_recorder.cc
|
| diff --git a/content/renderer/media_recorder/video_track_recorder.cc b/content/renderer/media_recorder/video_track_recorder.cc
|
| index 3b1b0a5578ee8617ee68c64058455517a096172e..c18c3683c7573cdbe88d66df3cad5ad0737fa65f 100644
|
| --- a/content/renderer/media_recorder/video_track_recorder.cc
|
| +++ b/content/renderer/media_recorder/video_track_recorder.cc
|
| @@ -30,10 +30,6 @@
|
| #include "third_party/libyuv/include/libyuv.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/windows_version.h"
|
| -#endif
|
| -
|
| #if BUILDFLAG(RTC_USE_H264)
|
| #include "third_party/openh264/src/codec/api/svc/codec_api.h"
|
| #include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
|
| @@ -121,12 +117,6 @@ CodecEnumerator::CodecEnumerator() {
|
| return;
|
| #endif
|
|
|
| -#if defined(OS_WIN)
|
| - // See https://crbug.com/698441.
|
| - if (base::win::GetVersion() < base::win::VERSION_WIN10)
|
| - return;
|
| -#endif
|
| -
|
| content::RenderThreadImpl* const render_thread_impl =
|
| content::RenderThreadImpl::current();
|
| if (!render_thread_impl) {
|
| @@ -1303,6 +1293,11 @@ void VideoTrackRecorder::InitializeEncoder(
|
| DVLOG(3) << __func__ << frame->visible_rect().size().ToString();
|
| DCHECK(main_render_thread_checker_.CalledOnValidThread());
|
|
|
| + // Avoid reinitializing |encoder_| when there are multiple frames sent to the
|
| + // sink to initialize, https://crbug.com/698441.
|
| + if (encoder_)
|
| + return;
|
| +
|
| MediaStreamVideoSink::DisconnectFromTrack();
|
|
|
| const gfx::Size& input_size = frame->visible_rect().size();
|
|
|