From c69ae69d0b25c03173fdca000c81545987ba78ce Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 4 Jun 2013 09:02:37 +0000 Subject: [PATCH] Include files from webrtc/.. paths in common_video/ BUG=1662 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1546004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4167 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_video/i420_video_frame.cc | 2 +- webrtc/common_video/i420_video_frame_unittest.cc | 2 +- webrtc/common_video/interface/i420_video_frame.h | 1 - webrtc/common_video/interface/video_image.h | 2 +- webrtc/common_video/jpeg/data_manager.cc | 2 +- webrtc/common_video/jpeg/include/jpeg.h | 6 +++--- webrtc/common_video/jpeg/jpeg.cc | 10 +++++----- webrtc/common_video/jpeg/jpeg_unittest.cc | 12 ++++++------ webrtc/common_video/libyuv/include/scaler.h | 6 +++--- webrtc/common_video/libyuv/include/webrtc_libyuv.h | 6 +++--- webrtc/common_video/libyuv/libyuv_unittest.cc | 12 ++++++------ webrtc/common_video/libyuv/scaler.cc | 4 ++-- webrtc/common_video/libyuv/scaler_unittest.cc | 8 ++++---- webrtc/common_video/libyuv/webrtc_libyuv.cc | 4 ++-- webrtc/common_video/plane.cc | 2 +- webrtc/common_video/plane.h | 4 ++-- webrtc/common_video/plane_unittest.cc | 4 ++-- 17 files changed, 43 insertions(+), 44 deletions(-) diff --git a/webrtc/common_video/i420_video_frame.cc b/webrtc/common_video/i420_video_frame.cc index 25893acd97..77b76486d6 100644 --- a/webrtc/common_video/i420_video_frame.cc +++ b/webrtc/common_video/i420_video_frame.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/interface/i420_video_frame.h" #include // swap diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc index 012cf87742..5c738bd791 100644 --- a/webrtc/common_video/i420_video_frame_unittest.cc +++ b/webrtc/common_video/i420_video_frame_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_video/interface/i420_video_frame.h" #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" diff --git a/webrtc/common_video/interface/i420_video_frame.h b/webrtc/common_video/interface/i420_video_frame.h index 9ca3100410..5aaf8c082f 100644 --- a/webrtc/common_video/interface/i420_video_frame.h +++ b/webrtc/common_video/interface/i420_video_frame.h @@ -134,4 +134,3 @@ class I420VideoFrame { } // namespace webrtc #endif // COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H - diff --git a/webrtc/common_video/interface/video_image.h b/webrtc/common_video/interface/video_image.h index 3c6592d9fd..2a7c4459d4 100644 --- a/webrtc/common_video/interface/video_image.h +++ b/webrtc/common_video/interface/video_image.h @@ -11,8 +11,8 @@ #ifndef COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H #define COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H -#include "typedefs.h" #include +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_video/jpeg/data_manager.cc b/webrtc/common_video/jpeg/data_manager.cc index a5a7a48824..72380e7c1f 100644 --- a/webrtc/common_video/jpeg/data_manager.cc +++ b/webrtc/common_video/jpeg/data_manager.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/jpeg/data_manager.h" +#include "webrtc/common_video/jpeg/data_manager.h" namespace webrtc { diff --git a/webrtc/common_video/jpeg/include/jpeg.h b/webrtc/common_video/jpeg/include/jpeg.h index 11e01d36fc..7c5eec2bfb 100644 --- a/webrtc/common_video/jpeg/include/jpeg.h +++ b/webrtc/common_video/jpeg/include/jpeg.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_COMMON_VIDEO_JPEG #define WEBRTC_COMMON_VIDEO_JPEG -#include "typedefs.h" -#include "common_video/interface/i420_video_frame.h" -#include "common_video/interface/video_image.h" // EncodedImage +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/interface/video_image.h" // EncodedImage +#include "webrtc/typedefs.h" // jpeg forward declaration struct jpeg_compress_struct; diff --git a/webrtc/common_video/jpeg/jpeg.cc b/webrtc/common_video/jpeg/jpeg.cc index bf61dc7340..e8a23af52d 100644 --- a/webrtc/common_video/jpeg/jpeg.cc +++ b/webrtc/common_video/jpeg/jpeg.cc @@ -15,11 +15,11 @@ #include #include -#include "common_video/jpeg/include/jpeg.h" -#include "common_video/jpeg/data_manager.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "libyuv.h" -#include "libyuv/mjpeg_decoder.h" +#include "third_party/libyuv/include/libyuv.h" +#include "third_party/libyuv/include/libyuv/mjpeg_decoder.h" +#include "webrtc/common_video/jpeg/data_manager.h" +#include "webrtc/common_video/jpeg/include/jpeg.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" extern "C" { #if defined(USE_SYSTEM_LIBJPEG) diff --git a/webrtc/common_video/jpeg/jpeg_unittest.cc b/webrtc/common_video/jpeg/jpeg_unittest.cc index 479482c58a..afe98330a2 100644 --- a/webrtc/common_video/jpeg/jpeg_unittest.cc +++ b/webrtc/common_video/jpeg/jpeg_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "common_video/interface/video_image.h" -#include "common_video/jpeg/include/jpeg.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "gtest/gtest.h" -#include "testsupport/fileutils.h" -#include "modules/interface/module_common_types.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/common_video/interface/video_image.h" +#include "webrtc/common_video/jpeg/include/jpeg.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/include/scaler.h b/webrtc/common_video/libyuv/include/scaler.h index 37d4413490..ce7462c121 100644 --- a/webrtc/common_video/libyuv/include/scaler.h +++ b/webrtc/common_video/libyuv/include/scaler.h @@ -15,9 +15,9 @@ #ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ -#include "common_video/interface/i420_video_frame.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "typedefs.h" +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/include/webrtc_libyuv.h b/webrtc/common_video/libyuv/include/webrtc_libyuv.h index 1bea4f1852..b794679bc6 100644 --- a/webrtc/common_video/libyuv/include/webrtc_libyuv.h +++ b/webrtc/common_video/libyuv/include/webrtc_libyuv.h @@ -17,9 +17,9 @@ #include -#include "common_types.h" // RawVideoTypes. -#include "common_video/interface/i420_video_frame.h" -#include "typedefs.h" +#include "webrtc/common_types.h" // RawVideoTypes. +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/libyuv_unittest.cc b/webrtc/common_video/libyuv/libyuv_unittest.cc index 3ed80be8bd..8c79816e37 100644 --- a/webrtc/common_video/libyuv/libyuv_unittest.cc +++ b/webrtc/common_video/libyuv/libyuv_unittest.cc @@ -11,12 +11,12 @@ #include #include -#include "common_video/interface/i420_video_frame.h" -#include "common_video/libyuv/include/webrtc_libyuv.h" -#include "gtest/gtest.h" -#include "system_wrappers/interface/tick_util.h" -#include "system_wrappers/interface/scoped_ptr.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/common_video/interface/i420_video_frame.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/scaler.cc b/webrtc/common_video/libyuv/scaler.cc index c97b7067a0..2c2418be42 100644 --- a/webrtc/common_video/libyuv/scaler.cc +++ b/webrtc/common_video/libyuv/scaler.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/libyuv/include/scaler.h" +#include "webrtc/common_video/libyuv/include/scaler.h" -#include "libyuv.h" +#include "third_party/libyuv/include/libyuv.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/scaler_unittest.cc b/webrtc/common_video/libyuv/scaler_unittest.cc index cc86415a68..421e06c73b 100644 --- a/webrtc/common_video/libyuv/scaler_unittest.cc +++ b/webrtc/common_video/libyuv/scaler_unittest.cc @@ -11,10 +11,10 @@ #include #include -#include "common_video/libyuv/include/scaler.h" -#include "gtest/gtest.h" -#include "system_wrappers/interface/tick_util.h" -#include "testsupport/fileutils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/common_video/libyuv/include/scaler.h" +#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc index 750235528f..ba23f9bc66 100644 --- a/webrtc/common_video/libyuv/webrtc_libyuv.cc +++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/libyuv/include/webrtc_libyuv.h" +#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include #include -#include "libyuv.h" +#include "third_party/libyuv/include/libyuv.h" namespace webrtc { diff --git a/webrtc/common_video/plane.cc b/webrtc/common_video/plane.cc index 2362c4d82c..7d879301c6 100644 --- a/webrtc/common_video/plane.cc +++ b/webrtc/common_video/plane.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/plane.h" +#include "webrtc/common_video/plane.h" #include // swap #include // memcpy diff --git a/webrtc/common_video/plane.h b/webrtc/common_video/plane.h index 0b94f99d70..1b74f37ec0 100644 --- a/webrtc/common_video/plane.h +++ b/webrtc/common_video/plane.h @@ -11,8 +11,8 @@ #ifndef COMMON_VIDEO_PLANE_H #define COMMON_VIDEO_PLANE_H -#include "system_wrappers/interface/aligned_malloc.h" -#include "typedefs.h" //NOLINT +#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_video/plane_unittest.cc b/webrtc/common_video/plane_unittest.cc index 19597ce906..d165598287 100644 --- a/webrtc/common_video/plane_unittest.cc +++ b/webrtc/common_video/plane_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "common_video/plane.h" +#include "webrtc/common_video/plane.h" #include #include -#include "gtest/gtest.h" +#include "testing/gtest/include/gtest/gtest.h" namespace webrtc {