talk/media/webrtc/webrtcvideoengine2.cc - Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg

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: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Re-enable H264 in video_loopback and screenshare_loopback after rebase (video_quality_test) Created 5 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:

Index: talk/media/webrtc/webrtcvideoengine2.cc

diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc

index 0ee1d7b85b576d0a964fd1b49523af71cf89187d..119508fa766ba8bf2c44d065af49e33865fed0c3 100644

--- a/talk/media/webrtc/webrtcvideoengine2.cc

+++ b/talk/media/webrtc/webrtcvideoengine2.cc

@@ -494,6 +494,11 @@ void* WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings(

options.video_noise_reduction.Get(&denoising);

}

+ if (CodecNamesEq(codec.name, kH264CodecName)) {

+ encoder_settings_.h264 = webrtc::VideoEncoder::GetDefaultH264Settings();

+ encoder_settings_.h264.frameDroppingOn = frame_dropping;

+ return &encoder_settings_.h264;

+ }

if (CodecNamesEq(codec.name, kVp8CodecName)) {

encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings();

encoder_settings_.vp8.automaticResizeOn = automatic_resize;