Commit 06f275cc authored by fbarchard@google.com's avatar fbarchard@google.com

a tsan build caused UYVY unittest to fail. This re-enables the test and fixes the bug.

BUG=80
TEST=unittest with tsan or use build bots
Review URL: https://webrtc-codereview.appspot.com/804004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@348 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 008e5eb6
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 347
Version: 348
License: BSD
License File: LICENSE
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 347
#define LIBYUV_VERSION 348
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
......@@ -583,7 +583,7 @@ int I420ToUYVY(const uint8* src_y, int src_stride_y,
uint8* dst_frame, int dst_stride_frame,
int width, int height) {
if (!src_y || !src_u || !src_v || !dst_frame ||
width <= 0 || height <= 0 ) {
width <= 0 || height == 0) {
return -1;
}
// Negative height means invert the image.
......
......@@ -91,15 +91,12 @@ TESTPLANARTOB(I420, 2, 2, RGB24, 3)
TESTPLANARTOB(I420, 2, 2, RGB565, 2)
TESTPLANARTOB(I420, 2, 2, ARGB1555, 2)
TESTPLANARTOB(I420, 2, 2, ARGB4444, 2)
// TODO(fbarchard): fix 411 to ARGB valgrind error. libyuv bug #79
//TESTPLANARTOB(I411, 4, 1, ARGB, 4)
TESTPLANARTOB(I411, 4, 1, ARGB, 4)
TESTPLANARTOB(I422, 2, 1, ARGB, 4)
TESTPLANARTOB(I444, 1, 1, ARGB, 4)
TESTPLANARTOB(I420, 2, 2, YUY2, 2)
// TODO(fbarchard): fix I420ToUYVYInvert_OptVsC tsan failure. libyuv bug #80
//TESTPLANARTOB(I420, 2, 2, UYVY, 2)
// TODO(fbarchard): fix I420ToV210Invert_OptVsC valgrind failure. libyuv bug #82
//TESTPLANARTOB(I420, 2, 2, V210, 16 / 6)
TESTPLANARTOB(I420, 2, 2, UYVY, 2)
TESTPLANARTOB(I420, 2, 2, V210, 16 / 6)
TESTPLANARTOB(I420, 2, 2, I400, 1)
TESTPLANARTOB(I420, 2, 2, BayerBGGR, 1)
TESTPLANARTOB(I420, 2, 2, BayerRGGB, 1)
......
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