From c1354bd76826671c3b96933b4b2ef948b76cbdd9 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 27 Jul 2012 18:21:16 +0000
Subject: [PATCH] Make handling of libyuv more flexible.

- Use gyp variable for libyuv path.
- Rename internal libyuv.h to webrtc_libyuv.h to avoid conflicts.
- Update affected includes.

BUG=none
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/711004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2534 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/build/common.gypi                                    | 1 +
 src/common_video/jpeg/jpeg.cc                            | 2 +-
 src/common_video/libyuv/include/scaler.h                 | 4 ++--
 .../libyuv/include/{libyuv.h => webrtc_libyuv.h}         | 8 ++++----
 src/common_video/libyuv/libyuv.gypi                      | 9 +++------
 src/common_video/libyuv/libyuv_unittest.cc               | 2 +-
 src/common_video/libyuv/scaler.cc                        | 3 +--
 src/common_video/libyuv/{libyuv.cc => webrtc_libyuv.cc}  | 5 ++---
 .../video_capture/main/source/video_capture_impl.cc      | 2 +-
 .../video_capture/main/source/video_capture_impl.h       | 2 +-
 src/modules/video_coding/codecs/i420/main/source/i420.cc | 2 +-
 src/modules/video_coding/codecs/test/videoprocessor.h    | 2 +-
 .../video_coding/codecs/test_framework/benchmark.cc      | 4 ++--
 .../video_coding/codecs/test_framework/video_source.h    | 4 ++--
 src/modules/video_coding/codecs/vp8/main/source/vp8.cc   | 2 +-
 src/modules/video_coding/main/test/quality_modes_test.cc | 2 +-
 src/modules/video_coding/main/test/video_source.h        | 4 ++--
 .../video_processing/main/source/spatial_resampler.h     | 4 ++--
 .../video_processing/main/test/unit_test/unit_test.cc    | 2 +-
 .../source/android/video_render_android_surface_view.cc  | 2 +-
 .../video_render/main/source/incoming_video_stream.cc    | 2 +-
 .../video_render/main/source/linux/video_x11_channel.h   | 4 ++--
 .../video_render/main/source/mac/video_render_agl.cc     | 2 +-
 .../main/source/mac/video_render_nsopengl.mm             | 2 +-
 .../main/source/windows/video_render_direct3d9.cc        | 2 +-
 .../main/source/windows/video_render_directdraw.h        | 6 +++---
 src/test/testsupport/metrics/video_metrics.cc            | 2 +-
 src/video_engine/vie_renderer.cc                         | 2 +-
 28 files changed, 42 insertions(+), 46 deletions(-)
 rename src/common_video/libyuv/include/{libyuv.h => webrtc_libyuv.h} (95%)
 rename src/common_video/libyuv/{libyuv.cc => webrtc_libyuv.cc} (98%)

diff --git a/src/build/common.gypi b/src/build/common.gypi
index c0cfca6b83..2bb8775367 100644
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -55,6 +55,7 @@
     'build_libyuv%': 1,
 
     'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
+    'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
 
     'conditions': [
       ['OS=="android"', {
diff --git a/src/common_video/jpeg/jpeg.cc b/src/common_video/jpeg/jpeg.cc
index 24f9a6295c..93bc251248 100644
--- a/src/common_video/jpeg/jpeg.cc
+++ b/src/common_video/jpeg/jpeg.cc
@@ -17,7 +17,7 @@
 
 #include "common_video/jpeg/include/jpeg.h"
 #include "common_video/jpeg/data_manager.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 extern "C" {
 #if defined(USE_SYSTEM_LIBJPEG)
diff --git a/src/common_video/libyuv/include/scaler.h b/src/common_video/libyuv/include/scaler.h
index 8f432f3a28..40fa660380 100644
--- a/src/common_video/libyuv/include/scaler.h
+++ b/src/common_video/libyuv/include/scaler.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -15,7 +15,7 @@
 #ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
 #define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "typedefs.h"
 
 namespace webrtc {
diff --git a/src/common_video/libyuv/include/libyuv.h b/src/common_video/libyuv/include/webrtc_libyuv.h
similarity index 95%
rename from src/common_video/libyuv/include/libyuv.h
rename to src/common_video/libyuv/include/webrtc_libyuv.h
index adaca597cb..87fbdb180c 100644
--- a/src/common_video/libyuv/include/libyuv.h
+++ b/src/common_video/libyuv/include/webrtc_libyuv.h
@@ -9,11 +9,11 @@
  */
 
 /*
- * WebRTC's Wrapper to libyuv.
+ * WebRTC's wrapper to libyuv.
  */
 
-#ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_LIBYUV_H_
-#define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_LIBYUV_H_
+#ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_
+#define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_
 
 #include "common_types.h"  // RawVideoTypes.
 #include "typedefs.h"
@@ -147,4 +147,4 @@ double I420SSIM(const uint8_t* ref_frame,
                 int width, int height);
 }
 
-#endif  // WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_LIBYUV_H_
+#endif  // WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_WEBRTC_LIBYUV_H_
diff --git a/src/common_video/libyuv/libyuv.gypi b/src/common_video/libyuv/libyuv.gypi
index 11b24b4c54..77aba199d5 100644
--- a/src/common_video/libyuv/libyuv.gypi
+++ b/src/common_video/libyuv/libyuv.gypi
@@ -18,18 +18,15 @@
           ],
         }, {
           # Need to add a directory normally exported by libyuv.gyp.
-          'include_dirs': [ '<(DEPTH)/third_party/libyuv/include', ],
+          'include_dirs': [ '<(libyuv_dir)/include', ],
         }],
       ],
       'sources': [
-        'include/libyuv.h',
+        'include/webrtc_libyuv.h',
         'include/scaler.h',
-        'libyuv.cc',
+        'webrtc_libyuv.cc',
         'scaler.cc',
       ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
     },
   ], # targets
   'conditions': [
diff --git a/src/common_video/libyuv/libyuv_unittest.cc b/src/common_video/libyuv/libyuv_unittest.cc
index 7ea4d2cd60..3e58314152 100644
--- a/src/common_video/libyuv/libyuv_unittest.cc
+++ b/src/common_video/libyuv/libyuv_unittest.cc
@@ -11,7 +11,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "gtest/gtest.h"
 #include "system_wrappers/interface/tick_util.h"
 #include "testsupport/fileutils.h"
diff --git a/src/common_video/libyuv/scaler.cc b/src/common_video/libyuv/scaler.cc
index 51643a57ef..b27c75cf32 100644
--- a/src/common_video/libyuv/scaler.cc
+++ b/src/common_video/libyuv/scaler.cc
@@ -10,8 +10,7 @@
 
 #include "common_video/libyuv/include/scaler.h"
 
-// LibYuv
-#include "third_party/libyuv/include/libyuv.h"
+#include "libyuv.h"
 
 namespace webrtc {
 
diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/webrtc_libyuv.cc
similarity index 98%
rename from src/common_video/libyuv/libyuv.cc
rename to src/common_video/libyuv/webrtc_libyuv.cc
index 62313b0fcd..9c370f77ae 100644
--- a/src/common_video/libyuv/libyuv.cc
+++ b/src/common_video/libyuv/webrtc_libyuv.cc
@@ -8,12 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 #include <assert.h>
 
-// LibYuv includes
-#include "third_party/libyuv/include/libyuv.h"
+#include "libyuv.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_capture/main/source/video_capture_impl.cc b/src/modules/video_capture/main/source/video_capture_impl.cc
index 601f4aeaca..719079995b 100644
--- a/src/modules/video_capture/main/source/video_capture_impl.cc
+++ b/src/modules/video_capture/main/source/video_capture_impl.cc
@@ -10,7 +10,7 @@
 
 #include "video_capture_impl.h"
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "critical_section_wrapper.h"
 #include "module_common_types.h"
 #include "ref_count.h"
diff --git a/src/modules/video_capture/main/source/video_capture_impl.h b/src/modules/video_capture/main/source/video_capture_impl.h
index 86af597ce2..6d2c023718 100644
--- a/src/modules/video_capture/main/source/video_capture_impl.h
+++ b/src/modules/video_capture/main/source/video_capture_impl.h
@@ -18,7 +18,7 @@
 #include "video_capture.h"
 #include "video_capture_config.h"
 #include "tick_util.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc
 {
diff --git a/src/modules/video_coding/codecs/i420/main/source/i420.cc b/src/modules/video_coding/codecs/i420/main/source/i420.cc
index a26cc08476..91afde630f 100644
--- a/src/modules/video_coding/codecs/i420/main/source/i420.cc
+++ b/src/modules/video_coding/codecs/i420/main/source/i420.cc
@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 
 namespace webrtc
diff --git a/src/modules/video_coding/codecs/test/videoprocessor.h b/src/modules/video_coding/codecs/test/videoprocessor.h
index 3e017867a6..5e65a128a8 100644
--- a/src/modules/video_coding/codecs/test/videoprocessor.h
+++ b/src/modules/video_coding/codecs/test/videoprocessor.h
@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "common_video/libyuv/include/scaler.h"
 #include "modules/interface/module_common_types.h"
 #include "modules/video_coding/codecs/interface/video_codec_interface.h"
diff --git a/src/modules/video_coding/codecs/test_framework/benchmark.cc b/src/modules/video_coding/codecs/test_framework/benchmark.cc
index 883330c2a8..e3048ae50c 100644
--- a/src/modules/video_coding/codecs/test_framework/benchmark.cc
+++ b/src/modules/video_coding/codecs/test_framework/benchmark.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -18,7 +18,7 @@
     #include <windows.h>
 #endif
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "system_wrappers/interface/event_wrapper.h"
 #include "modules/video_coding/codecs/test_framework/video_source.h"
 #include "testsupport/fileutils.h"
diff --git a/src/modules/video_coding/codecs/test_framework/video_source.h b/src/modules/video_coding/codecs/test_framework/video_source.h
index 4f785ba046..782fff13de 100644
--- a/src/modules/video_coding/codecs/test_framework/video_source.h
+++ b/src/modules/video_coding/codecs/test_framework/video_source.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAMEWORK_VIDEO_SOURCE_H_
 
 #include <string>
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 enum VideoSize
     {
diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
index 33643a54ba..1e2fe8eca3 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
+++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "module_common_types.h"
 #include "reference_picture_selection.h"
 #include "temporal_layers.h"
diff --git a/src/modules/video_coding/main/test/quality_modes_test.cc b/src/modules/video_coding/main/test/quality_modes_test.cc
index 271e8a8346..bc3d9dd1ab 100644
--- a/src/modules/video_coding/main/test/quality_modes_test.cc
+++ b/src/modules/video_coding/main/test/quality_modes_test.cc
@@ -19,7 +19,7 @@
 #include "test_callbacks.h"
 #include "test_macros.h"
 #include "testsupport/metrics/video_metrics.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 using namespace webrtc;
 
diff --git a/src/modules/video_coding/main/test/video_source.h b/src/modules/video_coding/main/test/video_source.h
index d9ad3d8033..980650bc11 100644
--- a/src/modules/video_coding/main/test/video_source.h
+++ b/src/modules/video_coding/main/test/video_source.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_VIDEO_SOURCE_H_
 #define WEBRTC_MODULES_VIDEO_CODING_TEST_VIDEO_SOURCE_H_
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "typedefs.h"
 
 #include <string>
diff --git a/src/modules/video_processing/main/source/spatial_resampler.h b/src/modules/video_processing/main/source/spatial_resampler.h
index 76a63fb788..28a5a6c862 100644
--- a/src/modules/video_processing/main/source/spatial_resampler.h
+++ b/src/modules/video_processing/main/source/spatial_resampler.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -20,7 +20,7 @@
 #include "module_common_types.h"
 #include "video_processing_defines.h"
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "common_video/libyuv/include/scaler.h"
 
 namespace webrtc {
diff --git a/src/modules/video_processing/main/test/unit_test/unit_test.cc b/src/modules/video_processing/main/test/unit_test/unit_test.cc
index 458b8a5d93..c6fdb2b4dc 100644
--- a/src/modules/video_processing/main/test/unit_test/unit_test.cc
+++ b/src/modules/video_processing/main/test/unit_test/unit_test.cc
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "system_wrappers/interface/tick_util.h"
 #include "testsupport/fileutils.h"
 
diff --git a/src/modules/video_render/main/source/android/video_render_android_surface_view.cc b/src/modules/video_render/main/source/android/video_render_android_surface_view.cc
index 4d1338c11b..889a6e7e71 100644
--- a/src/modules/video_render/main/source/android/video_render_android_surface_view.cc
+++ b/src/modules/video_render/main/source/android/video_render_android_surface_view.cc
@@ -10,7 +10,7 @@
 
 #include "video_render_android_surface_view.h"
 #include "critical_section_wrapper.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "tick_util.h"
 
 #ifdef ANDROID_LOG
diff --git a/src/modules/video_render/main/source/incoming_video_stream.cc b/src/modules/video_render/main/source/incoming_video_stream.cc
index 590932086f..e44862a3d5 100644
--- a/src/modules/video_render/main/source/incoming_video_stream.cc
+++ b/src/modules/video_render/main/source/incoming_video_stream.cc
@@ -21,7 +21,7 @@
 #include <sys/time.h>
 #endif
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/video_render/main/source/video_render_frames.h"
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/event_wrapper.h"
diff --git a/src/modules/video_render/main/source/linux/video_x11_channel.h b/src/modules/video_render/main/source/linux/video_x11_channel.h
index 1fb2dabf53..d713422d31 100644
--- a/src/modules/video_render/main/source/linux/video_x11_channel.h
+++ b/src/modules/video_render/main/source/linux/video_x11_channel.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
 
 #include "video_render_defines.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include <sys/shm.h>
 
 #include <X11/Xlib.h>
diff --git a/src/modules/video_render/main/source/mac/video_render_agl.cc b/src/modules/video_render/main/source/mac/video_render_agl.cc
index fc78b93574..b431cce31a 100644
--- a/src/modules/video_render/main/source/mac/video_render_agl.cc
+++ b/src/modules/video_render/main/source/mac/video_render_agl.cc
@@ -19,7 +19,7 @@
 #include "event_wrapper.h"
 #include "trace.h"
 #include "thread_wrapper.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm
index e63f50cda5..3747cd2ac5 100644
--- a/src/modules/video_render/main/source/mac/video_render_nsopengl.mm
+++ b/src/modules/video_render/main/source/mac/video_render_nsopengl.mm
@@ -16,7 +16,7 @@
 #include "event_wrapper.h"
 #include "trace.h"
 #include "thread_wrapper.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_render/main/source/windows/video_render_direct3d9.cc b/src/modules/video_render/main/source/windows/video_render_direct3d9.cc
index faddeb76ab..385b8aadac 100644
--- a/src/modules/video_render/main/source/windows/video_render_direct3d9.cc
+++ b/src/modules/video_render/main/source/windows/video_render_direct3d9.cc
@@ -19,7 +19,7 @@
 #include "event_wrapper.h"
 #include "trace.h"
 #include "thread_wrapper.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 
diff --git a/src/modules/video_render/main/source/windows/video_render_directdraw.h b/src/modules/video_render/main/source/windows/video_render_directdraw.h
index e790661e90..19fc5c3eab 100644
--- a/src/modules/video_render/main/source/windows/video_render_directdraw.h
+++ b/src/modules/video_render/main/source/windows/video_render_directdraw.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -13,7 +13,7 @@
 
 #include "typedefs.h"
 #include "i_video_render_win.h"
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 #include "ddraw.h"
 #include <Map>
@@ -295,7 +295,7 @@ public:
     bool DeliverInScreenType();
     int GetChannels(std::list<int>& channelList);
 
-    // code for getting graphics settings    
+    // code for getting graphics settings
     int GetScreenResolution(int& screenWidth, int& screenHeight);
     int UpdateSystemCPUUsage(int systemCPU);
 
diff --git a/src/test/testsupport/metrics/video_metrics.cc b/src/test/testsupport/metrics/video_metrics.cc
index 438f31b30c..87dc33b530 100644
--- a/src/test/testsupport/metrics/video_metrics.cc
+++ b/src/test/testsupport/metrics/video_metrics.cc
@@ -14,7 +14,7 @@
 #include <cassert>
 #include <cstdio>
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 namespace test {
diff --git a/src/video_engine/vie_renderer.cc b/src/video_engine/vie_renderer.cc
index a80ec2e496..f1c6f8c217 100644
--- a/src/video_engine/vie_renderer.cc
+++ b/src/video_engine/vie_renderer.cc
@@ -10,7 +10,7 @@
 
 #include "video_engine/vie_renderer.h"
 
-#include "common_video/libyuv/include/libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/video_render/main/interface/video_render.h"
 #include "modules/video_render/main/interface/video_render_defines.h"
 #include "video_engine/vie_render_manager.h"