2017-02-24 22:01:40 +03:00
|
|
|
# HG changeset patch
|
|
|
|
# User Randell Jesup <rjesup@jesup.org>
|
2018-05-10 06:59:15 +03:00
|
|
|
# Date 1518630437 18000
|
|
|
|
# Wed Feb 14 12:47:17 2018 -0500
|
|
|
|
# Node ID 6f6fe4a74ed3cc7c7eafef8f46e4d64e531ca7e6
|
|
|
|
# Parent ea38bd8e1f1113c77501d457508219f891f6e9a6
|
|
|
|
[mq]: add_H444ToARGB.patch
|
2017-02-24 22:01:40 +03:00
|
|
|
|
|
|
|
diff --git a/media/libyuv/libyuv/include/libyuv/convert_argb.h b/media/libyuv/libyuv/include/libyuv/convert_argb.h
|
|
|
|
--- a/media/libyuv/libyuv/include/libyuv/convert_argb.h
|
|
|
|
+++ b/media/libyuv/libyuv/include/libyuv/convert_argb.h
|
2018-05-10 06:59:15 +03:00
|
|
|
@@ -149,16 +149,28 @@ int I444ToARGB(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_u,
|
2018-05-10 06:59:15 +03:00
|
|
|
const uint8_t* src_v,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_v,
|
2018-05-10 06:59:15 +03:00
|
|
|
uint8_t* dst_argb,
|
2017-02-24 22:01:40 +03:00
|
|
|
int dst_stride_argb,
|
|
|
|
int width,
|
|
|
|
int height);
|
|
|
|
|
|
|
|
+LIBYUV_API
|
2018-05-10 06:59:15 +03:00
|
|
|
+int H444ToARGB(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_y,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ const uint8_t* src_u,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_u,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ const uint8_t* src_v,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_v,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ uint8_t* dst_argb,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int dst_stride_argb,
|
|
|
|
+ int width,
|
|
|
|
+ int height);
|
|
|
|
+
|
|
|
|
// Convert J444 to ARGB.
|
|
|
|
LIBYUV_API
|
2018-05-10 06:59:15 +03:00
|
|
|
int J444ToARGB(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_y,
|
2018-05-10 06:59:15 +03:00
|
|
|
const uint8_t* src_u,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_u,
|
2018-05-10 06:59:15 +03:00
|
|
|
const uint8_t* src_v,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_v,
|
|
|
|
diff --git a/media/libyuv/libyuv/source/convert_argb.cc b/media/libyuv/libyuv/source/convert_argb.cc
|
|
|
|
--- a/media/libyuv/libyuv/source/convert_argb.cc
|
|
|
|
+++ b/media/libyuv/libyuv/source/convert_argb.cc
|
2018-05-10 06:59:15 +03:00
|
|
|
@@ -714,16 +714,33 @@ int I444ToARGB(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
int dst_stride_argb,
|
|
|
|
int width,
|
|
|
|
int height) {
|
|
|
|
return I444ToARGBMatrix(src_y, src_stride_y, src_u, src_stride_u, src_v,
|
|
|
|
src_stride_v, dst_argb, dst_stride_argb,
|
|
|
|
&kYuvI601Constants, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
+// Convert H444 to ARGB.
|
|
|
|
+LIBYUV_API
|
2018-05-10 06:59:15 +03:00
|
|
|
+int H444ToARGB(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_y,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ const uint8_t* src_u,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_u,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ const uint8_t* src_v,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int src_stride_v,
|
2018-05-10 06:59:15 +03:00
|
|
|
+ uint8_t* dst_argb,
|
2017-02-24 22:01:40 +03:00
|
|
|
+ int dst_stride_argb,
|
|
|
|
+ int width,
|
|
|
|
+ int height) {
|
|
|
|
+ return I444ToARGBMatrix(src_y, src_stride_y, src_u, src_stride_u, src_v,
|
|
|
|
+ src_stride_v, dst_argb, dst_stride_argb,
|
|
|
|
+ &kYuvH709Constants, width, height);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
// Convert I444 to ABGR.
|
|
|
|
LIBYUV_API
|
2018-05-10 06:59:15 +03:00
|
|
|
int I444ToABGR(const uint8_t* src_y,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_y,
|
2018-05-10 06:59:15 +03:00
|
|
|
const uint8_t* src_u,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_u,
|
2018-05-10 06:59:15 +03:00
|
|
|
const uint8_t* src_v,
|
2017-02-24 22:01:40 +03:00
|
|
|
int src_stride_v,
|