zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unconditionally build VP9 support.

Browse Source 
Broken for PeerConnection either way (since VP9 support is announced)
and would fail on a CHECK apart from generating incorrect
offers/answers. This isn't a flag that we want to support, so it's
better to remove the foot-shooting gun.

BUG=
R=asapersson@webrtc.org, kjellander@webrtc.org, phoglund@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1451663002 .

Cr-Commit-Position: refs/heads/master@{#10676}
This commit is contained in:
Peter Boström
2015-11-17 15:27:32 +01:00
parent 18adf0a79d
commit bd05f0ba52
5 changed files with 23 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
webrtc/modules/video_coding/codecs/vp9/vp9.gyp
View File

@ -14,32 +14,26 @@
{
'target_name': 'webrtc_vp9',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
'conditions': [
['build_libvpx==1', {
'dependencies': [
'<(libvpx_dir)/libvpx.gyp:libvpx_new',
],
}],
['build_vp9==1', {
'sources': [
'include/vp9.h',
'screenshare_layers.cc',
'screenshare_layers.h',
'vp9_frame_buffer_pool.cc',
'vp9_frame_buffer_pool.h',
'vp9_impl.cc',
'vp9_impl.h',
],
}, {
'sources': [
'vp9_dummy_impl.cc',
],
}],
],
'dependencies': [
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
'sources': [
'include/vp9.h',
'screenshare_layers.cc',
'screenshare_layers.h',
'vp9_frame_buffer_pool.cc',
'vp9_frame_buffer_pool.h',
'vp9_impl.cc',
'vp9_impl.h',
],
},
],

19
webrtc/modules/video_coding/codecs/vp9/vp9_dummy_impl.cc
View File

@ -1,19 +0,0 @@
/*
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*
*/
// This file contains an implementation of empty webrtc VP9 encoder/decoder
// factories so it is possible to build webrtc without linking with vp9.
#include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h"
namespace webrtc {
VP9Encoder* VP9Encoder::Create() { return nullptr; }
VP9Decoder* VP9Decoder::Create() { return nullptr; }
}