From fca54f41ad1b5b2189d123fe8e97f3ff9b457336 Mon Sep 17 00:00:00 2001 From: tommi Date: Wed, 13 Jan 2016 08:12:00 -0800 Subject: Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ ) Reason for revert: Reverting due to problem with roll: /b/build/slave/linux/build/src/buildtools/linux64/gn gen //out/Release '--args=ffmpeg_branding="Chrome" proprietary_codecs=true is_debug=false is_component_build=false use_goma=true goma_dir="/b/build/goma" symbol_level=1 dcheck_always_on=true' --check --runtime-deps-list-file=/b/build/slave/linux/build/src/out/Release/runtime_deps -> returned 1 ERROR at //third_party/webrtc/BUILD.gn:245:18: Item not found configs -= [ "//build/config/clang:find_bad_constructs" ] ^----------------------------------------- You were trying to remove "//build/config/clang:find_bad_constructs" from the list but it wasn't there. GN gen failed: 1 step returned non-zero exit code: 1 @@@STEP_FAILURE@@@ Original issue's description: > Use an explicit identifier in Config > > This let's us use them to configure them when using WebRTC as an external library. One use case where this is necessary is in the Android OS. > > Committed: https://crrev.com/25249d92d3cf105bcc7b684c8924ccdbc9afcb93 > Cr-Commit-Position: refs/heads/master@{#11231} TBR=henrik.lundin@webrtc.org,stefan@webrtc.org,tommi@chromium.org,aluebs@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1586563003 Cr-Commit-Position: refs/heads/master@{#11239} --- webrtc/modules/audio_processing/include/audio_processing.h | 6 ------ webrtc/modules/video_coding/codecs/vp8/temporal_layers.h | 3 --- 2 files changed, 9 deletions(-) (limited to 'webrtc/modules') diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index 9a3a4b32d5..5dd63ebc30 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -65,7 +65,6 @@ class VoiceDetection; struct ExtendedFilter { ExtendedFilter() : enabled(false) {} explicit ExtendedFilter(bool enabled) : enabled(enabled) {} - static const ConfigOptionID identifier = ConfigOptionID::kExtendedFilter; bool enabled; }; @@ -77,7 +76,6 @@ struct ExtendedFilter { struct DelayAgnostic { DelayAgnostic() : enabled(false) {} explicit DelayAgnostic(bool enabled) : enabled(enabled) {} - static const ConfigOptionID identifier = ConfigOptionID::kDelayAgnostic; bool enabled; }; @@ -98,7 +96,6 @@ struct ExperimentalAgc { : enabled(enabled), startup_min_volume(kAgcStartupMinVolume) {} ExperimentalAgc(bool enabled, int startup_min_volume) : enabled(enabled), startup_min_volume(startup_min_volume) {} - static const ConfigOptionID identifier = ConfigOptionID::kExperimentalAgc; bool enabled; int startup_min_volume; }; @@ -108,7 +105,6 @@ struct ExperimentalAgc { struct ExperimentalNs { ExperimentalNs() : enabled(false) {} explicit ExperimentalNs(bool enabled) : enabled(enabled) {} - static const ConfigOptionID identifier = ConfigOptionID::kExperimentalNs; bool enabled; }; @@ -131,7 +127,6 @@ struct Beamforming { : enabled(enabled), array_geometry(array_geometry), target_direction(target_direction) {} - static const ConfigOptionID identifier = ConfigOptionID::kBeamforming; const bool enabled; const std::vector array_geometry; const SphericalPointf target_direction; @@ -146,7 +141,6 @@ struct Beamforming { struct Intelligibility { Intelligibility() : enabled(false) {} explicit Intelligibility(bool enabled) : enabled(enabled) {} - static const ConfigOptionID identifier = ConfigOptionID::kIntelligibility; bool enabled; }; diff --git a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h index 47112c64aa..7fe03a4da8 100644 --- a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h +++ b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h @@ -14,7 +14,6 @@ #include "vpx/vpx_encoder.h" -#include "webrtc/common.h" #include "webrtc/common_video/include/video_image.h" #include "webrtc/typedefs.h" @@ -31,8 +30,6 @@ class TemporalLayers { virtual ~Factory() {} virtual TemporalLayers* Create(int temporal_layers, uint8_t initial_tl0_pic_idx) const; - static const ConfigOptionID identifier = - ConfigOptionID::kTemporalLayersFactory; }; virtual ~TemporalLayers() {} -- cgit v1.2.3