coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-16 23:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow use of the system libjpeg.

Browse Source 
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
This commit is contained in:
fbarchard@google.com 2012-07-24 18:32:05 +00:00
parent 68f0d3df5e
commit 4f45c11aaf
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 310 Version: 311
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 310 #define LIBYUV_VERSION 311
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

17
libyuv.gyp
View File

@ -7,12 +7,25 @@
# 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.
{ {
'variables': {
'use_system_libjpeg%': 0,
},
'targets': [ 'targets': [
{ {
'target_name': 'libyuv', 'target_name': 'libyuv',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'conditions': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', ['use_system_libjpeg==0', {
'dependencies': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
}, {
'link_settings': {
'libraries': [
'-ljpeg',
],
},
}],
], ],
'defines': [ 'defines': [
'HAVE_JPEG', 'HAVE_JPEG',

14
unit_test/planar_test.cc
View File

@ -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_y) \
free_aligned_buffer_16(src_u) \ free_aligned_buffer_16(src_u) \
free_aligned_buffer_16(src_v) \ 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_y) \
free_aligned_buffer_16(src_uv) \ free_aligned_buffer_16(src_uv) \
free_aligned_buffer_16(dst_argb_c) \ 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 i = 0; i < kHeight / SUBSAMP_Y; ++i) { \
for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \ for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \
int abs_diff = \ 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 i = 0; i < kHeight / SUBSAMP_Y; ++i) { \
for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \ for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \
int abs_diff = \ 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_y_c) \
free_aligned_buffer_16(dst_u_c) \ free_aligned_buffer_16(dst_u_c) \
free_aligned_buffer_16(dst_v_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; \ max_diff = abs_diff; \
} \ } \
} \ } \
EXPECT_LE(max_diff, 2);; \ EXPECT_LE(max_diff, 2); \
free_aligned_buffer_16(src_argb) \ free_aligned_buffer_16(src_argb) \
free_aligned_buffer_16(dst_argb_c) \ free_aligned_buffer_16(dst_argb_c) \
free_aligned_buffer_16(dst_argb_opt) \ free_aligned_buffer_16(dst_argb_opt) \
@ -316,7 +316,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_B##_Random) { \
max_diff = abs_diff; \ 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(src_argb) \
free_aligned_buffer_page_end(dst_argb_c) \ free_aligned_buffer_page_end(dst_argb_c) \
free_aligned_buffer_page_end(dst_argb_opt) \ free_aligned_buffer_page_end(dst_argb_opt) \