Skip to content

L
libyuv
Commit c85a7b3a authored by Frank Barchard's avatar Frank Barchard Committed by Frank Barchard
Browse files
Options

MMI Optimized functions I422ToARGB for 1080p video 

Improves playback performance for 1080p video on www.youku.com

BUG=libyuv:841

Change-Id: Iabe7693fba276162af0290863f46e214ab86fb6c
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/1790959Reviewed-by: 's avatarMiguel Casas <mcasas@chromium.org>
parent eeccc19a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 3 deletions
BUILD.gn
View file @ c85a7b3a
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("libyuv.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("libyuv.gni")
declare_args() { declare_args() {
# Set to false to disable building with gflags. # Set to false to disable building with gflags.
...@@ -162,9 +162,8 @@ static_library("libyuv_internal") { ...@@ -162,9 +162,8 @@ static_library("libyuv_internal") {
# crbug.com/538243). # crbug.com/538243).
if (!is_debug || is_nacl) { if (!is_debug || is_nacl) {
configs -= [ "//build/config/compiler:default_optimization" ] configs -= [ "//build/config/compiler:default_optimization" ]
# Enable optimize for speed (-O2) over size (-Os). # Enable optimize for speed (-O2) over size (-Os).
configs += [ "//build/config/compiler:optimize_max" ] #configs += [ "//build/config/compiler:optimize_max" ]
} }
# To enable AVX2 or other cpu optimization, pass flag here # To enable AVX2 or other cpu optimization, pass flag here
......
include/libyuv/row.h
View file @ c85a7b3a
This diff is collapsed.
include/libyuv/scale_row.h
View file @ c85a7b3a
...@@ -126,6 +126,7 @@ extern "C" { ...@@ -126,6 +126,7 @@ extern "C" {
#define HAS_SCALEROWDOWN2_MMI #define HAS_SCALEROWDOWN2_MMI
#define HAS_SCALEROWDOWN4_16_MMI #define HAS_SCALEROWDOWN4_16_MMI
#define HAS_SCALEROWDOWN4_MMI #define HAS_SCALEROWDOWN4_MMI
#define HAS_SCALEROWDOWN34_MMI
#endif #endif
// Scale ARGB vertically with bilinear interpolation. // Scale ARGB vertically with bilinear interpolation.
...@@ -950,6 +951,10 @@ void ScaleRowDown34_MSA(const uint8_t* src_ptr, ...@@ -950,6 +951,10 @@ void ScaleRowDown34_MSA(const uint8_t* src_ptr,
ptrdiff_t src_stride, ptrdiff_t src_stride,
uint8_t* dst, uint8_t* dst,
int dst_width); int dst_width);
void ScaleRowDown34_MMI(const uint8_t* src_ptr,
ptrdiff_t src_stride,
uint8_t* dst,
int dst_width);
void ScaleRowDown34_0_Box_MSA(const uint8_t* src_ptr, void ScaleRowDown34_0_Box_MSA(const uint8_t* src_ptr,
ptrdiff_t src_stride, ptrdiff_t src_stride,
uint8_t* d, uint8_t* d,
...@@ -1003,6 +1008,10 @@ void ScaleRowDown34_Any_MSA(const uint8_t* src_ptr, ...@@ -1003,6 +1008,10 @@ void ScaleRowDown34_Any_MSA(const uint8_t* src_ptr,
ptrdiff_t src_stride, ptrdiff_t src_stride,
uint8_t* dst_ptr, uint8_t* dst_ptr,
int dst_width); int dst_width);
void ScaleRowDown34_Any_MMI(const uint8_t* src_ptr,
ptrdiff_t src_stride,
uint8_t* dst_ptr,
int dst_width);
void ScaleRowDown34_0_Box_Any_MSA(const uint8_t* src_ptr, void ScaleRowDown34_0_Box_Any_MSA(const uint8_t* src_ptr,
ptrdiff_t src_stride, ptrdiff_t src_stride,
uint8_t* dst_ptr, uint8_t* dst_ptr,
......
source/convert_argb.cc
View file @ c85a7b3a
...@@ -105,6 +105,14 @@ static int I420ToARGBMatrix(const uint8_t* src_y, ...@@ -105,6 +105,14 @@ static int I420ToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGBRow = I422ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToARGBRow = I422ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width); I422ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width);
...@@ -291,6 +299,14 @@ static int I422ToARGBMatrix(const uint8_t* src_y, ...@@ -291,6 +299,14 @@ static int I422ToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGBRow = I422ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToARGBRow = I422ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width); I422ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width);
...@@ -575,6 +591,14 @@ static int I010ToARGBMatrix(const uint16_t* src_y, ...@@ -575,6 +591,14 @@ static int I010ToARGBMatrix(const uint16_t* src_y,
I210ToARGBRow = I210ToARGBRow_AVX2; I210ToARGBRow = I210ToARGBRow_AVX2;
} }
} }
#endif
#if defined(HAS_I210TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I210ToARGBRow = I210ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I210ToARGBRow = I210ToARGBRow_MMI;
}
}
#endif #endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I210ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width); I210ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width);
...@@ -725,6 +749,14 @@ static int I444ToARGBMatrix(const uint8_t* src_y, ...@@ -725,6 +749,14 @@ static int I444ToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I444TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I444ToARGBRow = I444ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I444ToARGBRow = I444ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I444ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width); I444ToARGBRow(src_y, src_u, src_v, dst_argb, yuvconstants, width);
...@@ -853,6 +885,14 @@ static int I420AlphaToARGBMatrix(const uint8_t* src_y, ...@@ -853,6 +885,14 @@ static int I420AlphaToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422ALPHATOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422AlphaToARGBRow = I422AlphaToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422AlphaToARGBRow = I422AlphaToARGBRow_MMI;
}
}
#endif
#if defined(HAS_ARGBATTENUATEROW_SSSE3) #if defined(HAS_ARGBATTENUATEROW_SSSE3)
if (TestCpuFlag(kCpuHasSSSE3)) { if (TestCpuFlag(kCpuHasSSSE3)) {
ARGBAttenuateRow = ARGBAttenuateRow_Any_SSSE3; ARGBAttenuateRow = ARGBAttenuateRow_Any_SSSE3;
...@@ -1685,6 +1725,14 @@ static int NV12ToARGBMatrix(const uint8_t* src_y, ...@@ -1685,6 +1725,14 @@ static int NV12ToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_NV12TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV12ToARGBRow = NV12ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
NV12ToARGBRow = NV12ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
NV12ToARGBRow(src_y, src_uv, dst_argb, yuvconstants, width); NV12ToARGBRow(src_y, src_uv, dst_argb, yuvconstants, width);
...@@ -1752,6 +1800,14 @@ static int NV21ToARGBMatrix(const uint8_t* src_y, ...@@ -1752,6 +1800,14 @@ static int NV21ToARGBMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_NV21TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV21ToARGBRow = NV21ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
NV21ToARGBRow = NV21ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
NV21ToARGBRow(src_y, src_vu, dst_argb, yuvconstants, width); NV21ToARGBRow(src_y, src_vu, dst_argb, yuvconstants, width);
...@@ -1870,6 +1926,14 @@ static int NV12ToRGB24Matrix(const uint8_t* src_y, ...@@ -1870,6 +1926,14 @@ static int NV12ToRGB24Matrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_NV12TORGB24ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV12ToRGB24Row = NV12ToRGB24Row_Any_MMI;
if (IS_ALIGNED(width, 8)) {
NV12ToRGB24Row = NV12ToRGB24Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
NV12ToRGB24Row(src_y, src_uv, dst_rgb24, yuvconstants, width); NV12ToRGB24Row(src_y, src_uv, dst_rgb24, yuvconstants, width);
...@@ -1929,6 +1993,14 @@ static int NV21ToRGB24Matrix(const uint8_t* src_y, ...@@ -1929,6 +1993,14 @@ static int NV21ToRGB24Matrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_NV21TORGB24ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV21ToRGB24Row = NV21ToRGB24Row_Any_MMI;
if (IS_ALIGNED(width, 8)) {
NV21ToRGB24Row = NV21ToRGB24Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
NV21ToRGB24Row(src_y, src_vu, dst_rgb24, yuvconstants, width); NV21ToRGB24Row(src_y, src_vu, dst_rgb24, yuvconstants, width);
...@@ -2100,6 +2172,14 @@ int M420ToARGB(const uint8_t* src_m420, ...@@ -2100,6 +2172,14 @@ int M420ToARGB(const uint8_t* src_m420,
} }
} }
#endif #endif
#if defined(HAS_NV12TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV12ToARGBRow = NV12ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
NV12ToARGBRow = NV12ToARGBRow_MMI;
}
}
#endif
for (y = 0; y < height - 1; y += 2) { for (y = 0; y < height - 1; y += 2) {
NV12ToARGBRow(src_m420, src_m420 + src_stride_m420 * 2, dst_argb, NV12ToARGBRow(src_m420, src_m420 + src_stride_m420 * 2, dst_argb,
...@@ -2174,6 +2254,14 @@ int YUY2ToARGB(const uint8_t* src_yuy2, ...@@ -2174,6 +2254,14 @@ int YUY2ToARGB(const uint8_t* src_yuy2,
YUY2ToARGBRow = YUY2ToARGBRow_MSA; YUY2ToARGBRow = YUY2ToARGBRow_MSA;
} }
} }
#endif
#if defined(HAS_YUY2TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
YUY2ToARGBRow = YUY2ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
YUY2ToARGBRow = YUY2ToARGBRow_MMI;
}
}
#endif #endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
YUY2ToARGBRow(src_yuy2, dst_argb, &kYuvI601Constants, width); YUY2ToARGBRow(src_yuy2, dst_argb, &kYuvI601Constants, width);
...@@ -2241,6 +2329,14 @@ int UYVYToARGB(const uint8_t* src_uyvy, ...@@ -2241,6 +2329,14 @@ int UYVYToARGB(const uint8_t* src_uyvy,
UYVYToARGBRow = UYVYToARGBRow_MSA; UYVYToARGBRow = UYVYToARGBRow_MSA;
} }
} }
#endif
#if defined(HAS_UYVYTOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
UYVYToARGBRow = UYVYToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
UYVYToARGBRow = UYVYToARGBRow_MMI;
}
}
#endif #endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
UYVYToARGBRow(src_uyvy, dst_argb, &kYuvI601Constants, width); UYVYToARGBRow(src_uyvy, dst_argb, &kYuvI601Constants, width);
......
source/convert_from.cc
View file @ c85a7b3a
...@@ -592,6 +592,14 @@ static int I420ToRGBAMatrix(const uint8_t* src_y, ...@@ -592,6 +592,14 @@ static int I420ToRGBAMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TORGBAROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToRGBARow = I422ToRGBARow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToRGBARow = I422ToRGBARow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToRGBARow(src_y, src_u, src_v, dst_rgba, yuvconstants, width); I422ToRGBARow(src_y, src_u, src_v, dst_rgba, yuvconstants, width);
...@@ -699,6 +707,14 @@ static int I420ToRGB24Matrix(const uint8_t* src_y, ...@@ -699,6 +707,14 @@ static int I420ToRGB24Matrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TORGB24ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToRGB24Row = I422ToRGB24Row_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToRGB24Row = I422ToRGB24Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToRGB24Row(src_y, src_u, src_v, dst_rgb24, yuvconstants, width); I422ToRGB24Row(src_y, src_u, src_v, dst_rgb24, yuvconstants, width);
...@@ -843,6 +859,14 @@ int I420ToARGB1555(const uint8_t* src_y, ...@@ -843,6 +859,14 @@ int I420ToARGB1555(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGB1555ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGB1555Row = I422ToARGB1555Row_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToARGB1555Row = I422ToARGB1555Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToARGB1555Row(src_y, src_u, src_v, dst_argb1555, &kYuvI601Constants, I422ToARGB1555Row(src_y, src_u, src_v, dst_argb1555, &kYuvI601Constants,
...@@ -916,6 +940,14 @@ int I420ToARGB4444(const uint8_t* src_y, ...@@ -916,6 +940,14 @@ int I420ToARGB4444(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGB4444ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGB4444Row = I422ToARGB4444Row_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToARGB4444Row = I422ToARGB4444Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToARGB4444Row(src_y, src_u, src_v, dst_argb4444, &kYuvI601Constants, I422ToARGB4444Row(src_y, src_u, src_v, dst_argb4444, &kYuvI601Constants,
...@@ -989,6 +1021,14 @@ int I420ToRGB565Matrix(const uint8_t* src_y, ...@@ -989,6 +1021,14 @@ int I420ToRGB565Matrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TORGB565ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToRGB565Row = I422ToRGB565Row_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToRGB565Row = I422ToRGB565Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToRGB565Row(src_y, src_u, src_v, dst_rgb565, yuvconstants, width); I422ToRGB565Row(src_y, src_u, src_v, dst_rgb565, yuvconstants, width);
...@@ -1192,6 +1232,14 @@ int I420ToRGB565Dither(const uint8_t* src_y, ...@@ -1192,6 +1232,14 @@ int I420ToRGB565Dither(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGBRow = I422ToARGBRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToARGBRow = I422ToARGBRow_MMI;
}
}
#endif
#if defined(HAS_ARGBTORGB565DITHERROW_SSE2) #if defined(HAS_ARGBTORGB565DITHERROW_SSE2)
if (TestCpuFlag(kCpuHasSSE2)) { if (TestCpuFlag(kCpuHasSSE2)) {
ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_Any_SSE2; ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_Any_SSE2;
...@@ -1223,6 +1271,14 @@ int I420ToRGB565Dither(const uint8_t* src_y, ...@@ -1223,6 +1271,14 @@ int I420ToRGB565Dither(const uint8_t* src_y,
ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_MSA; ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_MSA;
} }
} }
#endif
#if defined(HAS_ARGBTORGB565DITHERROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
ARGBToRGB565DitherRow = ARGBToRGB565DitherRow_MMI;
}
}
#endif #endif
{ {
// Allocate a row of argb. // Allocate a row of argb.
......
source/planar_functions.cc
View file @ c85a7b3a
...@@ -1766,6 +1766,14 @@ static int I422ToRGBAMatrix(const uint8_t* src_y, ...@@ -1766,6 +1766,14 @@ static int I422ToRGBAMatrix(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_I422TORGBAROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToRGBARow = I422ToRGBARow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
I422ToRGBARow = I422ToRGBARow_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
I422ToRGBARow(src_y, src_u, src_v, dst_rgba, yuvconstants, width); I422ToRGBARow(src_y, src_u, src_v, dst_rgba, yuvconstants, width);
...@@ -1868,6 +1876,14 @@ int NV12ToRGB565(const uint8_t* src_y, ...@@ -1868,6 +1876,14 @@ int NV12ToRGB565(const uint8_t* src_y,
} }
} }
#endif #endif
#if defined(HAS_NV12TORGB565ROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
NV12ToRGB565Row = NV12ToRGB565Row_Any_MMI;
if (IS_ALIGNED(width, 4)) {
NV12ToRGB565Row = NV12ToRGB565Row_MMI;
}
}
#endif
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
NV12ToRGB565Row(src_y, src_uv, dst_rgb565, &kYuvI601Constants, width); NV12ToRGB565Row(src_y, src_uv, dst_rgb565, &kYuvI601Constants, width);
...@@ -2081,6 +2097,14 @@ int ARGBRect(uint8_t* dst_argb, ...@@ -2081,6 +2097,14 @@ int ARGBRect(uint8_t* dst_argb,
} }
} }
#endif #endif
#if defined(HAS_ARGBSETROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
ARGBSetRow = ARGBSetRow_Any_MMI;
if (IS_ALIGNED(width, 4)) {
ARGBSetRow = ARGBSetRow_MMI;
}
}
#endif
// Set plane // Set plane
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
......
source/row_any.cc
View file @ c85a7b3a
...@@ -64,6 +64,9 @@ ANY41C(I422AlphaToARGBRow_Any_NEON, I422AlphaToARGBRow_NEON, 1, 0, 4, 7) ...@@ -64,6 +64,9 @@ ANY41C(I422AlphaToARGBRow_Any_NEON, I422AlphaToARGBRow_NEON, 1, 0, 4, 7)
#ifdef HAS_I422ALPHATOARGBROW_MSA #ifdef HAS_I422ALPHATOARGBROW_MSA
ANY41C(I422AlphaToARGBRow_Any_MSA, I422AlphaToARGBRow_MSA, 1, 0, 4, 7) ANY41C(I422AlphaToARGBRow_Any_MSA, I422AlphaToARGBRow_MSA, 1, 0, 4, 7)
#endif #endif
#ifdef HAS_I422ALPHATOARGBROW_MMI
ANY41C(I422AlphaToARGBRow_Any_MMI, I422AlphaToARGBRow_MMI, 1, 0, 4, 7)
#endif
#undef ANY41C #undef ANY41C
// Any 3 planes to 1. // Any 3 planes to 1.
...@@ -215,6 +218,15 @@ ANY31C(I422ToARGB4444Row_Any_MSA, I422ToARGB4444Row_MSA, 1, 0, 2, 7) ...@@ -215,6 +218,15 @@ ANY31C(I422ToARGB4444Row_Any_MSA, I422ToARGB4444Row_MSA, 1, 0, 2, 7)
ANY31C(I422ToARGB1555Row_Any_MSA, I422ToARGB1555Row_MSA, 1, 0, 2, 7) ANY31C(I422ToARGB1555Row_Any_MSA, I422ToARGB1555Row_MSA, 1, 0, 2, 7)
ANY31C(I422ToRGB565Row_Any_MSA, I422ToRGB565Row_MSA, 1, 0, 2, 7) ANY31C(I422ToRGB565Row_Any_MSA, I422ToRGB565Row_MSA, 1, 0, 2, 7)
#endif #endif
#ifdef HAS_I422TOARGBROW_MMI
ANY31C(I444ToARGBRow_Any_MMI, I444ToARGBRow_MMI, 0, 0, 4, 7)
ANY31C(I422ToARGBRow_Any_MMI, I422ToARGBRow_MMI, 1, 0, 4, 7)
ANY31C(I422ToRGB24Row_Any_MMI, I422ToRGB24Row_MMI, 1, 0, 3, 15)
ANY31C(I422ToARGB4444Row_Any_MMI, I422ToARGB4444Row_MMI, 1, 0, 2, 7)
ANY31C(I422ToARGB1555Row_Any_MMI, I422ToARGB1555Row_MMI, 1, 0, 2, 7)
ANY31C(I422ToRGB565Row_Any_MMI, I422ToRGB565Row_MMI, 1, 0, 2, 7)
ANY31C(I422ToRGBARow_Any_MMI, I422ToRGBARow_MMI, 1, 0, 4, 7)
#endif
#undef ANY31C #undef ANY31C
// Any 3 planes of 16 bit to 1 with yuvconstants // Any 3 planes of 16 bit to 1 with yuvconstants
...@@ -250,6 +262,9 @@ ANY31CT(I210ToARGBRow_Any_AVX2, I210ToARGBRow_AVX2, 1, 0, uint16_t, 2, 4, 15) ...@@ -250,6 +262,9 @@ ANY31CT(I210ToARGBRow_Any_AVX2, I210ToARGBRow_AVX2, 1, 0, uint16_t, 2, 4, 15)
#ifdef HAS_I210TOAR30ROW_AVX2 #ifdef HAS_I210TOAR30ROW_AVX2
ANY31CT(I210ToAR30Row_Any_AVX2, I210ToAR30Row_AVX2, 1, 0, uint16_t, 2, 4, 15) ANY31CT(I210ToAR30Row_Any_AVX2, I210ToAR30Row_AVX2, 1, 0, uint16_t, 2, 4, 15)
#endif #endif
#ifdef HAS_I210TOARGBROW_MMI
ANY31CT(I210ToARGBRow_Any_MMI, I210ToARGBRow_MMI, 1, 0, uint16_t, 2, 4, 7)
#endif
#undef ANY31CT #undef ANY31CT
// Any 2 planes to 1. // Any 2 planes to 1.
...@@ -407,6 +422,9 @@ ANY21C(NV12ToARGBRow_Any_NEON, NV12ToARGBRow_NEON, 1, 1, 2, 4, 7) ...@@ -407,6 +422,9 @@ ANY21C(NV12ToARGBRow_Any_NEON, NV12ToARGBRow_NEON, 1, 1, 2, 4, 7)
#ifdef HAS_NV12TOARGBROW_MSA #ifdef HAS_NV12TOARGBROW_MSA
ANY21C(NV12ToARGBRow_Any_MSA, NV12ToARGBRow_MSA, 1, 1, 2, 4, 7) ANY21C(NV12ToARGBRow_Any_MSA, NV12ToARGBRow_MSA, 1, 1, 2, 4, 7)
#endif #endif
#ifdef HAS_NV12TOARGBROW_MMI
ANY21C(NV12ToARGBRow_Any_MMI, NV12ToARGBRow_MMI, 1, 1, 2, 4, 7)
#endif
#ifdef HAS_NV21TOARGBROW_SSSE3 #ifdef HAS_NV21TOARGBROW_SSSE3
ANY21C(NV21ToARGBRow_Any_SSSE3, NV21ToARGBRow_SSSE3, 1, 1, 2, 4, 7) ANY21C(NV21ToARGBRow_Any_SSSE3, NV21ToARGBRow_SSSE3, 1, 1, 2, 4, 7)
#endif #endif
...@@ -419,6 +437,9 @@ ANY21C(NV21ToARGBRow_Any_NEON, NV21ToARGBRow_NEON, 1, 1, 2, 4, 7) ...@@ -419,6 +437,9 @@ ANY21C(NV21ToARGBRow_Any_NEON, NV21ToARGBRow_NEON, 1, 1, 2, 4, 7)
#ifdef HAS_NV21TOARGBROW_MSA #ifdef HAS_NV21TOARGBROW_MSA
ANY21C(NV21ToARGBRow_Any_MSA, NV21ToARGBRow_MSA, 1, 1, 2, 4, 7) ANY21C(NV21ToARGBRow_Any_MSA, NV21ToARGBRow_MSA, 1, 1, 2, 4, 7)
#endif #endif
#ifdef HAS_NV21TOARGBROW_MMI
ANY21C(NV21ToARGBRow_Any_MMI, NV21ToARGBRow_MMI, 1, 1, 2, 4, 7)
#endif
#ifdef HAS_NV12TORGB24ROW_NEON #ifdef HAS_NV12TORGB24ROW_NEON
ANY21C(NV12ToRGB24Row_Any_NEON, NV12ToRGB24Row_NEON, 1, 1, 2, 3, 7) ANY21C(NV12ToRGB24Row_Any_NEON, NV12ToRGB24Row_NEON, 1, 1, 2, 3, 7)
#endif #endif
...@@ -428,6 +449,9 @@ ANY21C(NV21ToRGB24Row_Any_NEON, NV21ToRGB24Row_NEON, 1, 1, 2, 3, 7) ...@@ -428,6 +449,9 @@ ANY21C(NV21ToRGB24Row_Any_NEON, NV21ToRGB24Row_NEON, 1, 1, 2, 3, 7)
#ifdef HAS_NV12TORGB24ROW_SSSE3 #ifdef HAS_NV12TORGB24ROW_SSSE3
ANY21C(NV12ToRGB24Row_Any_SSSE3, NV12ToRGB24Row_SSSE3, 1, 1, 2, 3, 15) ANY21C(NV12ToRGB24Row_Any_SSSE3, NV12ToRGB24Row_SSSE3, 1, 1, 2, 3, 15)
#endif #endif
#ifdef HAS_NV12TORGB24ROW_MMI
ANY21C(NV12ToRGB24Row_Any_MMI, NV12ToRGB24Row_MMI, 1, 1, 2, 3, 7)
#endif
#ifdef HAS_NV21TORGB24ROW_SSSE3 #ifdef HAS_NV21TORGB24ROW_SSSE3
ANY21C(NV21ToRGB24Row_Any_SSSE3, NV21ToRGB24Row_SSSE3, 1, 1, 2, 3, 15) ANY21C(NV21ToRGB24Row_Any_SSSE3, NV21ToRGB24Row_SSSE3, 1, 1, 2, 3, 15)
#endif #endif
...@@ -437,6 +461,9 @@ ANY21C(NV12ToRGB24Row_Any_AVX2, NV12ToRGB24Row_AVX2, 1, 1, 2, 3, 31) ...@@ -437,6 +461,9 @@ ANY21C(NV12ToRGB24Row_Any_AVX2, NV12ToRGB24Row_AVX2, 1, 1, 2, 3, 31)
#ifdef HAS_NV21TORGB24ROW_AVX2 #ifdef HAS_NV21TORGB24ROW_AVX2
ANY21C(NV21ToRGB24Row_Any_AVX2, NV21ToRGB24Row_AVX2, 1, 1, 2, 3, 31) ANY21C(NV21ToRGB24Row_Any_AVX2, NV21ToRGB24Row_AVX2, 1, 1, 2, 3, 31)
#endif #endif
#ifdef HAS_NV21TORGB24ROW_MMI
ANY21C(NV21ToRGB24Row_Any_MMI, NV21ToRGB24Row_MMI, 1, 1, 2, 3, 7)
#endif
#ifdef HAS_NV12TORGB565ROW_SSSE3 #ifdef HAS_NV12TORGB565ROW_SSSE3
ANY21C(NV12ToRGB565Row_Any_SSSE3, NV12ToRGB565Row_SSSE3, 1, 1, 2, 2, 7) ANY21C(NV12ToRGB565Row_Any_SSSE3, NV12ToRGB565Row_SSSE3, 1, 1, 2, 2, 7)
#endif #endif
...@@ -449,6 +476,9 @@ ANY21C(NV12ToRGB565Row_Any_NEON, NV12ToRGB565Row_NEON, 1, 1, 2, 2, 7) ...@@ -449,6 +476,9 @@ ANY21C(NV12ToRGB565Row_Any_NEON, NV12ToRGB565Row_NEON, 1, 1, 2, 2, 7)
#ifdef HAS_NV12TORGB565ROW_MSA #ifdef HAS_NV12TORGB565ROW_MSA
ANY21C(NV12ToRGB565Row_Any_MSA, NV12ToRGB565Row_MSA, 1, 1, 2, 2, 7) ANY21C(NV12ToRGB565Row_Any_MSA, NV12ToRGB565Row_MSA, 1, 1, 2, 2, 7)
#endif #endif
#ifdef HAS_NV12TORGB565ROW_MMI
ANY21C(NV12ToRGB565Row_Any_MMI, NV12ToRGB565Row_MMI, 1, 1, 2, 2, 7)
#endif
#undef ANY21C #undef ANY21C
// Any 1 to 1. // Any 1 to 1.
...@@ -1049,6 +1079,10 @@ ANY11C(UYVYToARGBRow_Any_NEON, UYVYToARGBRow_NEON, 1, 4, 4, 7) ...@@ -1049,6 +1079,10 @@ ANY11C(UYVYToARGBRow_Any_NEON, UYVYToARGBRow_NEON, 1, 4, 4, 7)
ANY11C(YUY2ToARGBRow_Any_MSA, YUY2ToARGBRow_MSA, 1, 4, 4, 7) ANY11C(YUY2ToARGBRow_Any_MSA, YUY2ToARGBRow_MSA, 1, 4, 4, 7)
ANY11C(UYVYToARGBRow_Any_MSA, UYVYToARGBRow_MSA, 1, 4, 4, 7) ANY11C(UYVYToARGBRow_Any_MSA, UYVYToARGBRow_MSA, 1, 4, 4, 7)
#endif #endif
#if defined(HAS_YUY2TOARGBROW_MMI)
ANY11C(YUY2ToARGBRow_Any_MMI, YUY2ToARGBRow_MMI, 1, 4, 4, 7)
ANY11C(UYVYToARGBRow_Any_MMI, UYVYToARGBRow_MMI, 1, 4, 4, 7)
#endif
#undef ANY11C #undef ANY11C
// Any 1 to 1 interpolate. Takes 2 rows of source via stride. // Any 1 to 1 interpolate. Takes 2 rows of source via stride.
...@@ -1157,6 +1191,9 @@ ANY1(ARGBSetRow_Any_NEON, ARGBSetRow_NEON, uint32_t, 4, 3) ...@@ -1157,6 +1191,9 @@ ANY1(ARGBSetRow_Any_NEON, ARGBSetRow_NEON, uint32_t, 4, 3)
#ifdef HAS_ARGBSETROW_MSA #ifdef HAS_ARGBSETROW_MSA
ANY1(ARGBSetRow_Any_MSA, ARGBSetRow_MSA, uint32_t, 4, 3) ANY1(ARGBSetRow_Any_MSA, ARGBSetRow_MSA, uint32_t, 4, 3)
#endif #endif
#ifdef HAS_ARGBSETROW_MMI
ANY1(ARGBSetRow_Any_MMI, ARGBSetRow_MMI, uint32_t, 4, 3)
#endif
#undef ANY1 #undef ANY1
// Any 1 to 2. Outputs UV planes. // Any 1 to 2. Outputs UV planes.
......
source/row_mmi.cc
View file @ c85a7b3a
This source diff could not be displayed because it is too large. You can view the blob instead.
source/scale.cc
View file @ c85a7b3a
...@@ -398,6 +398,18 @@ static void ScalePlaneDown34(int src_width, ...@@ -398,6 +398,18 @@ static void ScalePlaneDown34(int src_width,
} }
} }
#endif #endif
#if defined(HAS_SCALEROWDOWN34_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
if (!filtering) {
ScaleRowDown34_0 = ScaleRowDown34_Any_MMI;
ScaleRowDown34_1 = ScaleRowDown34_Any_MMI;
if (dst_width % 24 == 0) {
ScaleRowDown34_0 = ScaleRowDown34_MMI;
ScaleRowDown34_1 = ScaleRowDown34_MMI;
}
}
}
#endif
#if defined(HAS_SCALEROWDOWN34_SSSE3) #if defined(HAS_SCALEROWDOWN34_SSSE3)
if (TestCpuFlag(kCpuHasSSSE3)) { if (TestCpuFlag(kCpuHasSSSE3)) {
if (!filtering) { if (!filtering) {
......
source/scale_any.cc
View file @ c85a7b3a
...@@ -296,6 +296,14 @@ SDANY(ScaleRowDown34_1_Box_Any_MSA, ...@@ -296,6 +296,14 @@ SDANY(ScaleRowDown34_1_Box_Any_MSA,
1, 1,
47) 47)
#endif #endif
#ifdef HAS_SCALEROWDOWN34_MMI
SDANY(ScaleRowDown34_Any_MMI,
ScaleRowDown34_MMI,
ScaleRowDown34_C,
4 / 3,
1,
23)
#endif
#ifdef HAS_SCALEROWDOWN38_SSSE3 #ifdef HAS_SCALEROWDOWN38_SSSE3
SDANY(ScaleRowDown38_Any_SSSE3, SDANY(ScaleRowDown38_Any_SSSE3,
ScaleRowDown38_SSSE3, ScaleRowDown38_SSSE3,
......
source/scale_argb.cc
View file @ c85a7b3a
...@@ -627,6 +627,14 @@ static void ScaleYUVToARGBBilinearUp(int src_width, ...@@ -627,6 +627,14 @@ static void ScaleYUVToARGBBilinearUp(int src_width,
} }
} }
#endif #endif
#if defined(HAS_I422TOARGBROW_MMI)
if (TestCpuFlag(kCpuHasMMI)) {
I422ToARGBRow = I422ToARGBRow_Any_MMI;
if (IS_ALIGNED(src_width, 4)) {
I422ToARGBRow = I422ToARGBRow_MMI;
}
}
#endif
void (*InterpolateRow)(uint8_t * dst_argb, const uint8_t* src_argb, void (*InterpolateRow)(uint8_t * dst_argb, const uint8_t* src_argb,
ptrdiff_t src_stride, int dst_width, ptrdiff_t src_stride, int dst_width,
......
source/scale_mmi.cc
View file @ c85a7b3a
...@@ -1103,6 +1103,61 @@ void ScaleRowUp2_16_MMI(const uint16_t* src_ptr, ...@@ -1103,6 +1103,61 @@ void ScaleRowUp2_16_MMI(const uint16_t* src_ptr,
: "memory"); : "memory");
} }
void ScaleRowDown34_MMI(const uint8_t* src_ptr,
ptrdiff_t src_stride,
uint8_t* dst,
int dst_width) {
(void)src_stride;
assert((dst_width % 3 == 0) && (dst_width > 0));
uint64_t src[2];
uint64_t tmp[2];
__asm__ volatile (
"1: \n\t"
"gsldlc1 %[src0], 0x07(%[src_ptr]) \n\t"
"gsldrc1 %[src0], 0x00(%[src_ptr]) \n\t"
"gsldlc1 %[src1], 0x0f(%[src_ptr]) \n\t"
"gsldrc1 %[src1], 0x08(%[src_ptr]) \n\t"
"and %[tmp1], %[src0], %[mask1] \n\t"
"psrlw %[tmp0], %[src0], %[rmov] \n\t"
"psllw %[tmp0], %[tmp0], %[lmov1] \n\t"
"or %[src0], %[tmp0], %[tmp1] \n\t"
"punpckhwd %[tmp0], %[src0], %[src0] \n\t"
"psllw %[tmp1], %[tmp0], %[rmov] \n\t"
"or %[src0], %[src0], %[tmp1] \n\t"
"psrlw %[tmp0], %[tmp0], %[rmov8] \n\t"
"pextrh %[tmp0], %[tmp0], %[zero] \n\t"
"pinsrh_2 %[src0], %[src0], %[tmp0] \n\t"
"pextrh %[tmp0], %[src1], %[zero] \n\t"
"pinsrh_3 %[src0], %[src0], %[tmp0] \n\t"
"punpckhwd %[tmp0], %[src1], %[src1] \n\t"
"pextrh %[tmp1], %[tmp0], %[zero] \n\t"
"psrlw %[src1], %[src1], %[rmov] \n\t"
"psllw %[tmp1], %[tmp1], %[rmov8] \n\t"
"or %[src1], %[src1], %[tmp1] \n\t"
"and %[tmp0], %[tmp0], %[mask2] \n\t"
"or %[src1], %[src1], %[tmp0] \n\t"
"gssdlc1 %[src0], 0x07(%[dst_ptr]) \n\t"
"gssdrc1 %[src0], 0x00(%[dst_ptr]) \n\t"
"gsswlc1 %[src1], 0x0b(%[dst_ptr]) \n\t"
"gsswrc1 %[src1], 0x08(%[dst_ptr]) \n\t"
"daddiu %[src_ptr], %[src_ptr], 0x10 \n\t"
"daddi %[width], %[width], -0x0c \n\t"
"daddiu %[dst_ptr], %[dst_ptr], 0x0c \n\t"
"bnez %[width], 1b \n\t"
: [src0]"=&f"(src[0]), [src1]"=&f"(src[1]),
[tmp0]"=&f"(tmp[0]), [tmp1]"=&f"(tmp[1])
: [src_ptr]"r"(src_ptr), [dst_ptr]"r"(dst),
[lmov]"f"(0xc), [rmov]"f"(0x18),
[mask1]"f"(0xffff0000ffff), [rmov8]"f"(0x8),
[zero]"f"(0x0), [mask2]"f"(0xff000000),
[width]"r"(dst_width), [lmov1]"f"(0x10)
: "memory"
);
}
// clang-format on // clang-format on
#endif // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A) #endif // !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A)
......
unit_test/cpu_test.cc
View file @ c85a7b3a
...@@ -160,7 +160,12 @@ TEST_F(LibYUVBaseTest, TestLinuxNeon) { ...@@ -160,7 +160,12 @@ TEST_F(LibYUVBaseTest, TestLinuxNeon) {
#endif #endif
} }
// TODO(fbarchard): Fix clangcl test of cpuflags.
#ifdef _MSC_VER
TEST_F(LibYUVBaseTest, DISABLED_TestSetCpuFlags) {
#else
TEST_F(LibYUVBaseTest, TestSetCpuFlags) { TEST_F(LibYUVBaseTest, TestSetCpuFlags) {
#endif
// Reset any masked flags that may have been set so auto init is enabled. // Reset any masked flags that may have been set so auto init is enabled.
MaskCpuFlags(0); MaskCpuFlags(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment