coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

src_uv typo fix

Browse Source 
R=harryjin@google.com
BUG=none

Review URL: https://webrtc-codereview.appspot.com/51299004.
This commit is contained in:
Frank Barchard 2015-07-15 18:21:06 -07:00
parent 3d190ee9f1
commit faebf89ce0
3 changed files with 12 additions and 12 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: 1445 Version: 1446
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 1445 #define LIBYUV_VERSION 1446
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

20
source/row_common.cc
View File

@ -1378,23 +1378,23 @@ void I411ToARGBRow_C(const uint8* src_y,
} }
void NV12ToARGBRow_C(const uint8* src_y, void NV12ToARGBRow_C(const uint8* src_y,
const uint8* usrc_v, const uint8* src_uv,
uint8* rgb_buf, uint8* rgb_buf,
int width) { int width) {
int x; int x;
for (x = 0; x < width - 1; x += 2) { for (x = 0; x < width - 1; x += 2) {
YuvPixel(src_y[0], usrc_v[0], usrc_v[1], YuvPixel(src_y[0], src_uv[0], src_uv[1],
rgb_buf + 0, rgb_buf + 1, rgb_buf + 2); rgb_buf + 0, rgb_buf + 1, rgb_buf + 2);
rgb_buf[3] = 255; rgb_buf[3] = 255;
YuvPixel(src_y[1], usrc_v[0], usrc_v[1], YuvPixel(src_y[1], src_uv[0], src_uv[1],
rgb_buf + 4, rgb_buf + 5, rgb_buf + 6); rgb_buf + 4, rgb_buf + 5, rgb_buf + 6);
rgb_buf[7] = 255; rgb_buf[7] = 255;
src_y += 2; src_y += 2;
usrc_v += 2; src_uv += 2;
rgb_buf += 8; // Advance 2 pixels. rgb_buf += 8; // Advance 2 pixels.
} }
if (width & 1) { if (width & 1) {
YuvPixel(src_y[0], usrc_v[0], usrc_v[1], YuvPixel(src_y[0], src_uv[0], src_uv[1],
rgb_buf + 0, rgb_buf + 1, rgb_buf + 2); rgb_buf + 0, rgb_buf + 1, rgb_buf + 2);
rgb_buf[3] = 255; rgb_buf[3] = 255;
} }
@ -1426,7 +1426,7 @@ void NV21ToARGBRow_C(const uint8* src_y,
} }
void NV12ToRGB565Row_C(const uint8* src_y, void NV12ToRGB565Row_C(const uint8* src_y,
const uint8* usrc_v, const uint8* src_uv,
uint8* dst_rgb565, uint8* dst_rgb565,
int width) { int width) {
uint8 b0; uint8 b0;
@ -1437,8 +1437,8 @@ void NV12ToRGB565Row_C(const uint8* src_y,
uint8 r1; uint8 r1;
int x; int x;
for (x = 0; x < width - 1; x += 2) { for (x = 0; x < width - 1; x += 2) {
YuvPixel(src_y[0], usrc_v[0], usrc_v[1], &b0, &g0, &r0); YuvPixel(src_y[0], src_uv[0], src_uv[1], &b0, &g0, &r0);
YuvPixel(src_y[1], usrc_v[0], usrc_v[1], &b1, &g1, &r1); YuvPixel(src_y[1], src_uv[0], src_uv[1], &b1, &g1, &r1);
b0 = b0 >> 3; b0 = b0 >> 3;
g0 = g0 >> 2; g0 = g0 >> 2;
r0 = r0 >> 3; r0 = r0 >> 3;
@ -1448,11 +1448,11 @@ void NV12ToRGB565Row_C(const uint8* src_y,
*(uint32*)(dst_rgb565) = b0 | (g0 << 5) | (r0 << 11) | *(uint32*)(dst_rgb565) = b0 | (g0 << 5) | (r0 << 11) |
(b1 << 16) | (g1 << 21) | (r1 << 27); (b1 << 16) | (g1 << 21) | (r1 << 27);
src_y += 2; src_y += 2;
usrc_v += 2; src_uv += 2;
dst_rgb565 += 4; // Advance 2 pixels. dst_rgb565 += 4; // Advance 2 pixels.
} }
if (width & 1) { if (width & 1) {
YuvPixel(src_y[0], usrc_v[0], usrc_v[1], &b0, &g0, &r0); YuvPixel(src_y[0], src_uv[0], src_uv[1], &b0, &g0, &r0);
b0 = b0 >> 3; b0 = b0 >> 3;
g0 = g0 >> 2; g0 = g0 >> 2;
r0 = r0 >> 3; r0 = r0 >> 3;