d6024e3c34
Our perf test suite webrtc_perf_tests timed out, which caused most of the delay landing this (https://crbug.comn/535973 and https://codereview.chromium.org/1370133004). Other problems with executing Android tests also needed to be resolved in order to land this (http://crbug.com/534849). Libvpx has moved from third_party/libvpx to third_party/libvpx_new as of https://codereview.chromium.org/1323333002/ Android GN was blocking this roll due to a problem that ended up being caused by a bug (http://crbug.com/534849). Relevant changes: * src/buildtools: f7310ee..8d89c1b * src/third_party/boringssl/src: 1d128f3..4c60d35 * src/third_party/icu: 6b3ce81..423fc7e * src/third_party/libjpeg_turbo: 631e2dd..e4e7503 * src/third_party/libvpx: ac1772e..70db223 * src/third_party/libyuv: fcacbfb..62c49dc * src/tools/gyp: 5d01a8c..01528c7 * src/tools/swarming_client: 77f720b..6e5d2b2 Details:310ea93..8cf53d6/DEPS Clang version changed 245965:247874 Details:310ea93..8cf53d6/tools/clang/scripts/update.sh BUG=481034, 535973 TBR=marpan@webrtc.org Review URL: https://codereview.webrtc.org/1355083002 Cr-Commit-Position: refs/heads/master@{#10101}
77 lines
2.4 KiB
Python
77 lines
2.4 KiB
Python
# Copyright (c) 2012 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.
|
|
|
|
{
|
|
'includes': [
|
|
'../../../../build/common.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
'target_name': 'webrtc_vp8',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'<(webrtc_root)/common.gyp:webrtc_common',
|
|
'<(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',
|
|
],
|
|
}],
|
|
],
|
|
'sources': [
|
|
'default_temporal_layers.cc',
|
|
'default_temporal_layers.h',
|
|
'include/vp8.h',
|
|
'include/vp8_common_types.h',
|
|
'realtime_temporal_layers.cc',
|
|
'reference_picture_selection.cc',
|
|
'reference_picture_selection.h',
|
|
'screenshare_layers.cc',
|
|
'screenshare_layers.h',
|
|
'simulcast_encoder_adapter.cc',
|
|
'simulcast_encoder_adapter.h',
|
|
'temporal_layers.h',
|
|
'vp8_factory.cc',
|
|
'vp8_factory.h',
|
|
'vp8_impl.cc',
|
|
'vp8_impl.h',
|
|
],
|
|
# Disable warnings to enable Win64 build, issue 1323.
|
|
'msvs_disabled_warnings': [
|
|
4267, # size_t to int truncation.
|
|
],
|
|
},
|
|
], # targets
|
|
'conditions': [
|
|
['include_tests==1', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'vp8_coder',
|
|
'type': 'executable',
|
|
'dependencies': [
|
|
'webrtc_vp8',
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
'<(webrtc_root)/test/metrics.gyp:metrics',
|
|
'<(DEPTH)/testing/gtest.gyp:gtest',
|
|
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
|
|
'<(webrtc_root)/test/test.gyp:test_support_main',
|
|
'<(webrtc_root)/tools/internal_tools.gyp:command_line_parser',
|
|
],
|
|
'sources': [
|
|
'vp8_sequence_coder.cc',
|
|
],
|
|
},
|
|
], # targets
|
|
}], # include_tests
|
|
],
|
|
}
|