Index: webrtc/modules/video_processing/util/denoiser_filter.cc |
diff --git a/webrtc/modules/video_processing/util/denoiser_filter.cc b/webrtc/modules/video_processing/util/denoiser_filter.cc |
index a5819905b2ab3de107c87e2523db5888465fd81b..d21d030a2b1b9ae2187a3a3500241e3576d6f879 100644 |
--- a/webrtc/modules/video_processing/util/denoiser_filter.cc |
+++ b/webrtc/modules/video_processing/util/denoiser_filter.cc |
@@ -20,27 +20,31 @@ const int kMotionMagnitudeThreshold = 8 * 3; |
const int kSumDiffThreshold = 16 * 16 * 2; |
const int kSumDiffThresholdHigh = 600; |
-DenoiserFilter* DenoiserFilter::Create() { |
+DenoiserFilter* DenoiserFilter::Create(bool runtime_cpu_detection) { |
DenoiserFilter* filter = NULL; |
- // If we know the minimum architecture at compile time, avoid CPU detection. |
+ if (runtime_cpu_detection) { |
+ // If we know the minimum architecture at compile time, avoid CPU detection. |
#if defined(WEBRTC_ARCH_X86_FAMILY) |
- // x86 CPU detection required. |
- if (WebRtc_GetCPUInfo(kSSE2)) { |
- filter = |
- new DenoiserFilterSSE2(); |
- } else { |
- filter = new DenoiserFilterC(); |
- } |
+ // x86 CPU detection required. |
+ if (WebRtc_GetCPUInfo(kSSE2)) { |
+ filter = |
+ new DenoiserFilterSSE2(); |
stefan-webrtc
2015/12/10 08:53:25
Indentation, run git cl format.
jackychen
2015/12/11 19:57:56
Done.
|
+ } else { |
+ filter = new DenoiserFilterC(); |
+ } |
#elif defined(WEBRTC_DETECT_NEON) |
- if (WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) { |
- filter = new DenoiserFilterNEON(); |
+ if (WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) { |
+ filter = new DenoiserFilterNEON(); |
+ } else { |
+ filter = new DenoiserFilterC(); |
+ } |
+#else |
+ filter = new DenoiserFilterC(); |
+#endif |
} else { |
filter = new DenoiserFilterC(); |
} |
-#else |
- filter = new DenoiserFilterC(); |
-#endif |
return filter; |
} |