Skip to content

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

remove space hash hash from unittests and add bpp enum 

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/690004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@305 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 8e01bfb4
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 18 deletions
README.chromium
View file @ 4403be58
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 304 Version: 305
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
include/libyuv/version.h
View file @ 4403be58
...@@ -11,6 +11,6 @@ ...@@ -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 304 #define LIBYUV_VERSION 305
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
include/libyuv/video_common.h
View file @ 4403be58
...@@ -90,6 +90,59 @@ enum FourCC { ...@@ -90,6 +90,59 @@ enum FourCC {
FOURCC_ANY = 0xFFFFFFFF, FOURCC_ANY = 0xFFFFFFFF,
}; };
enum FourCCBpp {
// Canonical fourcc codes used in our code.
FOURCC_BPP_I420 = 12,
FOURCC_BPP_I422 = 16,
FOURCC_BPP_I444 = 24,
FOURCC_BPP_I411 = 12,
FOURCC_BPP_I400 = 8,
FOURCC_BPP_YV12 = 12,
FOURCC_BPP_YV16 = 16,
FOURCC_BPP_YV24 = 24,
FOURCC_BPP_YUY2 = 16,
FOURCC_BPP_UYVY = 16,
FOURCC_BPP_M420 = 12,
FOURCC_BPP_Q420 = 12,
FOURCC_BPP_V210 = 22, // 22.5 actually
FOURCC_BPP_24BG = 24,
FOURCC_BPP_ABGR = 32,
FOURCC_BPP_BGRA = 32,
FOURCC_BPP_ARGB = 32,
FOURCC_BPP_RGBP = 16,
FOURCC_BPP_RGBO = 16,
FOURCC_BPP_R444 = 16,
FOURCC_BPP_MJPG = 0, // 0 means unknown.
FOURCC_BPP_RAW = 24,
FOURCC_BPP_NV21 = 12,
FOURCC_BPP_NV12 = 12,
// Next four are Bayer RGB formats. The four characters define the order of
// the colours in each 2x2 pixel grid, going left-to-right and top-to-bottom.
FOURCC_BPP_RGGB = 8,
FOURCC_BPP_BGGR = 8,
FOURCC_BPP_GRBG = 8,
FOURCC_BPP_GBRG = 8,
// Aliases for canonical fourcc codes, replaced with their canonical
// equivalents by CanonicalFourCC().
FOURCC_BPP_IYUV = 12,
FOURCC_BPP_YU12 = 12,
FOURCC_BPP_YU16 = 16,
FOURCC_BPP_YU24 = 24,
FOURCC_BPP_YUYV = 16,
FOURCC_BPP_YUVS = 16,
FOURCC_BPP_HDYC = 16,
FOURCC_BPP_2VUY = 16,
FOURCC_BPP_JPEG = 1,
FOURCC_BPP_DMB1 = 1,
FOURCC_BPP_BA81 = 8,
FOURCC_BPP_RGB3 = 24,
FOURCC_BPP_BGR3 = 24,
// Match any fourcc.
FOURCC_BPP_ANY = 0, // 0 means unknown.
};
// Converts fourcc aliases into canonical ones. // Converts fourcc aliases into canonical ones.
uint32 CanonicalFourCC(uint32 fourcc); uint32 CanonicalFourCC(uint32 fourcc);
......
unit_test/planar_test.cc
View file @ 4403be58
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
namespace libyuv { namespace libyuv {
#define TESTPLANARTOB(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B) \ #define TESTPLANARTOB(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B) \
TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \
const int kWidth = 1280; \ const int kWidth = 1280; \
const int kHeight = 720; \ const int kHeight = 720; \
align_buffer_16(src_y, kWidth * kHeight); \ align_buffer_16(src_y, kWidth * kHeight); \
...@@ -45,7 +45,7 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \ ...@@ -45,7 +45,7 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \
src_v[(i * kWidth / SUBSAMP_X) + j] = (random() & 0xff); \ src_v[(i * kWidth / SUBSAMP_X) + j] = (random() & 0xff); \
} \ } \
MaskCpuFlags(kCpuInitialized); \ MaskCpuFlags(kCpuInitialized); \
##FMT_PLANAR##To##FMT_B(src_y, kWidth, \ FMT_PLANAR##To##FMT_B(src_y, kWidth, \
src_u, kWidth / SUBSAMP_X, \ src_u, kWidth / SUBSAMP_X, \
src_v, kWidth / SUBSAMP_X, \ src_v, kWidth / SUBSAMP_X, \
dst_argb_c, kWidth * BPP_B, \ dst_argb_c, kWidth * BPP_B, \
...@@ -53,7 +53,7 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \ ...@@ -53,7 +53,7 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \
MaskCpuFlags(-1); \ MaskCpuFlags(-1); \
const int runs = 1000; \ const int runs = 1000; \
for (int i = 0; i < runs; ++i) { \ for (int i = 0; i < runs; ++i) { \
##FMT_PLANAR##To##FMT_B(src_y, kWidth, \ FMT_PLANAR##To##FMT_B(src_y, kWidth, \
src_u, kWidth / SUBSAMP_X, \ src_u, kWidth / SUBSAMP_X, \
src_v, kWidth / SUBSAMP_X, \ src_v, kWidth / SUBSAMP_X, \
dst_argb_opt, kWidth * BPP_B, \ dst_argb_opt, kWidth * BPP_B, \
...@@ -91,7 +91,7 @@ TESTPLANARTOB(I444, 1, 1, ARGB, 4) ...@@ -91,7 +91,7 @@ TESTPLANARTOB(I444, 1, 1, ARGB, 4)
#define TESTBIPLANARTOB(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B) \ #define TESTBIPLANARTOB(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B) \
TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \
const int kWidth = 1280; \ const int kWidth = 1280; \
const int kHeight = 720; \ const int kHeight = 720; \
align_buffer_16(src_y, kWidth * kHeight); \ align_buffer_16(src_y, kWidth * kHeight); \
...@@ -107,14 +107,14 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \ ...@@ -107,14 +107,14 @@ TEST_F(libyuvTest, ##FMT_PLANAR##To##FMT_B##_OptVsC) { \
src_uv[(i * kWidth / SUBSAMP_X) * 2 + j] = (random() & 0xff); \ src_uv[(i * kWidth / SUBSAMP_X) * 2 + j] = (random() & 0xff); \
} \ } \
MaskCpuFlags(kCpuInitialized); \ MaskCpuFlags(kCpuInitialized); \
##FMT_PLANAR##To##FMT_B(src_y, kWidth, \ FMT_PLANAR##To##FMT_B(src_y, kWidth, \
src_uv, kWidth / SUBSAMP_X * 2, \ src_uv, kWidth / SUBSAMP_X * 2, \
dst_argb_c, kWidth * BPP_B, \ dst_argb_c, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
MaskCpuFlags(-1); \ MaskCpuFlags(-1); \
const int runs = 1000; \ const int runs = 1000; \
for (int i = 0; i < runs; ++i) { \ for (int i = 0; i < runs; ++i) { \
##FMT_PLANAR##To##FMT_B(src_y, kWidth, \ FMT_PLANAR##To##FMT_B(src_y, kWidth, \
src_uv, kWidth / SUBSAMP_X * 2, \ src_uv, kWidth / SUBSAMP_X * 2, \
dst_argb_opt, kWidth * BPP_B, \ dst_argb_opt, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
...@@ -142,7 +142,7 @@ TESTBIPLANARTOB(NV12, 2, 2, RGB565, 2) ...@@ -142,7 +142,7 @@ TESTBIPLANARTOB(NV12, 2, 2, RGB565, 2)
TESTBIPLANARTOB(NV21, 2, 2, RGB565, 2) TESTBIPLANARTOB(NV21, 2, 2, RGB565, 2)
#define TESTATOPLANAR(FMT_A, BPP_A, FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y) \ #define TESTATOPLANAR(FMT_A, BPP_A, FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y) \
TEST_F(libyuvTest, ##FMT_A##To##FMT_PLANAR##_OptVsC) { \ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \
const int kWidth = 1280; \ const int kWidth = 1280; \
const int kHeight = 720; \ const int kHeight = 720; \
align_buffer_16(src_argb, (kWidth * BPP_A) * kHeight); \ align_buffer_16(src_argb, (kWidth * BPP_A) * kHeight); \
...@@ -157,7 +157,7 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_PLANAR##_OptVsC) { \ ...@@ -157,7 +157,7 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_PLANAR##_OptVsC) { \
for (int j = 0; j < kWidth * BPP_A; ++j) \ for (int j = 0; j < kWidth * BPP_A; ++j) \
src_argb[(i * kWidth * BPP_A) + j] = (random() & 0xff); \ src_argb[(i * kWidth * BPP_A) + j] = (random() & 0xff); \
MaskCpuFlags(kCpuInitialized); \ MaskCpuFlags(kCpuInitialized); \
##FMT_A##To##FMT_PLANAR(src_argb, kWidth * BPP_A, \ FMT_A##To##FMT_PLANAR(src_argb, kWidth * BPP_A, \
dst_y_c, kWidth, \ dst_y_c, kWidth, \
dst_u_c, kWidth / SUBSAMP_X, \ dst_u_c, kWidth / SUBSAMP_X, \
dst_v_c, kWidth / SUBSAMP_X, \ dst_v_c, kWidth / SUBSAMP_X, \
...@@ -165,7 +165,7 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_PLANAR##_OptVsC) { \ ...@@ -165,7 +165,7 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_PLANAR##_OptVsC) { \
MaskCpuFlags(-1); \ MaskCpuFlags(-1); \
const int runs = 1000; \ const int runs = 1000; \
for (int i = 0; i < runs; ++i) { \ for (int i = 0; i < runs; ++i) { \
##FMT_A##To##FMT_PLANAR(src_argb, kWidth * BPP_A, \ FMT_A##To##FMT_PLANAR(src_argb, kWidth * BPP_A, \
dst_y_opt, kWidth, \ dst_y_opt, kWidth, \
dst_u_opt, kWidth / SUBSAMP_X, \ dst_u_opt, kWidth / SUBSAMP_X, \
dst_v_opt, kWidth / SUBSAMP_X, \ dst_v_opt, kWidth / SUBSAMP_X, \
...@@ -225,7 +225,7 @@ TESTATOPLANAR(ARGB, 4, I422, 2, 1) ...@@ -225,7 +225,7 @@ TESTATOPLANAR(ARGB, 4, I422, 2, 1)
// TODO(fbarchard): Implement and test 411 and 444 // TODO(fbarchard): Implement and test 411 and 444
#define TESTATOB(FMT_A, BPP_A, STRIDE_A, FMT_B, BPP_B) \ #define TESTATOB(FMT_A, BPP_A, STRIDE_A, FMT_B, BPP_B) \
TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_OptVsC) { \ TEST_F(libyuvTest, FMT_A##To##FMT_B##_OptVsC) { \
const int kWidth = 1280; \ const int kWidth = 1280; \
const int kHeight = 720; \ const int kHeight = 720; \
align_buffer_16(src_argb, (kWidth * BPP_A) * kHeight); \ align_buffer_16(src_argb, (kWidth * BPP_A) * kHeight); \
...@@ -236,13 +236,13 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_OptVsC) { \ ...@@ -236,13 +236,13 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_OptVsC) { \
src_argb[i] = (random() & 0xff); \ src_argb[i] = (random() & 0xff); \
} \ } \
MaskCpuFlags(kCpuInitialized); \ MaskCpuFlags(kCpuInitialized); \
##FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \ FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \
dst_argb_c, kWidth * BPP_B, \ dst_argb_c, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
MaskCpuFlags(-1); \ MaskCpuFlags(-1); \
const int runs = 1000; \ const int runs = 1000; \
for (int i = 0; i < runs; ++i) { \ for (int i = 0; i < runs; ++i) { \
##FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \ FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \
dst_argb_opt, kWidth * BPP_B, \ dst_argb_opt, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
} \ } \
...@@ -281,10 +281,10 @@ TESTATOB(UYVY, 2, 2, ARGB, 4) ...@@ -281,10 +281,10 @@ TESTATOB(UYVY, 2, 2, ARGB, 4)
TESTATOB(M420, 3 / 2, 1, ARGB, 4) TESTATOB(M420, 3 / 2, 1, ARGB, 4)
#define TESTATOBRANDOM(FMT_A, BPP_A, STRIDE_A, FMT_B, BPP_B) \ #define TESTATOBRANDOM(FMT_A, BPP_A, STRIDE_A, FMT_B, BPP_B) \
TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_Random) { \ TEST_F(libyuvTest, FMT_A##To##FMT_B##_Random) { \
srandom(time(NULL)); \ srandom(time(NULL)); \
for (int times = 0; times < 1000; ++times) { \ for (int times = 0; times < 1000; ++times) { \
const int kWidth = (random() & 63) + 1; \ const int kWidth = (random() & 63) + 1; \
const int kHeight = (random() & 31) + 1; \ const int kHeight = (random() & 31) + 1; \
align_buffer_page_end(src_argb, (kWidth * BPP_A) * kHeight); \ align_buffer_page_end(src_argb, (kWidth * BPP_A) * kHeight); \
align_buffer_page_end(dst_argb_c, (kWidth * BPP_B) * kHeight); \ align_buffer_page_end(dst_argb_c, (kWidth * BPP_B) * kHeight); \
...@@ -293,11 +293,11 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_Random) { \ ...@@ -293,11 +293,11 @@ TEST_F(libyuvTest, ##FMT_A##To##FMT_B##_Random) { \
src_argb[i] = (random() & 0xff); \ src_argb[i] = (random() & 0xff); \
} \ } \
MaskCpuFlags(kCpuInitialized); \ MaskCpuFlags(kCpuInitialized); \
##FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \ FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \
dst_argb_c, kWidth * BPP_B, \ dst_argb_c, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
MaskCpuFlags(-1); \ MaskCpuFlags(-1); \
##FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \ FMT_A##To##FMT_B(src_argb, kWidth * STRIDE_A, \
dst_argb_opt, kWidth * BPP_B, \ dst_argb_opt, kWidth * BPP_B, \
kWidth, kHeight); \ kWidth, kHeight); \
int err = 0; \ int err = 0; \
......
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