diff --git a/README.chromium b/README.chromium index f46e4d0f5..9aeafeb91 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: https://chromium.googlesource.com/libyuv/libyuv/ -Version: 1953 +Version: 1954 Revision: DEPS License: BSD-3-Clause License File: LICENSE diff --git a/include/libyuv/convert_from_argb.h b/include/libyuv/convert_from_argb.h index d9fac50c9..a2bb3750a 100644 --- a/include/libyuv/convert_from_argb.h +++ b/include/libyuv/convert_from_argb.h @@ -418,6 +418,18 @@ int ARGBToNV12Matrix(const uint8_t* src_argb, int width, int height); +// RGB to NV21 with matrix. See ArgbConstants at the top of this file for usage. +LIBYUV_API +int ARGBToNV21Matrix(const uint8_t* src_argb, + int src_stride_argb, + uint8_t* dst_y, + int dst_stride_y, + uint8_t* dst_vu, + int dst_stride_vu, + const struct ArgbConstants* argbconstants, + int width, + int height); + // Convert ARGB To NV21. LIBYUV_API int ARGBToNV21(const uint8_t* src_argb, diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 7f9da35e7..dc58a3d69 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1953 +#define LIBYUV_VERSION 1954 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/convert_from_argb.cc b/source/convert_from_argb.cc index 225465a3e..96ab1bc9c 100644 --- a/source/convert_from_argb.cc +++ b/source/convert_from_argb.cc @@ -632,6 +632,7 @@ int ARGBToNV12Matrix(const uint8_t* src_argb, return 0; } +LIBYUV_API int ARGBToNV21Matrix(const uint8_t* src_argb, int src_stride_argb, uint8_t* dst_y,