From 8869628c24a31989427e2856203865b38383d848 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Wed, 27 May 2020 23:23:51 -0700 Subject: [PATCH] Remove unnecessary include of convert_argb Bug: libyuv:861, b/156642185 Change-Id: I3ddbe2f7b61629ed18b6879203203a51b3700773 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2219047 Reviewed-by: Mirko Bonadei Commit-Queue: Frank Barchard --- source/row_any.cc | 1 - source/row_gcc.cc | 2 -- source/row_mmi.cc | 1 - source/row_msa.cc | 1 - source/row_neon.cc | 2 -- source/row_neon64.cc | 2 -- source/row_win.cc | 2 -- unit_test/convert_test.cc | 12 ------------ 8 files changed, 23 deletions(-) diff --git a/source/row_any.cc b/source/row_any.cc index 8e3e91104..57469c8f3 100644 --- a/source/row_any.cc +++ b/source/row_any.cc @@ -13,7 +13,6 @@ #include // For memset. #include "libyuv/basic_types.h" -#include "libyuv/convert_argb.h" // For kYuvI601Constants #ifdef __cplusplus namespace libyuv { diff --git a/source/row_gcc.cc b/source/row_gcc.cc index 9a18d594e..f70541884 100644 --- a/source/row_gcc.cc +++ b/source/row_gcc.cc @@ -10,8 +10,6 @@ #include "libyuv/row.h" -#include "libyuv/convert_argb.h" // For kYuvI601Constants - #ifdef __cplusplus namespace libyuv { extern "C" { diff --git a/source/row_mmi.cc b/source/row_mmi.cc index bf7a57e94..d4afceb89 100644 --- a/source/row_mmi.cc +++ b/source/row_mmi.cc @@ -12,7 +12,6 @@ #include // For memcpy and memset. #include "libyuv/basic_types.h" -#include "libyuv/convert_argb.h" // For kYuvI601Constants #ifdef __cplusplus namespace libyuv { diff --git a/source/row_msa.cc b/source/row_msa.cc index 37ad09512..aebe4b410 100644 --- a/source/row_msa.cc +++ b/source/row_msa.cc @@ -14,7 +14,6 @@ // This module is for GCC MSA #if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) -#include "libyuv/convert_argb.h" // For kYuvI601Constants #include "libyuv/macros_msa.h" #ifdef __cplusplus diff --git a/source/row_neon.cc b/source/row_neon.cc index a9a377a12..137073386 100644 --- a/source/row_neon.cc +++ b/source/row_neon.cc @@ -12,8 +12,6 @@ #include -#include "libyuv/convert_argb.h" // For kYuvI601Constants - #ifdef __cplusplus namespace libyuv { extern "C" { diff --git a/source/row_neon64.cc b/source/row_neon64.cc index 26a903008..06e9eea99 100644 --- a/source/row_neon64.cc +++ b/source/row_neon64.cc @@ -10,8 +10,6 @@ #include "libyuv/row.h" -#include "libyuv/convert_argb.h" // For kYuvI601Constants - #ifdef __cplusplus namespace libyuv { extern "C" { diff --git a/source/row_win.cc b/source/row_win.cc index 1d2ce4002..74d87e117 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -14,8 +14,6 @@ #if !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) && \ (defined(_M_IX86) || (defined(_M_X64) && !defined(__clang__))) -#include "libyuv/convert_argb.h" // For kYuvI601Constants - #if defined(_M_X64) #include #include // For _mm_maddubs_epi16 diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc index 6bfed10b9..1d008e57b 100644 --- a/unit_test/convert_test.cc +++ b/unit_test/convert_test.cc @@ -787,18 +787,6 @@ TESTQPLANARTOB(I420Alpha, 2, 2, ABGR, 4, 4, 1) TESTBIPLANARTOBI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, FMT_C, BPP_B, \ benchmark_width_, _Opt, +, 0) -#define kYuvJPEGConstantsVU kYvuJPEGConstants -#define NV12ToABGRMatrix(a, b, c, d, e, f, g, h, i) \ - NV21ToARGBMatrix(a, b, c, d, e, f, g##VU, h, i) -#define NV21ToABGRMatrix(a, b, c, d, e, f, g, h, i) \ - NV12ToARGBMatrix(a, b, c, d, e, f, g##VU, h, i) -#define NV12ToRAWMatrix(a, b, c, d, e, f, g, h, i) \ - NV21ToRGB24Matrix(a, b, c, d, e, f, g##VU, h, i) -#define NV21ToRAWMatrix(a, b, c, d, e, f, g, h, i) \ - NV12ToRGB24Matrix(a, b, c, d, e, f, g##VU, h, i) -#define NV12ToRGB565Matrix(a, b, c, d, e, f, g, h, i) \ - NV12ToRGB565Matrix(a, b, c, d, e, f, &kYuvJPEGConstants, g, h) - #define JNV12ToARGB(a, b, c, d, e, f, g, h) \ NV12ToARGBMatrix(a, b, c, d, e, f, &kYuvJPEGConstants, g, h) #define JNV21ToARGB(a, b, c, d, e, f, g, h) \