| Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
| diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
| index 41e937be5623578c8d7dee08949979b156ab3062..ef0b0b800a37cf7aa38283dce8e03d002d18453c 100644
|
| --- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
| +++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
|
| @@ -235,9 +235,11 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(
|
| std::unique_ptr<cricket::WebRtcVideoEncoderFactory> encoder_factory;
|
|
|
| const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
| - if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
|
| - if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
|
| + if (gpu_factories) {
|
| + if (gpu_factories->IsGpuVideoDecodeAcceleratorEnabled() &&
|
| + !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
|
| decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
|
| + }
|
|
|
| if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
|
| encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
|
|
|