Bug 1698699 - P2 - remove absorbed add_H444ToARGB.patch;r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D150302
This commit is contained in:
Nico Grunbaum 2022-06-27 20:40:02 +00:00
Родитель 8adcfe58f3
Коммит 44702c3cfa
2 изменённых файлов: 0 добавлений и 79 удалений

Просмотреть файл

@ -1,77 +0,0 @@
# HG changeset patch
# User Randell Jesup <rjesup@jesup.org>
# Date 1518630437 18000
# Wed Feb 14 12:47:17 2018 -0500
# Node ID 6f6fe4a74ed3cc7c7eafef8f46e4d64e531ca7e6
# Parent ea38bd8e1f1113c77501d457508219f891f6e9a6
[mq]: add_H444ToARGB.patch
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
@@ -149,16 +149,28 @@ int I444ToARGB(const uint8_t* src_y,
int src_stride_u,
const uint8_t* src_v,
int src_stride_v,
uint8_t* dst_argb,
int dst_stride_argb,
int width,
int height);
+LIBYUV_API
+int H444ToARGB(const uint8_t* src_y,
+ int src_stride_y,
+ const uint8_t* src_u,
+ int src_stride_u,
+ const uint8_t* src_v,
+ int src_stride_v,
+ uint8_t* dst_argb,
+ int dst_stride_argb,
+ int width,
+ int height);
+
// Convert J444 to ARGB.
LIBYUV_API
int J444ToARGB(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_u,
int src_stride_u,
const uint8_t* src_v,
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
@@ -714,16 +714,33 @@ int I444ToARGB(const uint8_t* src_y,
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
+int H444ToARGB(const uint8_t* src_y,
+ int src_stride_y,
+ const uint8_t* src_u,
+ int src_stride_u,
+ const uint8_t* src_v,
+ int src_stride_v,
+ uint8_t* dst_argb,
+ 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
int I444ToABGR(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_u,
int src_stride_u,
const uint8_t* src_v,
int src_stride_v,

Просмотреть файл

@ -50,8 +50,6 @@ def apply_patches(base):
'make_mjpeg_printfs_optional.patch',
# allow disabling of inline ASM and AVX2 code
'allow_disabling_asm_avx2.patch',
# add H444ToARGB() variant
'add_H444ToARGB.patch',
]
for patch in patches: