content/renderer/media/webrtc/peer_connection_dependency_factory.cc - Issue 2358683002: Android: enable/disable WebRTC HW H264 with a flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Issue 2358683002: Android: enable/disable WebRTC HW H264 with a flag. (Closed)

Patch Set: expanding existing switch flag instead of add one more feature Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/renderer/media/gpu/rtc_video_encoder_factory.cc ('K') | « content/renderer/media/gpu/rtc_video_encoder_factory.cc ('k') | media/base/android/java/src/org/chromium/media/MediaCodecBridge.java » ('j') | media/base/android/java/src/org/chromium/media/MediaCodecUtil.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 065993d290c91daf53c22407dd568f2d31217a08..ea6bf0638eb0ee44689a4565b9333dabd6b22459 100644

--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc

@@ -257,7 +257,9 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(

if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))

decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));

- if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))

+ if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding) ||

+ !cmd_line->GetSwitchValueASCII(switches::kDisableWebRtcHWEncoding)

DaleCurtis 2016/09/29 00:31:36 Multiline if needs {}

braveyao 2016/09/29 19:26:26 Done.

+ .empty())

encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));

}