webrtc/media/engine/webrtcvideoengine2.cc - Issue 1970343002: Make sure WebRTC works without libvpx VP9 support.

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

Issue 1970343002: Make sure WebRTC works without libvpx VP9 support. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: add test to make sure VP9 support isn't announced Created 4 years, 7 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

Index: webrtc/media/engine/webrtcvideoengine2.cc

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

index 785ec692e6a26147f476da8810fb96c419b8cbf1..fc623fd0779babade485008f0119b716bfb7f178 100644

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

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

@@ -28,6 +28,7 @@

#include "webrtc/media/engine/webrtcvideoframe.h"

#include "webrtc/media/engine/webrtcvoiceengine.h"

#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"

+#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"

kjellander_webrtc 2016/05/13 05:26:15 nit: Sort 9 > 8

pbos-webrtc 2016/05/14 00:03:06 Done.

#include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"

#include "webrtc/system_wrappers/include/field_trial.h"

#include "webrtc/video_decoder.h"

@@ -159,7 +160,8 @@ bool CodecIsInternallySupported(const std::string& codec_name) {

return true;

}

if (CodecNamesEq(codec_name, kVp9CodecName)) {

- return true;

+ return webrtc::VP9Encoder::IsSupported() &&

+ webrtc::VP9Decoder::IsSupported();

}

if (CodecNamesEq(codec_name, kH264CodecName)) {

return webrtc::H264Encoder::IsSupported() &&

« no previous file with comments | « webrtc/build/common.gypi ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | webrtc/modules/modules.gyp » ('J')