Skip to content

L
libyuv
Commit 4f45c11a authored by fbarchard@google.com's avatar fbarchard@google.com
Browse files
Options

Allow use of the system libjpeg. 

BUG=56
TEST=gentoo builds chromium with libyuv with system jpeg
Review URL: https://webrtc-codereview.appspot.com/699005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@311 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 68f0d3df
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 11 deletions
README.chromium
View file @ 4f45c11a
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 310
Version: 311
License: BSD
License File: LICENSE
......
include/libyuv/version.h
View file @ 4f45c11a
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 310
#define LIBYUV_VERSION 311
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
libyuv.gyp
View file @ 4f45c11a
......@@ -7,12 +7,25 @@
# be found in the AUTHORS file in the root of the source tree.
{
'variables': {
'use_system_libjpeg%': 0,
},
'targets': [
{
'target_name': 'libyuv',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
'conditions': [
['use_system_libjpeg==0', {
'dependencies': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
}, {
'link_settings': {
'libraries': [
'-ljpeg',
],
},
}],
],
'defines': [
'HAVE_JPEG',
......
unit_test/planar_test.cc
View file @ 4f45c11a
......@@ -70,7 +70,7 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \
} \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
free_aligned_buffer_16(src_y) \
free_aligned_buffer_16(src_u) \
free_aligned_buffer_16(src_v) \
......@@ -131,7 +131,7 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \
} \
} \
} \
EXPECT_LE(max_diff, 3);; \
EXPECT_LE(max_diff, 3); \
free_aligned_buffer_16(src_y) \
free_aligned_buffer_16(src_uv) \
free_aligned_buffer_16(dst_argb_c) \
......@@ -184,7 +184,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \
} \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
for (int i = 0; i < kHeight / SUBSAMP_Y; ++i) { \
for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \
int abs_diff = \
......@@ -195,7 +195,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \
} \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
for (int i = 0; i < kHeight / SUBSAMP_Y; ++i) { \
for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \
int abs_diff = \
......@@ -206,7 +206,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \
} \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
free_aligned_buffer_16(dst_y_c) \
free_aligned_buffer_16(dst_u_c) \
free_aligned_buffer_16(dst_v_c) \
......@@ -260,7 +260,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_B##_OptVsC) { \
max_diff = abs_diff; \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
free_aligned_buffer_16(src_argb) \
free_aligned_buffer_16(dst_argb_c) \
free_aligned_buffer_16(dst_argb_opt) \
......@@ -316,7 +316,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_B##_Random) { \
max_diff = abs_diff; \
} \
} \
EXPECT_LE(max_diff, 2);; \
EXPECT_LE(max_diff, 2); \
free_aligned_buffer_page_end(src_argb) \
free_aligned_buffer_page_end(dst_argb_c) \
free_aligned_buffer_page_end(dst_argb_opt) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment