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
2012-07-27 18:21:16 +00:00 · 2012-07-27 18:21:16 +00:00 · c1354bd768
commit c1354bd768
parent f5f69c7f5d
28 changed files with 42 additions and 46 deletions
--- 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"', {
--- 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)
--- 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 {
--- a/src/common_video/libyuv/include/webrtc_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_
--- 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': [
--- 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"
--- 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 {

--- a/src/common_video/libyuv/webrtc_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 {

--- 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"
--- 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
 {
--- 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
--- 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"
--- 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"
--- 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
    {
--- 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"
--- 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;

--- 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>
--- 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 {
--- 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"

--- 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
--- 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"
--- 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>
--- 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 {

--- 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 {

--- 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 {

--- 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);

--- 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 {
--- 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"