PRESUBMIT: Improve PyLint check and add GN format check.
Add pylintrc file based on
https://code.google.com/p/chromium/codesearch#chromium/src/tools/perf/pylintrc
bit tightened up quite a bit (the one in depot_tools is far
more relaxed).
Remove a few excluded directories from pylint check and fixed/
suppressed all warnings generated.
Add GN format check + formatted all GN files using 'gn format'.
Cleanup redundant rules in tools/PRESUBMIT.py
TESTED=Ran 'git cl presubmit -vv', fixed the PyLint violations.
Ran it again with a modification in webrtc/build/webrtc.gni, formatted
all the GN files and ran it again.
R=henrika@webrtc.org, phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/50069004
Cr-Commit-Position: refs/heads/master@{#9274}
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 45b05b6..6c6c23c 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -20,13 +20,12 @@
defines += [ "WEBRTC_MOZILLA_BUILD" ]
}
if (build_with_chromium) {
- defines = [
- "WEBRTC_CHROMIUM_BUILD",
- ]
+ defines = [ "WEBRTC_CHROMIUM_BUILD" ]
include_dirs = [
# overrides must be included first as that is the mechanism for
# selecting the override headers in Chromium.
"overrides",
+
# Allow includes to be prefixed with webrtc/ in case it is not an
# immediate subdirectory of the top-level.
"..",
@@ -73,6 +72,7 @@
if (rtc_have_dbus_glib) {
defines += [ "HAVE_DBUS_GLIB" ]
+
# TODO(kjellander): Investigate this, it seems like include <dbus/dbus.h>
# is still not found even if the execution of
# build/config/linux/pkg-config.py dbus-glib-1 returns correct include
@@ -93,6 +93,7 @@
if (current_cpu != "arm64" || !is_android) {
cflags = [
"-Wextra",
+
# We need to repeat some flags from Chromium"s common.gypi
# here that get overridden by -Wextra.
"-Wno-unused-parameter",
@@ -101,6 +102,7 @@
]
cflags_cc = [
"-Wnon-virtual-dtor",
+
# This is enabled for clang; enable for gcc as well.
"-Woverloaded-virtual",
]
@@ -172,7 +174,7 @@
]
configs += [ ":common_config" ]
- public_configs = [ ":common_inherited_config"]
+ public_configs = [ ":common_inherited_config" ]
deps = [
":webrtc_common",
@@ -199,8 +201,8 @@
if (build_with_chromium) {
deps += [
- "modules/video_capture",
- "modules/video_render",
+ "modules/video_capture",
+ "modules/video_render",
]
}
}
@@ -221,8 +223,8 @@
sources = [
"common_types.cc",
"common_types.h",
- "config.h",
"config.cc",
+ "config.h",
"engine_configurations.h",
"typedefs.h",
]
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index d755bb7..44f1347 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -29,9 +29,7 @@
}
config("rtc_base_chromium_config") {
- defines = [
- "NO_MAIN_THREAD_WRAPPING",
- ]
+ defines = [ "NO_MAIN_THREAD_WRAPPING" ]
}
config("openssl_config") {
@@ -54,6 +52,7 @@
#"Foundation.framework", # Already included in //build/config:default_libs.
"Security.framework",
"SystemConfiguration.framework",
+
#"UIKit.framework", # Already included in //build/config:default_libs.
]
}
@@ -61,6 +60,7 @@
config("mac_config") {
libs = [
"Cocoa.framework",
+
#"Foundation.framework", # Already included in //build/config:default_libs.
#"IOKit.framework", # Already included in //build/config:default_libs.
#"Security.framework", # Already included in //build/config:default_libs.
@@ -79,9 +79,13 @@
# WebRTC cannot use as we don't sync src/crypto from Chromium.
group("linux_system_ssl") {
if (use_openssl) {
- deps = [ "//third_party/boringssl" ]
+ deps = [
+ "//third_party/boringssl",
+ ]
} else {
- deps = [ "//net/third_party/nss/ssl:libssl" ]
+ deps = [
+ "//net/third_party/nss/ssl:libssl",
+ ]
public_configs = [
"//net/third_party/nss/ssl:ssl_config",
@@ -182,9 +186,7 @@
":rtc_base_config",
]
- defines = [
- "LOGGING=1",
- ]
+ defines = [ "LOGGING=1" ]
sources = [
"arraysize.h",
@@ -348,9 +350,9 @@
public_configs += [ ":rtc_base_chromium_config" ]
} else {
sources += [
+ "asyncinvoker-inl.h",
"asyncinvoker.cc",
"asyncinvoker.h",
- "asyncinvoker-inl.h",
"bandwidthsmoother.cc",
"bandwidthsmoother.h",
"bind.h",
@@ -382,8 +384,8 @@
"refcount.h",
"referencecountedsingletonfactory.h",
"rollingaccumulator.h",
- "scopedptrcollection.h",
"scoped_ref_ptr.h",
+ "scopedptrcollection.h",
"sec_buffer.h",
"sharedexclusivelock.cc",
"sharedexclusivelock.h",
@@ -398,8 +400,8 @@
"virtualsocketserver.cc",
"virtualsocketserver.h",
"window.h",
- "windowpickerfactory.h",
"windowpicker.h",
+ "windowpickerfactory.h",
]
deps += [ "..:webrtc_common" ]
@@ -524,7 +526,7 @@
libs += [
"log",
- "GLESv2"
+ "GLESv2",
]
}
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index 6169bbc..2fec37c 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -25,7 +25,7 @@
sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
-import test_runner
+import test_runner # pylint: disable=W0406
from pylib.gtest import gtest_config
from pylib.gtest import setup
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index 336f7a1..d03a4ed 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -68,7 +68,6 @@
# Exclude internal ADM since Chromium uses its own IO handling.
rtc_include_internal_audio_device = false
-
} else {
# Settings for the standalone (not-in-Chromium) build.
@@ -109,7 +108,7 @@
# WebRTC builds ARM v7 Neon instruction set optimized code for both iOS and
# Android, which is why we currently cannot use the variables in
# //build/config/arm.gni (since it disables Neon for Android).
- rtc_build_armv7_neon = (current_cpu == "arm" && arm_version >= 7)
+ rtc_build_armv7_neon = current_cpu == "arm" && arm_version >= 7
}
# Make it possible to provide custom locations for some libraries (move these
diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index f6e0144..3d4a332 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -51,9 +51,6 @@
"resampler/sinc_resampler.h",
"ring_buffer.c",
"ring_buffer.h",
- "signal_processing/include/real_fft.h",
- "signal_processing/include/signal_processing_library.h",
- "signal_processing/include/spl_inl.h",
"signal_processing/auto_corr_to_refl_coef.c",
"signal_processing/auto_correlation.c",
"signal_processing/complex_fft_tables.h",
@@ -68,12 +65,15 @@
"signal_processing/get_hanning_window.c",
"signal_processing/get_scaling_square.c",
"signal_processing/ilbc_specific_functions.c",
+ "signal_processing/include/real_fft.h",
+ "signal_processing/include/signal_processing_library.h",
+ "signal_processing/include/spl_inl.h",
"signal_processing/levinson_durbin.c",
"signal_processing/lpc_to_refl_coef.c",
"signal_processing/min_max_operations.c",
"signal_processing/randomization_functions.c",
- "signal_processing/refl_coef_to_lpc.c",
"signal_processing/real_fft.c",
+ "signal_processing/refl_coef_to_lpc.c",
"signal_processing/resample.c",
"signal_processing/resample_48khz.c",
"signal_processing/resample_by_2.c",
@@ -90,7 +90,6 @@
"vad/include/vad.h",
"vad/include/webrtc_vad.h",
"vad/vad.cc",
- "vad/webrtc_vad.c",
"vad/vad_core.c",
"vad/vad_core.h",
"vad/vad_filterbank.c",
@@ -99,15 +98,18 @@
"vad/vad_gmm.h",
"vad/vad_sp.c",
"vad/vad_sp.h",
- "wav_header.cc",
- "wav_header.h",
+ "vad/webrtc_vad.c",
"wav_file.cc",
"wav_file.h",
+ "wav_header.cc",
+ "wav_header.h",
"window_generator.cc",
"window_generator.h",
]
- deps = [ "../system_wrappers" ]
+ deps = [
+ "../system_wrappers",
+ ]
defines = []
if (rtc_use_openmax_dl) {
@@ -141,12 +143,12 @@
if (current_cpu == "mipsel") {
sources += [
- "signal_processing/include/spl_inl_mips.h",
"signal_processing/complex_bit_reverse_mips.c",
"signal_processing/complex_fft_mips.c",
"signal_processing/cross_correlation_mips.c",
"signal_processing/downsample_fast_mips.c",
"signal_processing/filter_ar_fast_q12_mips.c",
+ "signal_processing/include/spl_inl_mips.h",
"signal_processing/min_max_operations_mips.c",
"signal_processing/resample_by_2_mips.c",
"signal_processing/spl_sqrt_floor_mips.c",
@@ -167,9 +169,7 @@
}
if (is_win) {
- cflags = [
- "/wd4334", # Ignore warning on shift operator promotion.
- ]
+ cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion.
}
configs += [ "..:common_config" ]
diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn
index e5cac4d..c8f348a 100644
--- a/webrtc/common_video/BUILD.gn
+++ b/webrtc/common_video/BUILD.gn
@@ -53,7 +53,9 @@
if (rtc_build_libyuv) {
deps += [ "$rtc_libyuv_dir" ]
- public_deps = [ "$rtc_libyuv_dir" ]
+ public_deps = [
+ "$rtc_libyuv_dir",
+ ]
} else {
# Need to add a directory normally exported by libyuv.
include_dirs += [ "$rtc_libyuv_dir/include" ]
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 6593ed6..896b664 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -86,7 +86,9 @@
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
- deps = [ "../..:webrtc_common" ]
+ deps = [
+ "../..:webrtc_common",
+ ]
}
source_set("audio_encoder_interface") {
@@ -96,7 +98,9 @@
]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
- deps = [ "../..:webrtc_common" ]
+ deps = [
+ "../..:webrtc_common",
+ ]
}
config("cng_config") {
@@ -130,9 +134,7 @@
}
config("red_config") {
- include_dirs = [
- "codecs/red",
- ]
+ include_dirs = [ "codecs/red" ]
}
source_set("red") {
@@ -163,12 +165,12 @@
source_set("g711") {
sources = [
- "codecs/g711/include/audio_encoder_pcm.h",
- "codecs/g711/include/g711_interface.h",
"codecs/g711/audio_encoder_pcm.cc",
- "codecs/g711/g711_interface.c",
"codecs/g711/g711.c",
"codecs/g711/g711.h",
+ "codecs/g711/g711_interface.c",
+ "codecs/g711/include/audio_encoder_pcm.h",
+ "codecs/g711/include/g711_interface.h",
]
configs += [ "../..:common_config" ]
@@ -178,7 +180,9 @@
":g711_config",
]
- deps = [ ":audio_encoder_interface" ]
+ deps = [
+ ":audio_encoder_interface",
+ ]
}
config("g722_config") {
@@ -191,12 +195,12 @@
source_set("g722") {
sources = [
"codecs/g722/audio_encoder_g722.cc",
- "codecs/g722/include/audio_encoder_g722.h",
- "codecs/g722/include/g722_interface.h",
- "codecs/g722/g722_interface.c",
- "codecs/g722/g722_encode.c",
"codecs/g722/g722_decode.c",
"codecs/g722/g722_enc_dec.h",
+ "codecs/g722/g722_encode.c",
+ "codecs/g722/g722_interface.c",
+ "codecs/g722/include/audio_encoder_g722.h",
+ "codecs/g722/include/g722_interface.h",
]
configs += [ "../..:common_config" ]
@@ -206,7 +210,9 @@
":g722_config",
]
- deps = [ ":audio_encoder_interface" ]
+ deps = [
+ ":audio_encoder_interface",
+ ]
}
config("ilbc_config") {
@@ -218,28 +224,27 @@
source_set("ilbc") {
sources = [
- "codecs/ilbc/audio_encoder_ilbc.cc",
- "codecs/ilbc/include/audio_encoder_ilbc.h",
"codecs/ilbc/abs_quant.c",
"codecs/ilbc/abs_quant.h",
"codecs/ilbc/abs_quant_loop.c",
"codecs/ilbc/abs_quant_loop.h",
+ "codecs/ilbc/audio_encoder_ilbc.cc",
"codecs/ilbc/augmented_cb_corr.c",
"codecs/ilbc/augmented_cb_corr.h",
"codecs/ilbc/bw_expand.c",
"codecs/ilbc/bw_expand.h",
"codecs/ilbc/cb_construct.c",
"codecs/ilbc/cb_construct.h",
+ "codecs/ilbc/cb_mem_energy.c",
+ "codecs/ilbc/cb_mem_energy.h",
"codecs/ilbc/cb_mem_energy_augmentation.c",
"codecs/ilbc/cb_mem_energy_augmentation.h",
- "codecs/ilbc/cb_mem_energy.c",
"codecs/ilbc/cb_mem_energy_calc.c",
"codecs/ilbc/cb_mem_energy_calc.h",
- "codecs/ilbc/cb_mem_energy.h",
"codecs/ilbc/cb_search.c",
+ "codecs/ilbc/cb_search.h",
"codecs/ilbc/cb_search_core.c",
"codecs/ilbc/cb_search_core.h",
- "codecs/ilbc/cb_search.h",
"codecs/ilbc/cb_update_best_index.c",
"codecs/ilbc/cb_update_best_index.h",
"codecs/ilbc/chebyshev.c",
@@ -263,12 +268,12 @@
"codecs/ilbc/encode.h",
"codecs/ilbc/energy_inverse.c",
"codecs/ilbc/energy_inverse.h",
+ "codecs/ilbc/enh_upsample.c",
+ "codecs/ilbc/enh_upsample.h",
"codecs/ilbc/enhancer.c",
"codecs/ilbc/enhancer.h",
"codecs/ilbc/enhancer_interface.c",
"codecs/ilbc/enhancer_interface.h",
- "codecs/ilbc/enh_upsample.c",
- "codecs/ilbc/enh_upsample.h",
"codecs/ilbc/filtered_cb_vecs.c",
"codecs/ilbc/filtered_cb_vecs.h",
"codecs/ilbc/frame_classify.c",
@@ -288,6 +293,7 @@
"codecs/ilbc/hp_output.c",
"codecs/ilbc/hp_output.h",
"codecs/ilbc/ilbc.c",
+ "codecs/ilbc/include/audio_encoder_ilbc.h",
"codecs/ilbc/index_conv_dec.c",
"codecs/ilbc/index_conv_dec.h",
"codecs/ilbc/index_conv_enc.c",
@@ -397,8 +403,8 @@
"codecs/isac/main/source/codec.h",
"codecs/isac/main/source/crc.c",
"codecs/isac/main/source/crc.h",
- "codecs/isac/main/source/decode_bwe.c",
"codecs/isac/main/source/decode.c",
+ "codecs/isac/main/source/decode_bwe.c",
"codecs/isac/main/source/encode.c",
"codecs/isac/main/source/encode_lpc_swb.c",
"codecs/isac/main/source/encode_lpc_swb.h",
@@ -406,10 +412,10 @@
"codecs/isac/main/source/entropy_coding.h",
"codecs/isac/main/source/fft.c",
"codecs/isac/main/source/fft.h",
- "codecs/isac/main/source/filterbanks.c",
+ "codecs/isac/main/source/filter_functions.c",
"codecs/isac/main/source/filterbank_tables.c",
"codecs/isac/main/source/filterbank_tables.h",
- "codecs/isac/main/source/filter_functions.c",
+ "codecs/isac/main/source/filterbanks.c",
"codecs/isac/main/source/intialize.c",
"codecs/isac/main/source/isac.c",
"codecs/isac/main/source/lattice.c",
@@ -477,17 +483,17 @@
"codecs/isac/fix/source/bandwidth_estimator.c",
"codecs/isac/fix/source/bandwidth_estimator.h",
"codecs/isac/fix/source/codec.h",
- "codecs/isac/fix/source/decode_bwe.c",
"codecs/isac/fix/source/decode.c",
+ "codecs/isac/fix/source/decode_bwe.c",
"codecs/isac/fix/source/decode_plc.c",
"codecs/isac/fix/source/encode.c",
"codecs/isac/fix/source/entropy_coding.c",
"codecs/isac/fix/source/entropy_coding.h",
"codecs/isac/fix/source/fft.c",
"codecs/isac/fix/source/fft.h",
- "codecs/isac/fix/source/filterbanks.c",
"codecs/isac/fix/source/filterbank_tables.c",
"codecs/isac/fix/source/filterbank_tables.h",
+ "codecs/isac/fix/source/filterbanks.c",
"codecs/isac/fix/source/filters.c",
"codecs/isac/fix/source/initialize.c",
"codecs/isac/fix/source/isacfix.c",
@@ -544,17 +550,13 @@
# //build/config/arm.gni instead, to reduce code duplication.
# Remove the -mfpu=vfpv3-d16 cflag.
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
- cflags = [
- "-mfpu=neon",
- ]
+ cflags = [ "-mfpu=neon" ]
sources += [
"codecs/isac/fix/source/lattice_armv7.S",
"codecs/isac/fix/source/pitch_filter_armv6.S",
]
- sources -= [
- "codecs/isac/fix/source/pitch_filter_c.c",
- ]
+ sources -= [ "codecs/isac/fix/source/pitch_filter_c.c" ]
}
if (current_cpu == "mipsel") {
@@ -565,22 +567,16 @@
"codecs/isac/fix/source/pitch_estimator_mips.c",
"codecs/isac/fix/source/transform_mips.c",
]
- sources -= [
- "codecs/isac/fix/source/pitch_estimator_c.c"
- ]
+ sources -= [ "codecs/isac/fix/source/pitch_estimator_c.c" ]
if (mips_dsp_rev > 0) {
- sources += [
- "codecs/isac/fix/source/filterbanks_mips.c"
- ]
+ sources += [ "codecs/isac/fix/source/filterbanks_mips.c" ]
}
if (mips_dsp_rev > 1) {
sources += [
"codecs/isac/fix/source/lpc_masking_model_mips.c",
"codecs/isac/fix/source/pitch_filter_mips.c",
]
- sources -= [
- "codecs/isac/fix/source/pitch_filter_c.c"
- ]
+ sources -= [ "codecs/isac/fix/source/pitch_filter_c.c" ]
}
}
@@ -606,16 +602,14 @@
# //build/config/arm.gni instead, to reduce code duplication.
# Remove the -mfpu=vfpv3-d16 cflag.
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
- cflags = [
- "-mfpu=neon",
- ]
+ cflags = [ "-mfpu=neon" ]
}
if (current_cpu != "arm64" || !is_clang) {
# Disable AllpassFilter2FixDec16Neon function due to a clang bug.
# Refer more details at:
# https://code.google.com/p/webrtc/issues/detail?id=4567
- sources += [ "codecs/isac/fix/source/filterbanks_neon.c", ]
+ sources += [ "codecs/isac/fix/source/filterbanks_neon.c" ]
}
# Disable LTO in audio_processing_neon target due to compiler bug.
@@ -629,7 +623,9 @@
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
- deps = [ "../../common_audio" ]
+ deps = [
+ "../../common_audio",
+ ]
}
}
@@ -642,9 +638,9 @@
source_set("pcm16b") {
sources = [
+ "codecs/pcm16b/audio_encoder_pcm16b.cc",
"codecs/pcm16b/include/audio_encoder_pcm16b.h",
"codecs/pcm16b/include/pcm16b.h",
- "codecs/pcm16b/audio_encoder_pcm16b.cc",
"codecs/pcm16b/pcm16b.c",
]
@@ -674,7 +670,9 @@
"codecs/opus/opus_interface.c",
]
- deps = [ ":audio_encoder_interface" ]
+ deps = [
+ ":audio_encoder_interface",
+ ]
if (rtc_build_opus) {
configs += [ "../..:common_config" ]
@@ -697,7 +695,6 @@
source_set("neteq") {
sources = [
- "neteq/interface/neteq.h",
"neteq/accelerate.cc",
"neteq/accelerate.h",
"neteq/audio_classifier.cc",
@@ -735,13 +732,12 @@
"neteq/dtmf_tone_generator.h",
"neteq/expand.cc",
"neteq/expand.h",
+ "neteq/interface/neteq.h",
"neteq/merge.cc",
"neteq/merge.h",
+ "neteq/neteq.cc",
"neteq/neteq_impl.cc",
"neteq/neteq_impl.h",
- "neteq/neteq.cc",
- "neteq/statistics_calculator.cc",
- "neteq/statistics_calculator.h",
"neteq/normal.cc",
"neteq/normal.h",
"neteq/packet_buffer.cc",
@@ -756,12 +752,14 @@
"neteq/random_vector.h",
"neteq/rtcp.cc",
"neteq/rtcp.h",
+ "neteq/statistics_calculator.cc",
+ "neteq/statistics_calculator.h",
"neteq/sync_buffer.cc",
"neteq/sync_buffer.h",
- "neteq/timestamp_scaler.cc",
- "neteq/timestamp_scaler.h",
"neteq/time_stretch.cc",
"neteq/time_stretch.h",
+ "neteq/timestamp_scaler.cc",
+ "neteq/timestamp_scaler.h",
]
configs += [ "../..:common_config" ]
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index f23905f..f32c056 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -18,17 +18,17 @@
source_set("audio_device") {
sources = [
- "include/audio_device.h",
- "include/audio_device_defines.h",
"audio_device_buffer.cc",
"audio_device_buffer.h",
+ "audio_device_config.h",
"audio_device_generic.cc",
"audio_device_generic.h",
- "audio_device_config.h",
"dummy/audio_device_dummy.cc",
"dummy/audio_device_dummy.h",
"dummy/file_audio_device.cc",
"dummy/file_audio_device.h",
+ "include/audio_device.h",
+ "include/audio_device_defines.h",
]
include_dirs = []
@@ -149,7 +149,7 @@
configs += [ "../..:common_config" ]
public_configs = [
"../..:common_inherited_config",
- ":audio_device_config",
+ ":audio_device_config",
]
if (is_clang) {
@@ -166,5 +166,3 @@
"../utility",
]
}
-
-
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index 30ad8e4..092be1e 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -129,7 +129,9 @@
public_configs = [ "../..:common_inherited_config" ]
defines = []
- deps = [ "../..:webrtc_common" ]
+ deps = [
+ "../..:webrtc_common",
+ ]
if (aec_debug_dump) {
defines += [ "WEBRTC_AEC_DEBUG_DUMP" ]
@@ -212,7 +214,9 @@
if (rtc_enable_protobuf) {
proto_library("audioproc_debug_proto") {
- sources = [ "debug.proto" ]
+ sources = [
+ "debug.proto",
+ ]
proto_out_dir = "webrtc/audio_processing"
}
@@ -246,7 +250,9 @@
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
- deps = [ "../../common_audio" ]
+ deps = [
+ "../../common_audio",
+ ]
# Enable compilation for the ARM v7 Neon instruction set. This is needed
# since //build/config/arm.gni only enables Neon for iOS, not Android.
@@ -258,7 +264,7 @@
# "-mfpu=neon" is not requried for arm64 in GCC.
if (current_cpu != "arm64") {
- cflags = [ "-mfpu=neon" ]
+ cflags = [ "-mfpu=neon" ]
}
# Disable LTO in audio_processing_neon target due to compiler bug.
diff --git a/webrtc/modules/bitrate_controller/BUILD.gn b/webrtc/modules/bitrate_controller/BUILD.gn
index f7f67b89..9280f03 100644
--- a/webrtc/modules/bitrate_controller/BUILD.gn
+++ b/webrtc/modules/bitrate_controller/BUILD.gn
@@ -24,7 +24,7 @@
if (is_win) {
cflags = [
# TODO(jschuh): Bug 1348: fix this warning.
- "/wd4267" # size_t to int truncations
+ "/wd4267", # size_t to int truncations
]
}
@@ -37,5 +37,7 @@
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
- deps = [ "../../system_wrappers" ]
+ deps = [
+ "../../system_wrappers",
+ ]
}
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index c23aa03..ca1e66e 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -10,7 +10,7 @@
import("../../build/webrtc.gni")
use_desktop_capture_differ_sse2 =
- (!is_ios && (current_cpu == "x86" || current_cpu == "x64"))
+ !is_ios && (current_cpu == "x86" || current_cpu == "x64")
source_set("desktop_capture") {
sources = [
@@ -21,17 +21,17 @@
"cropping_window_capturer_win.cc",
"desktop_and_cursor_composer.cc",
"desktop_and_cursor_composer.h",
+ "desktop_capture_options.cc",
+ "desktop_capture_options.h",
"desktop_capture_types.h",
"desktop_capturer.h",
+ "desktop_capturer.h",
"desktop_frame.cc",
"desktop_frame.h",
"desktop_frame_win.cc",
"desktop_frame_win.h",
"desktop_geometry.cc",
"desktop_geometry.h",
- "desktop_capture_options.h",
- "desktop_capture_options.cc",
- "desktop_capturer.h",
"desktop_region.cc",
"desktop_region.h",
"differ.cc",
@@ -40,8 +40,8 @@
"differ_block.h",
"mac/desktop_configuration.h",
"mac/desktop_configuration.mm",
- "mac/desktop_configuration_monitor.h",
"mac/desktop_configuration_monitor.cc",
+ "mac/desktop_configuration_monitor.h",
"mac/full_screen_chrome_window_detector.cc",
"mac/full_screen_chrome_window_detector.h",
"mac/scoped_pixel_buffer_object.cc",
@@ -72,12 +72,12 @@
"win/scoped_gdi_object.h",
"win/scoped_thread_desktop.cc",
"win/scoped_thread_desktop.h",
+ "win/screen_capture_utils.cc",
+ "win/screen_capture_utils.h",
"win/screen_capturer_win_gdi.cc",
"win/screen_capturer_win_gdi.h",
"win/screen_capturer_win_magnifier.cc",
"win/screen_capturer_win_magnifier.h",
- "win/screen_capture_utils.cc",
- "win/screen_capture_utils.h",
"win/window_capture_utils.cc",
"win/window_capture_utils.h",
"window_capturer.cc",
@@ -91,14 +91,14 @@
"mouse_cursor_monitor_x11.cc",
"screen_capturer_x11.cc",
"window_capturer_x11.cc",
- "x11/shared_x_display.h",
"x11/shared_x_display.cc",
+ "x11/shared_x_display.h",
"x11/x_error_trap.cc",
"x11/x_error_trap.h",
"x11/x_server_pixel_buffer.cc",
"x11/x_server_pixel_buffer.h",
]
- configs += ["//build/config/linux:x11"]
+ configs += [ "//build/config/linux:x11" ]
}
if (!is_win && !is_mac && !use_x11) {
@@ -118,7 +118,7 @@
}
configs += [ "../..:common_config" ]
- public_configs = [ "../..:common_inherited_config"]
+ public_configs = [ "../..:common_inherited_config" ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
@@ -132,7 +132,7 @@
]
if (use_desktop_capture_differ_sse2) {
- deps += [":desktop_capture_differ_sse2"]
+ deps += [ ":desktop_capture_differ_sse2" ]
}
}
@@ -150,7 +150,7 @@
public_configs = [ "../..:common_inherited_config" ]
if (is_posix && !is_mac) {
- cflags = ["-msse2"]
+ cflags = [ "-msse2" ]
}
}
}
diff --git a/webrtc/modules/pacing/BUILD.gn b/webrtc/modules/pacing/BUILD.gn
index ffced4d..296bf17 100644
--- a/webrtc/modules/pacing/BUILD.gn
+++ b/webrtc/modules/pacing/BUILD.gn
@@ -8,10 +8,10 @@
source_set("pacing") {
sources = [
- "include/paced_sender.h",
- "include/packet_router.h",
"bitrate_prober.cc",
"bitrate_prober.h",
+ "include/paced_sender.h",
+ "include/packet_router.h",
"paced_sender.cc",
"packet_router.cc",
]
@@ -25,5 +25,7 @@
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
- deps = [ "../../system_wrappers" ]
+ deps = [
+ "../../system_wrappers",
+ ]
}
diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
index fe06c6d..1858e9a 100644
--- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn
+++ b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
@@ -14,7 +14,7 @@
"rate_statistics.h",
]
- configs += [ "../../:common_inherited_config"]
+ configs += [ "../../:common_inherited_config" ]
deps = [
":rbe_components",
@@ -43,7 +43,9 @@
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
- deps = [ "../..:webrtc_common" ]
+ deps = [
+ "../..:webrtc_common",
+ ]
if (is_clang) {
# Suppress warnings from Chrome's Clang plugins.
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn
index bbf69f4..0eda287 100644
--- a/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -10,7 +10,6 @@
source_set("rtp_rtcp") {
sources = [
- # Common
"interface/fec_receiver.h",
"interface/receive_statistics.h",
"interface/remote_ntp_time_estimator.h",
@@ -19,18 +18,28 @@
"interface/rtp_receiver.h",
"interface/rtp_rtcp.h",
"interface/rtp_rtcp_defines.h",
+ "mocks/mock_rtp_rtcp.h",
"source/bitrate.cc",
"source/bitrate.h",
"source/byte_io.h",
+ "source/dtmf_queue.cc",
+ "source/dtmf_queue.h",
+ "source/fec_private_tables_bursty.h",
+ "source/fec_private_tables_random.h",
"source/fec_receiver_impl.cc",
"source/fec_receiver_impl.h",
+ "source/forward_error_correction.cc",
+ "source/forward_error_correction.h",
+ "source/forward_error_correction_internal.cc",
+ "source/forward_error_correction_internal.h",
+ "source/h264_sps_parser.cc",
+ "source/h264_sps_parser.h",
+ "source/mock/mock_rtp_payload_strategy.h",
+ "source/producer_fec.cc",
+ "source/producer_fec.h",
"source/receive_statistics_impl.cc",
"source/receive_statistics_impl.h",
"source/remote_ntp_time_estimator.cc",
- "source/rtp_header_parser.cc",
- "source/rtp_rtcp_config.h",
- "source/rtp_rtcp_impl.cc",
- "source/rtp_rtcp_impl.h",
"source/rtcp_packet.cc",
"source/rtcp_packet.h",
"source/rtcp_receiver.cc",
@@ -41,59 +50,46 @@
"source/rtcp_sender.h",
"source/rtcp_utility.cc",
"source/rtcp_utility.h",
+ "source/rtp_format.cc",
+ "source/rtp_format.h",
+ "source/rtp_format_h264.cc",
+ "source/rtp_format_h264.h",
+ "source/rtp_format_video_generic.cc",
+ "source/rtp_format_video_generic.h",
+ "source/rtp_format_vp8.cc",
+ "source/rtp_format_vp8.h",
"source/rtp_header_extension.cc",
"source/rtp_header_extension.h",
+ "source/rtp_header_parser.cc",
+ "source/rtp_packet_history.cc",
+ "source/rtp_packet_history.h",
+ "source/rtp_payload_registry.cc",
+ "source/rtp_receiver_audio.cc",
+ "source/rtp_receiver_audio.h",
"source/rtp_receiver_impl.cc",
"source/rtp_receiver_impl.h",
+ "source/rtp_receiver_strategy.cc",
+ "source/rtp_receiver_strategy.h",
+ "source/rtp_receiver_video.cc",
+ "source/rtp_receiver_video.h",
+ "source/rtp_rtcp_config.h",
+ "source/rtp_rtcp_impl.cc",
+ "source/rtp_rtcp_impl.h",
"source/rtp_sender.cc",
"source/rtp_sender.h",
+ "source/rtp_sender_audio.cc",
+ "source/rtp_sender_audio.h",
+ "source/rtp_sender_video.cc",
+ "source/rtp_sender_video.h",
"source/rtp_utility.cc",
"source/rtp_utility.h",
"source/ssrc_database.cc",
"source/ssrc_database.h",
"source/tmmbr_help.cc",
"source/tmmbr_help.h",
- # Audio Files
- "source/dtmf_queue.cc",
- "source/dtmf_queue.h",
- "source/rtp_receiver_audio.cc",
- "source/rtp_receiver_audio.h",
- "source/rtp_sender_audio.cc",
- "source/rtp_sender_audio.h",
- # Video Files
- "source/fec_private_tables_random.h",
- "source/fec_private_tables_bursty.h",
- "source/forward_error_correction.cc",
- "source/forward_error_correction.h",
- "source/forward_error_correction_internal.cc",
- "source/forward_error_correction_internal.h",
- "source/h264_sps_parser.cc",
- "source/h264_sps_parser.h",
- "source/producer_fec.cc",
- "source/producer_fec.h",
- "source/rtp_packet_history.cc",
- "source/rtp_packet_history.h",
- "source/rtp_payload_registry.cc",
- "source/rtp_receiver_strategy.cc",
- "source/rtp_receiver_strategy.h",
- "source/rtp_receiver_video.cc",
- "source/rtp_receiver_video.h",
- "source/rtp_sender_video.cc",
- "source/rtp_sender_video.h",
"source/video_codec_information.h",
- "source/rtp_format.cc",
- "source/rtp_format.h",
- "source/rtp_format_h264.cc",
- "source/rtp_format_h264.h",
- "source/rtp_format_vp8.cc",
- "source/rtp_format_vp8.h",
- "source/rtp_format_video_generic.cc",
- "source/rtp_format_video_generic.h",
"source/vp8_partition_aggregator.cc",
"source/vp8_partition_aggregator.h",
- # Mocks
- "mocks/mock_rtp_rtcp.h",
- "source/mock/mock_rtp_payload_strategy.h",
]
configs += [ "../..:common_config" ]
@@ -116,6 +112,7 @@
cflags = [
# TODO(jschuh): Bug 1348: fix this warning.
"/wd4267", # size_t to int truncations
+
# TODO(kjellander): Bug 261: fix this warning.
"/wd4373", # virtual function override.
]
diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn
index 0ba15c0..f29e5b6 100644
--- a/webrtc/modules/video_capture/BUILD.gn
+++ b/webrtc/modules/video_capture/BUILD.gn
@@ -128,7 +128,7 @@
libs = [ "Strmiids.lib" ]
- deps += [ "//third_party/winsdk_samples"]
+ deps += [ "//third_party/winsdk_samples" ]
}
if (is_android) {
sources = [
@@ -159,6 +159,7 @@
cflags = [
"-fobjc-arc", # CLANG_ENABLE_OBJC_ARC = YES.
+
# To avoid warnings for deprecated videoMinFrameDuration and
# videoMaxFrameDuration properties in iOS 7.0.
# See webrtc:3705 for more details.
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 402502d..88f9bba 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -44,9 +44,9 @@
"main/source/nack_fec_tables.h",
"main/source/packet.cc",
"main/source/packet.h",
- "main/source/qm_select_data.h",
"main/source/qm_select.cc",
"main/source/qm_select.h",
+ "main/source/qm_select_data.h",
"main/source/receiver.cc",
"main/source/receiver.h",
"main/source/rtt_filter.cc",
@@ -110,13 +110,15 @@
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
- deps = [ "../../system_wrappers" ]
+ deps = [
+ "../../system_wrappers",
+ ]
}
source_set("webrtc_i420") {
sources = [
- "codecs/i420/main/source/i420.cc",
"codecs/i420/main/interface/i420.h",
+ "codecs/i420/main/source/i420.cc",
]
configs += [ "../..:common_config" ]
@@ -128,7 +130,9 @@
configs -= [ "//build/config/clang:find_bad_constructs" ]
}
- deps = [ "../../system_wrappers" ]
+ deps = [
+ "../../system_wrappers",
+ ]
}
source_set("webrtc_vp8") {
@@ -174,9 +178,7 @@
"../../system_wrappers",
]
if (rtc_build_libvpx) {
- deps += [
- rtc_libvpx_dir,
- ]
+ deps += [ rtc_libvpx_dir ]
}
}
@@ -190,7 +192,9 @@
"codecs/vp9/vp9_impl.h",
]
} else {
- sources = [ "codecs/vp9/vp9_dummy_impl.cc" ]
+ sources = [
+ "codecs/vp9/vp9_dummy_impl.cc",
+ ]
}
configs += [ "../..:common_config" ]
@@ -208,8 +212,6 @@
"../../system_wrappers",
]
if (rtc_build_libvpx) {
- deps += [
- rtc_libvpx_dir,
- ]
+ deps += [ rtc_libvpx_dir ]
}
}
diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn
index 2f05fb5..00d2911 100644
--- a/webrtc/modules/video_processing/BUILD.gn
+++ b/webrtc/modules/video_processing/BUILD.gn
@@ -54,7 +54,9 @@
if (build_video_processing_sse2) {
source_set("video_processing_sse2") {
- sources = [ "main/source/content_analysis_sse2.cc" ]
+ sources = [
+ "main/source/content_analysis_sse2.cc",
+ ]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
diff --git a/webrtc/modules/video_render/BUILD.gn b/webrtc/modules/video_render/BUILD.gn
index 8a2b923..8e67cc6 100644
--- a/webrtc/modules/video_render/BUILD.gn
+++ b/webrtc/modules/video_render/BUILD.gn
@@ -119,17 +119,17 @@
]
directxsdk_exists =
- (exec_script("//build/dir_exists.py",
- [ rebase_path("//third_party/directxsdk/files",
- root_build_dir) ],
- "trim string") == "True")
+ exec_script("//build/dir_exists.py",
+ [ rebase_path("//third_party/directxsdk/files",
+ root_build_dir) ],
+ "trim string") == "True"
if (directxsdk_exists) {
directxsdk_path = "//third_party/directxsdk/files"
} else {
directxsdk_path =
exec_script("../../build/find_directx_sdk.py", [], "trim string")
}
- include_dirs = [ directxsdk_path + "/Include" ]
+ include_dirs = [ directxsdk_path + "/Include" ]
}
if (is_android) {
sources += [
@@ -164,7 +164,7 @@
cflags += [ "-fobjc-arc" ] # CLANG_ENABLE_OBJC_ARC = YES.
}
- all_dependent_configs = [ ":video_render_internal_impl_config"]
+ all_dependent_configs = [ ":video_render_internal_impl_config" ]
configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config" ]
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index b9d93a6..6d16ac2 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -16,8 +16,8 @@
"interface/atomic32.h",
"interface/clock.h",
"interface/condition_variable_wrapper.h",
- "interface/cpu_info.h",
"interface/cpu_features_wrapper.h",
+ "interface/cpu_info.h",
"interface/critical_section_wrapper.h",
"interface/data_log.h",
"interface/data_log_c.h",
@@ -50,14 +50,14 @@
"source/atomic32_win.cc",
"source/clock.cc",
"source/condition_variable.cc",
- "source/condition_variable_posix.cc",
- "source/condition_variable_posix.h",
"source/condition_variable_event_win.cc",
"source/condition_variable_event_win.h",
"source/condition_variable_native_win.cc",
"source/condition_variable_native_win.h",
- "source/cpu_info.cc",
+ "source/condition_variable_posix.cc",
+ "source/condition_variable_posix.h",
"source/cpu_features.cc",
+ "source/cpu_info.cc",
"source/critical_section.cc",
"source/critical_section_posix.cc",
"source/critical_section_posix.h",
@@ -83,12 +83,12 @@
"source/rw_lock_win.h",
"source/sleep.cc",
"source/sort.cc",
- "source/tick_util.cc",
"source/thread.cc",
"source/thread_posix.cc",
"source/thread_posix.h",
"source/thread_win.cc",
"source/thread_win.h",
+ "source/tick_util.cc",
"source/timestamp_extrapolator.cc",
"source/trace_impl.cc",
"source/trace_impl.h",
@@ -100,9 +100,7 @@
configs += [ "..:common_config" ]
- public_configs = [
- "..:common_inherited_config",
- ]
+ public_configs = [ "..:common_inherited_config" ]
if (rtc_enable_data_logging) {
sources += [ "source/data_log.cc" ]
@@ -112,7 +110,9 @@
defines = []
libs = []
- deps = [ "..:webrtc_common" ]
+ deps = [
+ "..:webrtc_common",
+ ]
if (is_android) {
sources += [
@@ -122,6 +122,7 @@
defines += [
"WEBRTC_THREAD_RR",
+
# TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC
# support on Android. Keep WEBRTC_CLOCK_TYPE_REALTIME for now,
# remove it after I verify that CLOCK_MONOTONIC is fully functional
@@ -146,9 +147,7 @@
}
if (!is_mac && !is_ios) {
- sources += [
- "source/atomic32_posix.cc",
- ]
+ sources += [ "source/atomic32_posix.cc" ]
}
if (is_ios || is_mac) {
@@ -159,9 +158,7 @@
}
if (is_ios) {
- sources += [
- "source/atomic32_mac.cc",
- ]
+ sources += [ "source/atomic32_mac.cc" ]
}
if (is_win) {
@@ -173,9 +170,7 @@
]
}
- deps += [
- "../base:rtc_base_approved",
- ]
+ deps += [ "../base:rtc_base_approved" ]
}
source_set("field_trial_default") {
@@ -206,7 +201,6 @@
}
source_set("system_wrappers_default") {
-
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
@@ -224,6 +218,8 @@
configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ]
- deps = [ "//third_party/android_tools:cpu_features" ]
+ deps = [
+ "//third_party/android_tools:cpu_features",
+ ]
}
}
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 337dcf6..ed1dc75 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -30,7 +30,7 @@
]
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
}
source_set("histogram") {
@@ -45,7 +45,7 @@
]
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
}
source_set("test_support") {
@@ -81,7 +81,7 @@
}
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
}
source_set("test_support_main") {
@@ -103,5 +103,5 @@
]
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
}
diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index 882a16e..1378e18 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -16,12 +16,12 @@
source_set("command_line_parser") {
sources = [
- "simple_command_line_parser.h",
"simple_command_line_parser.cc",
+ "simple_command_line_parser.h",
]
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
}
# TODO(kjellander): Convert all of tools.gyp into GN here.
@@ -35,7 +35,7 @@
]
configs += [ "..:common_config" ]
- public_configs = [ "..:common_inherited_config"]
+ public_configs = [ "..:common_inherited_config" ]
deps = [
":command_line_parser",
diff --git a/webrtc/tools/barcode_tools/barcode_decoder.py b/webrtc/tools/barcode_tools/barcode_decoder.py
index b7b7ddd..e615fa8 100755
--- a/webrtc/tools/barcode_tools/barcode_decoder.py
+++ b/webrtc/tools/barcode_tools/barcode_decoder.py
@@ -56,7 +56,7 @@
print 'Error executing command: %s. Error: %s' % (command, err)
return False
except OSError:
- print ('Did not find %s. Have you installed it?' % ffmpeg_path)
+ print 'Did not find %s. Have you installed it?' % ffmpeg_path
return False
return True
@@ -111,7 +111,7 @@
print err
return False
except OSError:
- print ('Did not find %s. Have you installed it?' % command_line_decoder)
+ print 'Did not find %s. Have you installed it?' % command_line_decoder
return False
return True
@@ -200,7 +200,7 @@
return dsum == int(barcode[11])
-def _count_frames_in(input_directory = '.'):
+def _count_frames_in(input_directory='.'):
"""Calculates the number of frames in the input directory.
The function calculates the number of frames in the input directory. The
@@ -252,7 +252,7 @@
'decoded. If using Windows and a Cygwin-compiled '
'zxing.exe, you should keep the default value to '
'avoid problems. Default: %default'))
- options, _args = parser.parse_args()
+ options, _ = parser.parse_args()
return options
diff --git a/webrtc/tools/barcode_tools/yuv_cropper.py b/webrtc/tools/barcode_tools/yuv_cropper.py
index 9652c16..c57a90d 100755
--- a/webrtc/tools/barcode_tools/yuv_cropper.py
+++ b/webrtc/tools/barcode_tools/yuv_cropper.py
@@ -122,4 +122,4 @@
if __name__ == '__main__':
- sys.exit(_main())
\ No newline at end of file
+ sys.exit(_main())
diff --git a/webrtc/tools/compare_videos.py b/webrtc/tools/compare_videos.py
index f6275a6..6aa659b 100755
--- a/webrtc/tools/compare_videos.py
+++ b/webrtc/tools/compare_videos.py
@@ -55,7 +55,7 @@
help='Width of the YUV file\'s frames. Default: %default')
parser.add_option('--yuv_frame_height', type='int', default=480,
help='Height of the YUV file\'s frames. Default: %default')
- options, _args = parser.parse_args()
+ options, _ = parser.parse_args()
if not options.ref_video:
parser.error('You must provide a path to the reference video!')
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 0504dbe..95780ff 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -43,4 +43,3 @@
"../video_engine:video_engine_core",
]
}
-
diff --git a/webrtc/video_engine/BUILD.gn b/webrtc/video_engine/BUILD.gn
index 3e5f9c6..d0090ff 100644
--- a/webrtc/video_engine/BUILD.gn
+++ b/webrtc/video_engine/BUILD.gn
@@ -9,7 +9,9 @@
import("../build/webrtc.gni")
source_set("video_engine") {
- deps = [ ":video_engine_core" ]
+ deps = [
+ ":video_engine_core",
+ ]
}
source_set("video_engine_core") {
@@ -29,9 +31,9 @@
"vie_capturer.cc",
"vie_capturer.h",
"vie_channel.cc",
+ "vie_channel.h",
"vie_channel_group.cc",
"vie_channel_group.h",
- "vie_channel.h",
"vie_defines.h",
"vie_encoder.cc",
"vie_encoder.h",
@@ -58,6 +60,7 @@
cflags = [
# TODO(jschuh): Bug 1348: fix size_t to int truncations.
"/wd4267", # size_t to int truncation.
+
# Bug 261.
"/wd4373", # legacy warning for ignoring const / volatile in signatures.
]
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index c55dc8e..62386f5 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -9,8 +9,15 @@
import("../build/webrtc.gni")
source_set("voice_engine") {
-
sources = [
+ "channel.cc",
+ "channel.h",
+ "channel_manager.cc",
+ "channel_manager.h",
+ "dtmf_inband.cc",
+ "dtmf_inband.h",
+ "dtmf_inband_queue.cc",
+ "dtmf_inband_queue.h",
"include/voe_audio_processing.h",
"include/voe_base.h",
"include/voe_codec.h",
@@ -24,14 +31,6 @@
"include/voe_rtp_rtcp.h",
"include/voe_video_sync.h",
"include/voe_volume_control.h",
- "channel.cc",
- "channel.h",
- "channel_manager.cc",
- "channel_manager.h",
- "dtmf_inband.cc",
- "dtmf_inband.h",
- "dtmf_inband_queue.cc",
- "dtmf_inband_queue.h",
"level_indicator.cc",
"level_indicator.h",
"monitor_module.cc",
