generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include files from webrtc/.. paths in common_video/

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2013-06-04 09:02:37 +00:00
parent ba7f6a8614
commit c69ae69d0b
17 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_video/i420_video_frame.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 #include <algorithm> // swap

2
webrtc/common_video/i420_video_frame_unittest.cc
View File

@ -11,7 +11,7 @@
#include <math.h> #include <math.h>
#include <string.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/common_video/interface/i420_video_frame.h"
#include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/ref_count.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"

1
webrtc/common_video/interface/i420_video_frame.h
View File

@ -134,4 +134,3 @@ class I420VideoFrame {
} // namespace webrtc } // namespace webrtc
#endif // COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H #endif // COMMON_VIDEO_INTERFACE_I420_VIDEO_FRAME_H

2
webrtc/common_video/interface/video_image.h
View File

@ -11,8 +11,8 @@
#ifndef COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H #ifndef COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H
#define COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H #define COMMON_VIDEO_INTERFACE_VIDEO_IMAGE_H
#include "typedefs.h"
#include <stdlib.h> #include <stdlib.h>
#include "webrtc/typedefs.h"
namespace webrtc namespace webrtc
{ {

2
webrtc/common_video/jpeg/data_manager.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 namespace webrtc
{ {

6
webrtc/common_video/jpeg/include/jpeg.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_COMMON_VIDEO_JPEG #ifndef WEBRTC_COMMON_VIDEO_JPEG
#define WEBRTC_COMMON_VIDEO_JPEG #define WEBRTC_COMMON_VIDEO_JPEG
#include "typedefs.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/video_image.h" // EncodedImage
#include "common_video/interface/video_image.h" // EncodedImage #include "webrtc/typedefs.h"
// jpeg forward declaration // jpeg forward declaration
struct jpeg_compress_struct; struct jpeg_compress_struct;

10
webrtc/common_video/jpeg/jpeg.cc
View File

@ -15,11 +15,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "common_video/jpeg/include/jpeg.h" #include "third_party/libyuv/include/libyuv.h"
#include "common_video/jpeg/data_manager.h" #include "third_party/libyuv/include/libyuv/mjpeg_decoder.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/jpeg/data_manager.h"
#include "libyuv.h" #include "webrtc/common_video/jpeg/include/jpeg.h"
#include "libyuv/mjpeg_decoder.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
extern "C" { extern "C" {
#if defined(USE_SYSTEM_LIBJPEG) #if defined(USE_SYSTEM_LIBJPEG)

12
webrtc/common_video/jpeg/jpeg_unittest.cc
View File

@ -11,12 +11,12 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "common_video/interface/video_image.h" #include "testing/gtest/include/gtest/gtest.h"
#include "common_video/jpeg/include/jpeg.h" #include "webrtc/common_video/interface/video_image.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/jpeg/include/jpeg.h"
#include "gtest/gtest.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "testsupport/fileutils.h" #include "webrtc/modules/interface/module_common_types.h"
#include "modules/interface/module_common_types.h" #include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

6
webrtc/common_video/libyuv/include/scaler.h
View File

@ -15,9 +15,9 @@
#ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #ifndef WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
#define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_ #define WEBRTC_COMMON_VIDEO_LIBYUV_INCLUDE_SCALER_H_
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

6
webrtc/common_video/libyuv/include/webrtc_libyuv.h
View File

@ -17,9 +17,9 @@
#include <stdio.h> #include <stdio.h>
#include "common_types.h" // RawVideoTypes. #include "webrtc/common_types.h" // RawVideoTypes.
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

12
webrtc/common_video/libyuv/libyuv_unittest.cc
View File

@ -11,12 +11,12 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "common_video/interface/i420_video_frame.h" #include "testing/gtest/include/gtest/gtest.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "gtest/gtest.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

4
webrtc/common_video/libyuv/scaler.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * 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 { namespace webrtc {

8
webrtc/common_video/libyuv/scaler_unittest.cc
View File

@ -11,10 +11,10 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "common_video/libyuv/include/scaler.h" #include "testing/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h" #include "webrtc/common_video/libyuv/include/scaler.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
namespace webrtc { namespace webrtc {

4
webrtc/common_video/libyuv/webrtc_libyuv.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <assert.h>
#include <string.h> #include <string.h>
#include "libyuv.h" #include "third_party/libyuv/include/libyuv.h"
namespace webrtc { namespace webrtc {

2
webrtc/common_video/plane.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm> // swap
#include <cstring> // memcpy #include <cstring> // memcpy

4
webrtc/common_video/plane.h
View File

@ -11,8 +11,8 @@
#ifndef COMMON_VIDEO_PLANE_H #ifndef COMMON_VIDEO_PLANE_H
#define COMMON_VIDEO_PLANE_H #define COMMON_VIDEO_PLANE_H
#include "system_wrappers/interface/aligned_malloc.h" #include "webrtc/system_wrappers/interface/aligned_malloc.h"
#include "typedefs.h" //NOLINT #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

4
webrtc/common_video/plane_unittest.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <math.h>
#include <string.h> #include <string.h>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace webrtc { namespace webrtc {