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
2013-06-04 09:02:37 +00:00 · 2013-06-04 09:02:37 +00:00 · c69ae69d0b
commit c69ae69d0b
parent ba7f6a8614
17 changed files with 43 additions and 44 deletions
--- 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 <algorithm>  // swap

--- a/webrtc/common_video/i420_video_frame_unittest.cc
+++ b/webrtc/common_video/i420_video_frame_unittest.cc
@ -11,7 +11,7 @@
 #include <math.h>
 #include <string.h>

-#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"
--- 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
-
--- 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 <stdlib.h>
+#include "webrtc/typedefs.h"

 namespace webrtc
 {
--- 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
 {
--- 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;
--- a/webrtc/common_video/jpeg/jpeg.cc
+++ b/webrtc/common_video/jpeg/jpeg.cc
@ -15,11 +15,11 @@
 #include <stdio.h>
 #include <string.h>

-#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)
--- a/webrtc/common_video/jpeg/jpeg_unittest.cc
+++ b/webrtc/common_video/jpeg/jpeg_unittest.cc
@ -11,12 +11,12 @@
 #include <cstdio>
 #include <string>

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

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

--- a/webrtc/common_video/libyuv/include/webrtc_libyuv.h
+++ b/webrtc/common_video/libyuv/include/webrtc_libyuv.h
@ -17,9 +17,9 @@

 #include <stdio.h>

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

--- a/webrtc/common_video/libyuv/libyuv_unittest.cc
+++ b/webrtc/common_video/libyuv/libyuv_unittest.cc
@ -11,12 +11,12 @@
 #include <math.h>
 #include <string.h>

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

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

--- a/webrtc/common_video/libyuv/scaler_unittest.cc
+++ b/webrtc/common_video/libyuv/scaler_unittest.cc
@ -11,10 +11,10 @@
 #include <math.h>
 #include <string.h>

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

--- 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 <assert.h>
 #include <string.h>

-#include "libyuv.h"
+#include "third_party/libyuv/include/libyuv.h"

 namespace webrtc {

--- 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 <algorithm>  // swap
 #include <cstring>  // memcpy
--- 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 {

--- 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 <math.h>
 #include <string.h>

-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"

 namespace webrtc {