mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2025-12-06 16:56:55 +08:00
Order includes.
Use the following order. local system libyuv Review URL: http://webrtc-codereview.appspot.com/270007 git-svn-id: http://libyuv.googlecode.com/svn/trunk@76 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
parent
d4ff5b42e6
commit
c82af4a59c
@ -8,7 +8,6 @@
|
|||||||
* 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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef INCLUDE_LIBYUV_COMPARE_H_
|
#ifndef INCLUDE_LIBYUV_COMPARE_H_
|
||||||
#define INCLUDE_LIBYUV_COMPARE_H_
|
#define INCLUDE_LIBYUV_COMPARE_H_
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
* 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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef INCLUDE_LIBYUV_CONVERT_H_
|
#ifndef INCLUDE_LIBYUV_CONVERT_H_
|
||||||
#define INCLUDE_LIBYUV_CONVERT_H_
|
#define INCLUDE_LIBYUV_CONVERT_H_
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
* 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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef INCLUDE_LIBYUV_FORMATCONVERSION_H_
|
#ifndef INCLUDE_LIBYUV_FORMATCONVERSION_H_
|
||||||
#define INCLUDE_LIBYUV_FORMATCONVERSION_H_
|
#define INCLUDE_LIBYUV_FORMATCONVERSION_H_
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
* 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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
|
#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
|
||||||
#define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
|
#define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
|
||||||
|
|
||||||
|
|||||||
@ -8,12 +8,13 @@
|
|||||||
* 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 "libyuv/basic_types.h"
|
|
||||||
#include "libyuv/compare.h"
|
#include "libyuv/compare.h"
|
||||||
#include "libyuv/cpu_id.h"
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h"
|
||||||
|
#include "libyuv/cpu_id.h"
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
|
|||||||
@ -10,6 +10,12 @@
|
|||||||
|
|
||||||
#include "libyuv/convert.h"
|
#include "libyuv/convert.h"
|
||||||
|
|
||||||
|
//#define SCALEOPT //Currently for windows only. June 2010
|
||||||
|
|
||||||
|
#ifdef SCALEOPT
|
||||||
|
#include <emmintrin.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "conversion_tables.h"
|
#include "conversion_tables.h"
|
||||||
#include "libyuv/basic_types.h"
|
#include "libyuv/basic_types.h"
|
||||||
#include "libyuv/cpu_id.h"
|
#include "libyuv/cpu_id.h"
|
||||||
@ -19,12 +25,6 @@
|
|||||||
#include "row.h"
|
#include "row.h"
|
||||||
#include "video_common.h"
|
#include "video_common.h"
|
||||||
|
|
||||||
//#define SCALEOPT //Currently for windows only. June 2010
|
|
||||||
|
|
||||||
#ifdef SCALEOPT
|
|
||||||
#include <emmintrin.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
static inline uint8 Clip(int32 val) {
|
static inline uint8 Clip(int32 val) {
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libyuv/cpu_id.h"
|
#include "libyuv/cpu_id.h"
|
||||||
#include "libyuv/basic_types.h" // for CPU_X86
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
@ -18,6 +17,8 @@
|
|||||||
#include <cpu-features.h>
|
#include <cpu-features.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h" // for CPU_X86
|
||||||
|
|
||||||
// TODO(fbarchard): Use cpuid.h when gcc 4.4 is used on OSX and Linux.
|
// TODO(fbarchard): Use cpuid.h when gcc 4.4 is used on OSX and Linux.
|
||||||
#if (defined(__pic__) || defined(__APPLE__)) && defined(__i386__)
|
#if (defined(__pic__) || defined(__APPLE__)) && defined(__i386__)
|
||||||
static inline void __cpuid(int cpu_info[4], int info_type) {
|
static inline void __cpuid(int cpu_info[4], int info_type) {
|
||||||
|
|||||||
@ -8,11 +8,13 @@
|
|||||||
* 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 "row.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h"
|
||||||
#include "libyuv/cpu_id.h"
|
#include "libyuv/cpu_id.h"
|
||||||
#include "video_common.h"
|
#include "video_common.h"
|
||||||
#include "row.h"
|
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
|
|||||||
@ -8,11 +8,11 @@
|
|||||||
* 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 "libyuv/planar_functions.h"
|
|
||||||
#include "libyuv/rotate.h"
|
#include "libyuv/rotate.h"
|
||||||
#include "rotate_priv.h"
|
|
||||||
|
|
||||||
#include "libyuv/cpu_id.h"
|
#include "libyuv/cpu_id.h"
|
||||||
|
#include "libyuv/planar_functions.h"
|
||||||
|
#include "rotate_priv.h"
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
|
|||||||
@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
#include "row.h"
|
#include "row.h"
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
void ABGRToARGBRow_C(const uint8* src_abgr, uint8* dst_argb, int pix) {
|
void ABGRToARGBRow_C(const uint8* src_abgr, uint8* dst_argb, int pix) {
|
||||||
|
|||||||
@ -10,6 +10,8 @@
|
|||||||
|
|
||||||
#include "row.h"
|
#include "row.h"
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
#ifdef HAS_ARGBTOYROW_SSSE3
|
#ifdef HAS_ARGBTOYROW_SSSE3
|
||||||
|
|||||||
@ -8,14 +8,16 @@
|
|||||||
* 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 "libyuv/basic_types.h"
|
|
||||||
#include "libyuv/compare.h"
|
|
||||||
#include "libyuv/cpu_id.h"
|
|
||||||
#include "unit_test.h"
|
#include "unit_test.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "libyuv/basic_types.h"
|
||||||
|
#include "libyuv/compare.h"
|
||||||
|
#include "libyuv/cpu_id.h"
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
TEST_F(libyuvTest, BenchmarkSumSquareError_C) {
|
TEST_F(libyuvTest, BenchmarkSumSquareError_C) {
|
||||||
@ -329,4 +331,4 @@ TEST_F(libyuvTest, Ssim) {
|
|||||||
free_aligned_buffer_16(src_b)
|
free_aligned_buffer_16(src_b)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace libyuv
|
||||||
|
|||||||
@ -8,12 +8,14 @@
|
|||||||
* 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 "libyuv/rotate.h"
|
|
||||||
#include "../source/rotate_priv.h"
|
|
||||||
#include "unit_test.h"
|
#include "unit_test.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "libyuv/rotate.h"
|
||||||
|
#include "../source/rotate_priv.h"
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
void print_array(uint8 *array, int w, int h) {
|
void print_array(uint8 *array, int w, int h) {
|
||||||
@ -1446,4 +1448,4 @@ TEST_F(libyuvTest, NV12ToI420RotateNegHeight180) {
|
|||||||
EXPECT_EQ(0, y_err + uv_err);
|
EXPECT_EQ(0, y_err + uv_err);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace libyuv
|
||||||
|
|||||||
@ -8,12 +8,14 @@
|
|||||||
* 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 "libyuv/cpu_id.h"
|
|
||||||
#include "libyuv/scale.h"
|
|
||||||
#include "unit_test.h"
|
#include "unit_test.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "libyuv/cpu_id.h"
|
||||||
|
#include "libyuv/scale.h"
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
static int TestFilter(int src_width, int src_height,
|
static int TestFilter(int src_width, int src_height,
|
||||||
@ -211,4 +213,4 @@ TEST_F(libyuvTest, ScaleDownBy38) {
|
|||||||
EXPECT_EQ(0, err);
|
EXPECT_EQ(0, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace libyuv
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user