modules/video_processing: refactor interface->include + more.

Moved/renamed:
webrtc/modules/video_processing/main/interface -> webrtc/modules/video_processing/include
webrtc/modules/video_processing/main/source/* -> webrtc/modules/video_processing
webrtc/modules/video_processing/main/test/unit_test -> webrtc/modules/video_processing/test

No downstream code seems to use this module.

BUG=webrtc:5095
TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc
R=pbos@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1410663004 .

Cr-Commit-Position: refs/heads/master@{#10697}

webrtc/modules/modules.gyp

@@ -298,11 +298,11 @@
             'video_coding/test/stream_generator.cc',
             'video_coding/test/stream_generator.h',
             'video_coding/utility/quality_scaler_unittest.cc',
-            'video_processing/main/test/unit_test/brightness_detection_test.cc',
+            'video_processing/test/brightness_detection_test.cc',
-            'video_processing/main/test/unit_test/content_metrics_test.cc',
+            'video_processing/test/content_metrics_test.cc',
-            'video_processing/main/test/unit_test/deflickering_test.cc',
+            'video_processing/test/deflickering_test.cc',
-            'video_processing/main/test/unit_test/video_processing_unittest.cc',
+            'video_processing/test/video_processing_unittest.cc',
-            'video_processing/main/test/unit_test/video_processing_unittest.h',
+            'video_processing/test/video_processing_unittest.h',
           ],
           'conditions': [
             ['enable_bwe_test_logging==1', {

webrtc/modules/video_processing/BUILD.gn

@@ -12,24 +12,24 @@ build_video_processing_sse2 = current_cpu == "x86" || current_cpu == "x64"
 
 source_set("video_processing") {
   sources = [
-    "main/interface/video_processing.h",
+    "brighten.cc",
-    "main/interface/video_processing_defines.h",
+    "brighten.h",
-    "main/source/brighten.cc",
+    "brightness_detection.cc",
-    "main/source/brighten.h",
+    "brightness_detection.h",
-    "main/source/brightness_detection.cc",
+    "content_analysis.cc",
-    "main/source/brightness_detection.h",
+    "content_analysis.h",
-    "main/source/content_analysis.cc",
+    "deflickering.cc",
-    "main/source/content_analysis.h",
+    "deflickering.h",
-    "main/source/deflickering.cc",
+    "frame_preprocessor.cc",
-    "main/source/deflickering.h",
+    "frame_preprocessor.h",
-    "main/source/frame_preprocessor.cc",
+    "include/video_processing.h",
-    "main/source/frame_preprocessor.h",
+    "include/video_processing_defines.h",
-    "main/source/spatial_resampler.cc",
+    "spatial_resampler.cc",
-    "main/source/spatial_resampler.h",
+    "spatial_resampler.h",
-    "main/source/video_decimator.cc",
+    "video_decimator.cc",
-    "main/source/video_decimator.h",
+    "video_decimator.h",
-    "main/source/video_processing_impl.cc",
+    "video_processing_impl.cc",
-    "main/source/video_processing_impl.h",
+    "video_processing_impl.h",
   ]
 
   deps = [
@@ -55,7 +55,7 @@ source_set("video_processing") {
 if (build_video_processing_sse2) {
   source_set("video_processing_sse2") {
     sources = [
-      "main/source/content_analysis_sse2.cc",
+      "content_analysis_sse2.cc",
     ]
 
     configs += [ "../..:common_config" ]

webrtc/modules/video_processing/brighten.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/brighten.h"
+#include "webrtc/modules/video_processing/brighten.h"
 
 #include <stdlib.h>
 

webrtc/modules/video_processing/brighten.h

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_
-#define MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
+#define WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -22,4 +22,4 @@ int32_t Brighten(VideoFrame* frame, int delta);
 }  // namespace VideoProcessing
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTEN_H_

webrtc/modules/video_processing/brightness_detection.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
+#include "webrtc/modules/video_processing/brightness_detection.h"
 
 #include <math.h>
 

webrtc/modules/video_processing/brightness_detection.h

@@ -8,12 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-/*
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_
- * brightness_detection.h
+#define WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_
- */
+
-#ifndef MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#define MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -34,4 +32,4 @@ class VPMBrightnessDetection {
 
 }  // namespace webrtc
 
-#endif // MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTNESS_DETECTION_H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_BRIGHTNESS_DETECTION_H_

webrtc/modules/video_processing/content_analysis.cc

@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
 
 #include <math.h>
 #include <stdlib.h>

webrtc/modules/video_processing/content_analysis.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_
 
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
 
@@ -84,4 +84,4 @@ class VPMContentAnalysis {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_CONTENT_ANALYSIS_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_CONTENT_ANALYSIS_H_

webrtc/modules/video_processing/content_analysis_sse2.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
 
 #include <emmintrin.h>
 #include <math.h>

webrtc/modules/video_processing/deflickering.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/deflickering.h"
+#include "webrtc/modules/video_processing/deflickering.h"
 
 #include <math.h>
 #include <stdlib.h>

webrtc/modules/video_processing/deflickering.h

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_
 
 #include <string.h>  // NULL
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -53,4 +53,4 @@ class VPMDeflickering {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCEdeflickering__H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_DEFLICKERING_H_

webrtc/modules/video_processing/frame_preprocessor.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
+#include "webrtc/modules/video_processing/frame_preprocessor.h"
 
 namespace webrtc {
 

webrtc/modules/video_processing/frame_preprocessor.h

@@ -11,13 +11,13 @@
 /*
  * frame_preprocessor.h
  */
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
 
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
-#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
+#include "webrtc/modules/video_processing/spatial_resampler.h"
-#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/modules/video_processing/video_decimator.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -76,4 +76,4 @@ class VPMFramePreprocessor {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_FRAME_PREPROCESSOR_H
+#endif // WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_

webrtc/modules/video_processing/include/video_processing.h

@@ -15,12 +15,12 @@
  */
 
 
-#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_
-#define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_
 
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 #include "webrtc/video_frame.h"
 
 /**
@@ -267,4 +267,4 @@ class VideoProcessingModule : public Module {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_H_

webrtc/modules/video_processing/include/video_processing_defines.h

@@ -13,8 +13,8 @@
  * This header file includes the definitions used in the video processor module
  */
 
-#ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_
-#define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_
 
 #include "webrtc/typedefs.h"
 
@@ -38,4 +38,4 @@ enum VideoFrameResampling {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_INCLUDE_VIDEO_PROCESSING_DEFINES_H_

webrtc/modules/video_processing/main/source/OWNERS

@@ -1,5 +0,0 @@
-
-# These are for the common case of adding or renaming files. If you're doing
-# structural changes, please get a review from a reviewer in this file.
-per-file *.gyp=*
-per-file *.gypi=*

webrtc/modules/video_processing/spatial_resampler.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
+#include "webrtc/modules/video_processing/spatial_resampler.h"
 
 
 namespace webrtc {

webrtc/modules/video_processing/spatial_resampler.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_
 
 #include "webrtc/typedefs.h"
 
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/modules/video_processing/include/video_processing_defines.h"
 
 #include "webrtc/common_video/libyuv/include/scaler.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -58,4 +58,4 @@ class VPMSimpleSpatialResampler : public VPMSpatialResampler {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_

webrtc/modules/video_processing/test/brightness_detection_test.cc

@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 using namespace webrtc;

webrtc/modules/video_processing/test/content_metrics_test.cc

@@ -9,9 +9,9 @@
  */
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/content_analysis.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {

webrtc/modules/video_processing/test/deflickering_test.cc

@@ -12,8 +12,8 @@
 #include <stdlib.h>
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"

webrtc/modules/video_processing/test/video_processing_unittest.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h"
+#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 
 #include <string>
 

webrtc/modules/video_processing/test/video_processing_unittest.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
@@ -44,4 +44,4 @@ class VideoProcessingModuleTest : public ::testing::Test {
 
 }  // namespace webrtc
 
-#endif // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VIDEO_PROCESSING_UNITTEST_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_TEST_VIDEO_PROCESSING_UNITTEST_H_

webrtc/modules/video_processing/video_decimator.cc

@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/base/checks.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/modules/video_processing/video_decimator.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 
 #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b)

webrtc/modules/video_processing/video_decimator.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_
-#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_
 
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/typedefs.h"
@@ -55,4 +55,4 @@ class VPMVideoDecimator {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_VIDEO_DECIMATOR_H
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_DECIMATOR_H_

webrtc/modules/video_processing/video_processing.gypi

@@ -18,24 +18,24 @@
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
-        'main/interface/video_processing.h',
+        'include/video_processing.h',
-        'main/interface/video_processing_defines.h',
+        'include/video_processing_defines.h',
-        'main/source/brighten.cc',
+        'brighten.cc',
-        'main/source/brighten.h',
+        'brighten.h',
-        'main/source/brightness_detection.cc',
+        'brightness_detection.cc',
-        'main/source/brightness_detection.h',
+        'brightness_detection.h',
-        'main/source/content_analysis.cc',
+        'content_analysis.cc',
-        'main/source/content_analysis.h',
+        'content_analysis.h',
-        'main/source/deflickering.cc',
+        'deflickering.cc',
-        'main/source/deflickering.h',
+        'deflickering.h',
-        'main/source/frame_preprocessor.cc',
+        'frame_preprocessor.cc',
-        'main/source/frame_preprocessor.h',
+        'frame_preprocessor.h',
-        'main/source/spatial_resampler.cc',
+        'spatial_resampler.cc',
-        'main/source/spatial_resampler.h',
+        'spatial_resampler.h',
-        'main/source/video_decimator.cc',
+        'video_decimator.cc',
-        'main/source/video_decimator.h',
+        'video_decimator.h',
-        'main/source/video_processing_impl.cc',
+        'video_processing_impl.cc',
-        'main/source/video_processing_impl.h',
+        'video_processing_impl.h',
       ],
       'conditions': [
         ['target_arch=="ia32" or target_arch=="x64"', {
@@ -51,7 +51,7 @@
           'target_name': 'video_processing_sse2',
           'type': 'static_library',
           'sources': [
-            'main/source/content_analysis_sse2.cc',
+            'content_analysis_sse2.cc',
           ],
           'conditions': [
             ['os_posix==1 and OS!="mac"', {

webrtc/modules/video_processing/video_processing_impl.cc

@@ -7,9 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/modules/video_processing/main/source/video_processing_impl.h"
-
 #include "webrtc/base/logging.h"
+#include "webrtc/modules/video_processing/video_processing_impl.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 #include <assert.h>

webrtc/modules/video_processing/video_processing_impl.h

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
+#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_
-#define WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
+#define WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_
 
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
-#include "webrtc/modules/video_processing/main/source/brighten.h"
+#include "webrtc/modules/video_processing/brighten.h"
-#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
+#include "webrtc/modules/video_processing/brightness_detection.h"
-#include "webrtc/modules/video_processing/main/source/deflickering.h"
+#include "webrtc/modules/video_processing/deflickering.h"
-#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
+#include "webrtc/modules/video_processing/frame_preprocessor.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
@@ -72,4 +72,4 @@ class VideoProcessingModuleImpl : public VideoProcessingModule {
 
 }  // namespace
 
-#endif
+#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_VIDEO_PROCESSING_IMPL_H_

webrtc/video/video_capture_input.cc

@@ -16,7 +16,7 @@
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"

webrtc/video/video_capture_input.h

@@ -21,7 +21,7 @@
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/thread_wrapper.h"
 #include "webrtc/typedefs.h"

webrtc/video_engine/vie_channel.cc

@@ -25,7 +25,7 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/metrics.h"

webrtc/video_engine/vie_encoder.h

@@ -22,7 +22,7 @@
 #include "webrtc/frame_callback.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
-#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video/video_capture_input.h"