diff --git a/README.chromium b/README.chromium index 02d34b791..f78acde77 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 171 +Version: 172 License: BSD License File: LICENSE diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h index 053745588..573049240 100644 --- a/include/libyuv/convert.h +++ b/include/libyuv/convert.h @@ -69,11 +69,6 @@ int I420ToUYVY(const uint8* src_y, int src_stride_y, uint8* dst_frame, int dst_stride_frame, int width, int height); -// TODO(fbarchard): Deprecated - this is same as BG24ToARGB with -height -int RGB24ToARGB(const uint8* src_frame, int src_stride_frame, - uint8* dst_frame, int dst_stride_frame, - int width, int height); - int RGB24ToI420(const uint8* src_frame, int src_stride_frame, uint8* dst_y, int dst_stride_y, uint8* dst_u, int dst_stride_u, diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h index 907a703d5..168fcbcc7 100644 --- a/include/libyuv/planar_functions.h +++ b/include/libyuv/planar_functions.h @@ -190,10 +190,13 @@ int RAWToARGB(const uint8* src_raw, int src_stride_raw, uint8* dst_argb, int dst_stride_argb, int width, int height); -// Convert BG24 to ARGB. -int BG24ToARGB(const uint8* src_bg24, int src_stride_bg24, - uint8* dst_argb, int dst_stride_argb, - int width, int height); +// Convert RGB24 to ARGB. +int RGB24ToARGB(const uint8* src_bg24, int src_stride_bg24, + uint8* dst_argb, int dst_stride_argb, + int width, int height); + +// Deprecated function name +#define BG24ToARGB RGB24ToARGB // Convert ABGR to ARGB. Also used for ARGB to ABGR. int ABGRToARGB(const uint8* src_abgr, int src_stride_abgr, diff --git a/include/libyuv/version.h b/include/libyuv/version.h index bada3b274..39c45205a 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 171 +#define LIBYUV_VERSION 172 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/convert.cc b/source/convert.cc index 6d2dd2f14..b703f65ef 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -318,34 +318,6 @@ loop0: return 0; } -// TODO(fbarchard): Deprecated - this is same as BG24ToARGB with -height -int RGB24ToARGB(const uint8* src_frame, int src_stride_frame, - uint8* dst_frame, int dst_stride_frame, - int width, int height) { - if (src_frame == NULL || dst_frame == NULL) { - return -1; - } - - int i, j, offset; - uint8* outFrame = dst_frame; - const uint8* inFrame = src_frame; - - outFrame += dst_stride_frame * (height - 1) * 4; - for (i = 0; i < height; i++) { - for (j = 0; j < width; j++) { - offset = j * 4; - outFrame[0 + offset] = inFrame[0]; - outFrame[1 + offset] = inFrame[1]; - outFrame[2 + offset] = inFrame[2]; - outFrame[3 + offset] = 0xff; - inFrame += 3; - } - outFrame -= 4 * (dst_stride_frame - width); - inFrame += src_stride_frame - width; - } - return 0; -} - // Test if over reading on source is safe. // TODO(fbarchard): Find more efficient solution to safely do odd sizes. // Macros to control read policy, from slowest to fastest: diff --git a/source/planar_functions.cc b/source/planar_functions.cc index d7f9c5b17..23a169f94 100644 --- a/source/planar_functions.cc +++ b/source/planar_functions.cc @@ -1623,9 +1623,9 @@ int RAWToARGB(const uint8* src_raw, int src_stride_raw, } // Convert RGB24 to ARGB. -int BG24ToARGB(const uint8* src_rgb24, int src_stride_rgb24, - uint8* dst_argb, int dst_stride_argb, - int width, int height) { +int RGB24ToARGB(const uint8* src_rgb24, int src_stride_rgb24, + uint8* dst_argb, int dst_stride_argb, + int width, int height) { if (height < 0) { height = -height; src_rgb24 = src_rgb24 + (height - 1) * src_stride_rgb24;