mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2025-12-06 16:56:55 +08:00
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 <mbonadei@chromium.org> Commit-Queue: Frank Barchard <fbarchard@chromium.org>
This commit is contained in:
parent
6efd8f2cf0
commit
8869628c24
@ -13,7 +13,6 @@
|
|||||||
#include <string.h> // For memset.
|
#include <string.h> // For memset.
|
||||||
|
|
||||||
#include "libyuv/basic_types.h"
|
#include "libyuv/basic_types.h"
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|||||||
@ -10,8 +10,6 @@
|
|||||||
|
|
||||||
#include "libyuv/row.h"
|
#include "libyuv/row.h"
|
||||||
|
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|||||||
@ -12,7 +12,6 @@
|
|||||||
#include <string.h> // For memcpy and memset.
|
#include <string.h> // For memcpy and memset.
|
||||||
|
|
||||||
#include "libyuv/basic_types.h"
|
#include "libyuv/basic_types.h"
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|||||||
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
// This module is for GCC MSA
|
// This module is for GCC MSA
|
||||||
#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
|
#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
#include "libyuv/macros_msa.h"
|
#include "libyuv/macros_msa.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@ -12,8 +12,6 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|||||||
@ -10,8 +10,6 @@
|
|||||||
|
|
||||||
#include "libyuv/row.h"
|
#include "libyuv/row.h"
|
||||||
|
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|||||||
@ -14,8 +14,6 @@
|
|||||||
#if !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) && \
|
#if !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) && \
|
||||||
(defined(_M_IX86) || (defined(_M_X64) && !defined(__clang__)))
|
(defined(_M_IX86) || (defined(_M_X64) && !defined(__clang__)))
|
||||||
|
|
||||||
#include "libyuv/convert_argb.h" // For kYuvI601Constants
|
|
||||||
|
|
||||||
#if defined(_M_X64)
|
#if defined(_M_X64)
|
||||||
#include <emmintrin.h>
|
#include <emmintrin.h>
|
||||||
#include <tmmintrin.h> // For _mm_maddubs_epi16
|
#include <tmmintrin.h> // For _mm_maddubs_epi16
|
||||||
|
|||||||
@ -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, \
|
TESTBIPLANARTOBI(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, FMT_C, BPP_B, \
|
||||||
benchmark_width_, _Opt, +, 0)
|
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) \
|
#define JNV12ToARGB(a, b, c, d, e, f, g, h) \
|
||||||
NV12ToARGBMatrix(a, b, c, d, e, f, &kYuvJPEGConstants, g, h)
|
NV12ToARGBMatrix(a, b, c, d, e, f, &kYuvJPEGConstants, g, h)
|
||||||
#define JNV21ToARGB(a, b, c, d, e, f, g, h) \
|
#define JNV21ToARGB(a, b, c, d, e, f, g, h) \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user