Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: webrtc/modules/video_processing/util/noise_estimation.cc

Issue 1897013002: Add flag for external VNR rectangle diagnostics on NEON. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_processing/util/noise_estimation.cc
diff --git a/webrtc/modules/video_processing/util/noise_estimation.cc b/webrtc/modules/video_processing/util/noise_estimation.cc
index 77ec965810ffc78535ea5a6340f62439fba98fc0..3b0d59ef717d8095a5ab1bac4650b296c7173de6 100644
--- a/webrtc/modules/video_processing/util/noise_estimation.cc
+++ b/webrtc/modules/video_processing/util/noise_estimation.cc
@@ -9,7 +9,7 @@
*/
#include "webrtc/modules/video_processing/util/noise_estimation.h"
-#if DISPLAY
+#if DISPLAYNEON
#include <android/log.h>
#endif
@@ -53,12 +53,10 @@ void NoiseEstimation::UpdateNoiseLevel() {
(0.65 * mb_cols_ * mb_rows_ / NOISE_SUBSAMPLE_INTERVAL) ||
!num_noisy_block_) {
#if DISPLAY
- if (cpu_type_) {
- printf("Not enough samples. %d \n", num_static_block_);
- } else {
- __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY",
- "Not enough samples. %d \n", num_static_block_);
- }
+ printf("Not enough samples. %d \n", num_static_block_);
+#elif DISPLAYNEON
+ __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY",
+ "Not enough samples. %d \n", num_static_block_);
#endif
noise_var_ = 0;
noise_var_accum_ = 0;
@@ -67,16 +65,14 @@ void NoiseEstimation::UpdateNoiseLevel() {
return;
} else {
#if DISPLAY
- if (cpu_type_) {
- printf("%d %d fraction = %.3f\n", num_static_block_,
- mb_cols_ * mb_rows_ / NOISE_SUBSAMPLE_INTERVAL,
- percent_static_block_);
- } else {
- __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY",
- "%d %d fraction = %.3f\n", num_static_block_,
- mb_cols_ * mb_rows_ / NOISE_SUBSAMPLE_INTERVAL,
- percent_static_block_);
- }
+ printf("%d %d fraction = %.3f\n", num_static_block_,
+ mb_cols_ * mb_rows_ / NOISE_SUBSAMPLE_INTERVAL,
+ percent_static_block_);
+#elif DISPLAYNEON
+ __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY", "%d %d fraction = %.3f\n",
+ num_static_block_,
+ mb_cols_ * mb_rows_ / NOISE_SUBSAMPLE_INTERVAL,
+ percent_static_block_);
#endif
// Normalized by the number of noisy blocks.
noise_var_ /= num_noisy_block_;
@@ -94,14 +90,12 @@ void NoiseEstimation::UpdateNoiseLevel() {
noise_var_accum_ = (noise_var_accum_ * 15 + noise_var_) / 16;
}
#if DISPLAY
- if (cpu_type_) {
- printf("noise_var_accum_ = %.1f, noise_var_ = %d.\n", noise_var_accum_,
- noise_var_);
- } else {
- __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY",
- "noise_var_accum_ = %.1f, noise_var_ = %d.\n",
- noise_var_accum_, noise_var_);
- }
+ printf("noise_var_accum_ = %.1f, noise_var_ = %d.\n", noise_var_accum_,
+ noise_var_);
+#elif DISPLAYNEON
+ __android_log_print(ANDROID_LOG_DEBUG, "DISPLAY",
+ "noise_var_accum_ = %.1f, noise_var_ = %d.\n",
+ noise_var_accum_, noise_var_);
#endif
// Reset noise_var_ for the next frame.
noise_var_ = 0;
« no previous file with comments | « webrtc/modules/video_processing/util/noise_estimation.h ('k') | webrtc/modules/video_processing/video_denoiser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698