pull/24762/head
Comma Device 3 years ago
parent b445e50033
commit ee6033f2fe
  1. 2
      selfdrive/camerad/cameras/camera_common.cc
  2. 2
      third_party/libyuv/build.txt
  3. 1
      third_party/libyuv/include/libyuv.h
  4. 102
      third_party/libyuv/include/libyuv/basic_types.h
  5. 89
      third_party/libyuv/include/libyuv/compare.h
  6. 82
      third_party/libyuv/include/libyuv/compare_row.h
  7. 914
      third_party/libyuv/include/libyuv/convert.h
  8. 2206
      third_party/libyuv/include/libyuv/convert_argb.h
  9. 306
      third_party/libyuv/include/libyuv/convert_from.h
  10. 338
      third_party/libyuv/include/libyuv/convert_from_argb.h
  11. 76
      third_party/libyuv/include/libyuv/cpu_id.h
  12. 1949
      third_party/libyuv/include/libyuv/loongson_intrinsics.h
  13. 192
      third_party/libyuv/include/libyuv/macros_msa.h
  14. 29
      third_party/libyuv/include/libyuv/mjpeg_decoder.h
  15. 1094
      third_party/libyuv/include/libyuv/planar_functions.h
  16. 211
      third_party/libyuv/include/libyuv/rotate.h
  17. 10
      third_party/libyuv/include/libyuv/rotate_argb.h
  18. 241
      third_party/libyuv/include/libyuv/rotate_row.h
  19. 6358
      third_party/libyuv/include/libyuv/row.h
  20. 287
      third_party/libyuv/include/libyuv/scale.h
  21. 56
      third_party/libyuv/include/libyuv/scale_argb.h
  22. 42
      third_party/libyuv/include/libyuv/scale_rgb.h
  23. 1880
      third_party/libyuv/include/libyuv/scale_row.h
  24. 51
      third_party/libyuv/include/libyuv/scale_uv.h
  25. 2
      third_party/libyuv/include/libyuv/version.h
  26. 86
      third_party/libyuv/include/libyuv/video_common.h
  27. BIN
      third_party/libyuv/larch64/lib/libyuv.a

@ -260,7 +260,7 @@ kj::Array<uint8_t> get_frame_image(const CameraBuf *b) {
static kj::Array<capnp::byte> yuv420_to_jpeg(const CameraBuf *b, int thumbnail_width, int thumbnail_height) { static kj::Array<capnp::byte> yuv420_to_jpeg(const CameraBuf *b, int thumbnail_width, int thumbnail_height) {
// make the buffer big enough. jpeg_write_raw_data requires 16-pixels aligned height to be used. // make the buffer big enough. jpeg_write_raw_data requires 16-pixels aligned height to be used.
std::unique_ptr<uint8[]> buf(new uint8_t[(thumbnail_width * ((thumbnail_height + 15) & ~15) * 3) / 2]); std::unique_ptr<uint8_t[]> buf(new uint8_t[(thumbnail_width * ((thumbnail_height + 15) & ~15) * 3) / 2]);
uint8_t *y_plane = buf.get(); uint8_t *y_plane = buf.get();
uint8_t *u_plane = y_plane + thumbnail_width * thumbnail_height; uint8_t *u_plane = y_plane + thumbnail_width * thumbnail_height;
uint8_t *v_plane = u_plane + (thumbnail_width * thumbnail_height) / 4; uint8_t *v_plane = u_plane + (thumbnail_width * thumbnail_height) / 4;

@ -1,4 +1,4 @@
git clone https://chromium.googlesource.com/libyuv/libyuv git clone https://chromium.googlesource.com/libyuv/libyuv
cd libyuv cd libyuv
git reset --hard 4a14cb2e81235ecd656e799aecaaf139db8ce4a2
cmake . cmake .
sudo make install

@ -26,6 +26,7 @@
#include "libyuv/scale.h" #include "libyuv/scale.h"
#include "libyuv/scale_argb.h" #include "libyuv/scale_argb.h"
#include "libyuv/scale_row.h" #include "libyuv/scale_row.h"
#include "libyuv/scale_uv.h"
#include "libyuv/version.h" #include "libyuv/version.h"
#include "libyuv/video_common.h" #include "libyuv/video_common.h"

@ -11,79 +11,36 @@
#ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_ #ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_
#define INCLUDE_LIBYUV_BASIC_TYPES_H_ #define INCLUDE_LIBYUV_BASIC_TYPES_H_
#include <stddef.h> // for NULL, size_t #include <stddef.h> // For size_t and NULL
#if !defined(INT_TYPES_DEFINED) && !defined(GG_LONGLONG)
#define INT_TYPES_DEFINED
#if defined(_MSC_VER) && (_MSC_VER < 1600) #if defined(_MSC_VER) && (_MSC_VER < 1600)
#include <sys/types.h> // for uintptr_t on x86 #include <sys/types.h> // for uintptr_t on x86
typedef unsigned __int64 uint64_t;
typedef __int64 int64_t;
typedef unsigned int uint32_t;
typedef int int32_t;
typedef unsigned short uint16_t;
typedef short int16_t;
typedef unsigned char uint8_t;
typedef signed char int8_t;
#else #else
#include <stdint.h> // for uintptr_t #include <stdint.h> // for uintptr_t and C99 types
#endif #endif // defined(_MSC_VER) && (_MSC_VER < 1600)
// Types are deprecated. Enable this macro for legacy types.
#ifndef GG_LONGLONG #ifdef LIBYUV_LEGACY_TYPES
#ifndef INT_TYPES_DEFINED typedef uint64_t uint64;
#define INT_TYPES_DEFINED typedef int64_t int64;
#ifdef COMPILER_MSVC typedef uint32_t uint32;
typedef unsigned __int64 uint64; typedef int32_t int32;
typedef __int64 int64; typedef uint16_t uint16;
#ifndef INT64_C typedef int16_t int16;
#define INT64_C(x) x ## I64 typedef uint8_t uint8;
#endif typedef int8_t int8;
#ifndef UINT64_C #endif // LIBYUV_LEGACY_TYPES
#define UINT64_C(x) x ## UI64
#endif
#define INT64_F "I64"
#else // COMPILER_MSVC
#if defined(__LP64__) && !defined(__OpenBSD__) && !defined(__APPLE__)
typedef unsigned long uint64; // NOLINT
typedef long int64; // NOLINT
#ifndef INT64_C
#define INT64_C(x) x ## L
#endif
#ifndef UINT64_C
#define UINT64_C(x) x ## UL
#endif
#define INT64_F "l"
#else // defined(__LP64__) && !defined(__OpenBSD__) && !defined(__APPLE__)
typedef unsigned long long uint64; // NOLINT
typedef long long int64; // NOLINT
#ifndef INT64_C
#define INT64_C(x) x ## LL
#endif
#ifndef UINT64_C
#define UINT64_C(x) x ## ULL
#endif
#define INT64_F "ll"
#endif // __LP64__
#endif // COMPILER_MSVC
typedef unsigned int uint32;
typedef int int32;
typedef unsigned short uint16; // NOLINT
typedef short int16; // NOLINT
typedef unsigned char uint8;
typedef signed char int8;
#endif // INT_TYPES_DEFINED #endif // INT_TYPES_DEFINED
#endif // GG_LONGLONG
// Detect compiler is for x86 or x64.
#if defined(__x86_64__) || defined(_M_X64) || \
defined(__i386__) || defined(_M_IX86)
#define CPU_X86 1
#endif
// Detect compiler is for ARM.
#if defined(__arm__) || defined(_M_ARM)
#define CPU_ARM 1
#endif
#ifndef ALIGNP
#ifdef __cplusplus
#define ALIGNP(p, t) \
(reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \
((t) - 1)) & ~((t) - 1))))
#else
#define ALIGNP(p, t) \
((uint8*)((((uintptr_t)(p) + ((t) - 1)) & ~((t) - 1)))) /* NOLINT */
#endif
#endif
#if !defined(LIBYUV_API) #if !defined(LIBYUV_API)
#if defined(_WIN32) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
@ -103,16 +60,9 @@ typedef signed char int8;
#endif // __GNUC__ #endif // __GNUC__
#endif // LIBYUV_API #endif // LIBYUV_API
// TODO(fbarchard): Remove bool macros.
#define LIBYUV_BOOL int #define LIBYUV_BOOL int
#define LIBYUV_FALSE 0 #define LIBYUV_FALSE 0
#define LIBYUV_TRUE 1 #define LIBYUV_TRUE 1
// Visual C x86 or GCC little endian.
#if defined(__x86_64__) || defined(_M_X64) || \
defined(__i386__) || defined(_M_IX86) || \
defined(__arm__) || defined(_M_ARM) || \
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
#define LIBYUV_LITTLE_ENDIAN
#endif
#endif // INCLUDE_LIBYUV_BASIC_TYPES_H_ #endif // INCLUDE_LIBYUV_BASIC_TYPES_H_

@ -20,55 +20,88 @@ extern "C" {
// Compute a hash for specified memory. Seed of 5381 recommended. // Compute a hash for specified memory. Seed of 5381 recommended.
LIBYUV_API LIBYUV_API
uint32 HashDjb2(const uint8* src, uint64 count, uint32 seed); uint32_t HashDjb2(const uint8_t* src, uint64_t count, uint32_t seed);
// Hamming Distance
LIBYUV_API
uint64_t ComputeHammingDistance(const uint8_t* src_a,
const uint8_t* src_b,
int count);
// Scan an opaque argb image and return fourcc based on alpha offset. // Scan an opaque argb image and return fourcc based on alpha offset.
// Returns FOURCC_ARGB, FOURCC_BGRA, or 0 if unknown. // Returns FOURCC_ARGB, FOURCC_BGRA, or 0 if unknown.
LIBYUV_API LIBYUV_API
uint32 ARGBDetect(const uint8* argb, int stride_argb, int width, int height); uint32_t ARGBDetect(const uint8_t* argb,
int stride_argb,
int width,
int height);
// Sum Square Error - used to compute Mean Square Error or PSNR. // Sum Square Error - used to compute Mean Square Error or PSNR.
LIBYUV_API LIBYUV_API
uint64 ComputeSumSquareError(const uint8* src_a, uint64_t ComputeSumSquareError(const uint8_t* src_a,
const uint8* src_b, int count); const uint8_t* src_b,
int count);
LIBYUV_API LIBYUV_API
uint64 ComputeSumSquareErrorPlane(const uint8* src_a, int stride_a, uint64_t ComputeSumSquareErrorPlane(const uint8_t* src_a,
const uint8* src_b, int stride_b, int stride_a,
int width, int height); const uint8_t* src_b,
int stride_b,
int width,
int height);
static const int kMaxPsnr = 128; static const int kMaxPsnr = 128;
LIBYUV_API LIBYUV_API
double SumSquareErrorToPsnr(uint64 sse, uint64 count); double SumSquareErrorToPsnr(uint64_t sse, uint64_t count);
LIBYUV_API LIBYUV_API
double CalcFramePsnr(const uint8* src_a, int stride_a, double CalcFramePsnr(const uint8_t* src_a,
const uint8* src_b, int stride_b, int stride_a,
int width, int height); const uint8_t* src_b,
int stride_b,
int width,
int height);
LIBYUV_API LIBYUV_API
double I420Psnr(const uint8* src_y_a, int stride_y_a, double I420Psnr(const uint8_t* src_y_a,
const uint8* src_u_a, int stride_u_a, int stride_y_a,
const uint8* src_v_a, int stride_v_a, const uint8_t* src_u_a,
const uint8* src_y_b, int stride_y_b, int stride_u_a,
const uint8* src_u_b, int stride_u_b, const uint8_t* src_v_a,
const uint8* src_v_b, int stride_v_b, int stride_v_a,
int width, int height); const uint8_t* src_y_b,
int stride_y_b,
const uint8_t* src_u_b,
int stride_u_b,
const uint8_t* src_v_b,
int stride_v_b,
int width,
int height);
LIBYUV_API LIBYUV_API
double CalcFrameSsim(const uint8* src_a, int stride_a, double CalcFrameSsim(const uint8_t* src_a,
const uint8* src_b, int stride_b, int stride_a,
int width, int height); const uint8_t* src_b,
int stride_b,
int width,
int height);
LIBYUV_API LIBYUV_API
double I420Ssim(const uint8* src_y_a, int stride_y_a, double I420Ssim(const uint8_t* src_y_a,
const uint8* src_u_a, int stride_u_a, int stride_y_a,
const uint8* src_v_a, int stride_v_a, const uint8_t* src_u_a,
const uint8* src_y_b, int stride_y_b, int stride_u_a,
const uint8* src_u_b, int stride_u_b, const uint8_t* src_v_a,
const uint8* src_v_b, int stride_v_b, int stride_v_a,
int width, int height); const uint8_t* src_y_b,
int stride_y_b,
const uint8_t* src_u_b,
int stride_u_b,
const uint8_t* src_v_b,
int stride_v_b,
int width,
int height);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -19,19 +19,22 @@ extern "C" {
#endif #endif
#if defined(__pnacl__) || defined(__CLR_VER) || \ #if defined(__pnacl__) || defined(__CLR_VER) || \
(defined(__i386__) && !defined(__SSE2__)) (defined(__native_client__) && defined(__x86_64__)) || \
(defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
#define LIBYUV_DISABLE_X86 #define LIBYUV_DISABLE_X86
#endif #endif
#if defined(__native_client__)
#define LIBYUV_DISABLE_NEON
#endif
// MemorySanitizer does not support assembly code yet. http://crbug.com/344505 // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
#if defined(__has_feature) #if defined(__has_feature)
#if __has_feature(memory_sanitizer) #if __has_feature(memory_sanitizer)
#define LIBYUV_DISABLE_X86 #define LIBYUV_DISABLE_X86
#endif #endif
#endif #endif
// Visual C 2012 required for AVX2. // Visual C 2012 required for AVX2.
#if defined(_M_IX86) && !defined(__clang__) && \ #if defined(_M_IX86) && !defined(__clang__) && defined(_MSC_VER) && \
defined(_MSC_VER) && _MSC_VER >= 1700 _MSC_VER >= 1700
#define VISUALC_HAS_AVX2 1 #define VISUALC_HAS_AVX2 1
#endif // VisualStudio >= 2012 #endif // VisualStudio >= 2012
@ -42,39 +45,82 @@ extern "C" {
#endif // clang >= 3.4 #endif // clang >= 3.4
#endif // __clang__ #endif // __clang__
#if !defined(LIBYUV_DISABLE_X86) && \
defined(_M_IX86) && (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2))
#define HAS_HASHDJB2_AVX2
#endif
// The following are available for Visual C and GCC: // The following are available for Visual C and GCC:
#if !defined(LIBYUV_DISABLE_X86) && \ #if !defined(LIBYUV_DISABLE_X86) && \
(defined(__x86_64__) || (defined(__i386__) || defined(_M_IX86))) (defined(__x86_64__) || defined(__i386__) || defined(_M_IX86))
#define HAS_HASHDJB2_SSE41 #define HAS_HASHDJB2_SSE41
#define HAS_SUMSQUAREERROR_SSE2 #define HAS_SUMSQUAREERROR_SSE2
#define HAS_HAMMINGDISTANCE_SSE42
#endif #endif
// The following are available for Visual C and clangcl 32 bit: // The following are available for Visual C and clangcl 32 bit:
#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \ #if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) && \
!defined(__clang__) && \
(defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2))
#define HAS_HASHDJB2_AVX2 #define HAS_HASHDJB2_AVX2
#define HAS_SUMSQUAREERROR_AVX2 #define HAS_SUMSQUAREERROR_AVX2
#endif #endif
// The following are available for GCC and clangcl:
#if !defined(LIBYUV_DISABLE_X86) && (defined(__x86_64__) || defined(__i386__))
#define HAS_HAMMINGDISTANCE_SSSE3
#endif
// The following are available for GCC and clangcl:
#if !defined(LIBYUV_DISABLE_X86) && defined(CLANG_HAS_AVX2) && \
(defined(__x86_64__) || defined(__i386__))
#define HAS_HAMMINGDISTANCE_AVX2
#endif
// The following are available for Neon: // The following are available for Neon:
#if !defined(LIBYUV_DISABLE_NEON) && \ #if !defined(LIBYUV_DISABLE_NEON) && \
(defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__)) (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__))
#define HAS_SUMSQUAREERROR_NEON #define HAS_SUMSQUAREERROR_NEON
#define HAS_HAMMINGDISTANCE_NEON
#endif
#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
#define HAS_HAMMINGDISTANCE_MSA
#define HAS_SUMSQUAREERROR_MSA
#endif #endif
uint32 SumSquareError_C(const uint8* src_a, const uint8* src_b, int count); uint32_t HammingDistance_C(const uint8_t* src_a,
uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count); const uint8_t* src_b,
uint32 SumSquareError_AVX2(const uint8* src_a, const uint8* src_b, int count); int count);
uint32 SumSquareError_NEON(const uint8* src_a, const uint8* src_b, int count); uint32_t HammingDistance_SSE42(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t HammingDistance_SSSE3(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t HammingDistance_AVX2(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t HammingDistance_NEON(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t HammingDistance_MSA(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t SumSquareError_C(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t SumSquareError_SSE2(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t SumSquareError_AVX2(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t SumSquareError_NEON(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32_t SumSquareError_MSA(const uint8_t* src_a,
const uint8_t* src_b,
int count);
uint32 HashDjb2_C(const uint8* src, int count, uint32 seed); uint32_t HashDjb2_C(const uint8_t* src, int count, uint32_t seed);
uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed); uint32_t HashDjb2_SSE41(const uint8_t* src, int count, uint32_t seed);
uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed); uint32_t HashDjb2_AVX2(const uint8_t* src, int count, uint32_t seed);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -27,196 +27,835 @@ extern "C" {
// Convert I444 to I420. // Convert I444 to I420.
LIBYUV_API LIBYUV_API
int I444ToI420(const uint8* src_y, int src_stride_y, int I444ToI420(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I444 to NV12.
LIBYUV_API
int I444ToNV12(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_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I444 to NV21.
LIBYUV_API
int I444ToNV21(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_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
// Convert I422 to I420. // Convert I422 to I420.
LIBYUV_API LIBYUV_API
int I422ToI420(const uint8* src_y, int src_stride_y, int I422ToI420(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I422 to I444.
LIBYUV_API
int I422ToI444(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I422 to I210.
LIBYUV_API
int I422ToI210(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,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert MM21 to NV12.
LIBYUV_API
int MM21ToNV12(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_uv,
int src_stride_uv,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I411 to I420. // Convert MM21 to I420.
LIBYUV_API LIBYUV_API
int I411ToI420(const uint8* src_y, int src_stride_y, int MM21ToI420(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_uv,
uint8* dst_y, int dst_stride_y, int src_stride_uv,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I422 to NV21.
LIBYUV_API
int I422ToNV21(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_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
// Copy I420 to I420. // Copy I420 to I420.
#define I420ToI420 I420Copy #define I420ToI420 I420Copy
LIBYUV_API LIBYUV_API
int I420Copy(const uint8* src_y, int src_stride_y, int I420Copy(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I420 to I444.
LIBYUV_API
int I420ToI444(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Copy I010 to I010
#define I010ToI010 I010Copy
#define H010ToH010 I010Copy
LIBYUV_API
int I010Copy(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert 10 bit YUV to 8 bit
#define H010ToH420 I010ToI420
LIBYUV_API
int I010ToI420(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define H210ToH422 I210ToI422
LIBYUV_API
int I210ToI422(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define H410ToH444 I410ToI444
LIBYUV_API
int I410ToI444(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define H012ToH420 I012ToI420
LIBYUV_API
int I012ToI420(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define H212ToH422 I212ToI422
LIBYUV_API
int I212ToI422(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define H412ToH444 I412ToI444
LIBYUV_API
int I412ToI444(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
#define I412ToI012 I410ToI010
#define H410ToH010 I410ToI010
#define H412ToH012 I410ToI010
LIBYUV_API
int I410ToI010(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
#define I212ToI012 I210ToI010
#define H210ToH010 I210ToI010
#define H212ToH012 I210ToI010
LIBYUV_API
int I210ToI010(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I010 to I410
LIBYUV_API
int I010ToI410(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I012 to I412
#define I012ToI412 I010ToI410
// Convert I210 to I410
LIBYUV_API
int I210ToI410(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I212 to I412
#define I212ToI412 I210ToI410
// Convert I010 to P010
LIBYUV_API
int I010ToP010(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I210 to P210
LIBYUV_API
int I210ToP210(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I012 to P012
LIBYUV_API
int I012ToP012(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I212 to P212
LIBYUV_API
int I212ToP212(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert I400 (grey) to I420. // Convert I400 (grey) to I420.
LIBYUV_API LIBYUV_API
int I400ToI420(const uint8* src_y, int src_stride_y, int I400ToI420(const uint8_t* src_y,
uint8* dst_y, int dst_stride_y, int src_stride_y,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert I400 (grey) to NV21.
LIBYUV_API
int I400ToNV21(const uint8_t* src_y,
int src_stride_y,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
#define J400ToJ420 I400ToI420 #define J400ToJ420 I400ToI420
// Convert NV12 to I420. // Convert NV12 to I420.
LIBYUV_API LIBYUV_API
int NV12ToI420(const uint8* src_y, int src_stride_y, int NV12ToI420(const uint8_t* src_y,
const uint8* src_uv, int src_stride_uv, int src_stride_y,
uint8* dst_y, int dst_stride_y, const uint8_t* src_uv,
uint8* dst_u, int dst_stride_u, int src_stride_uv,
uint8* dst_v, int dst_stride_v, uint8_t* dst_y,
int width, int height); int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert NV21 to I420. // Convert NV21 to I420.
LIBYUV_API LIBYUV_API
int NV21ToI420(const uint8* src_y, int src_stride_y, int NV21ToI420(const uint8_t* src_y,
const uint8* src_vu, int src_stride_vu, int src_stride_y,
uint8* dst_y, int dst_stride_y, const uint8_t* src_vu,
uint8* dst_u, int dst_stride_u, int src_stride_vu,
uint8* dst_v, int dst_stride_v, uint8_t* dst_y,
int width, int height); int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert NV12 to NV24.
LIBYUV_API
int NV12ToNV24(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_uv,
int src_stride_uv,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert NV16 to NV24.
LIBYUV_API
int NV16ToNV24(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_uv,
int src_stride_uv,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert P010 to P410.
LIBYUV_API
int P010ToP410(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_uv,
int src_stride_uv,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert P012 to P412.
#define P012ToP412 P010ToP410
// Convert P016 to P416.
#define P016ToP416 P010ToP410
// Convert P210 to P410.
LIBYUV_API
int P210ToP410(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_uv,
int src_stride_uv,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert P212 to P412.
#define P212ToP412 P210ToP410
// Convert P216 to P416.
#define P216ToP416 P210ToP410
// Convert YUY2 to I420. // Convert YUY2 to I420.
LIBYUV_API LIBYUV_API
int YUY2ToI420(const uint8* src_yuy2, int src_stride_yuy2, int YUY2ToI420(const uint8_t* src_yuy2,
uint8* dst_y, int dst_stride_y, int src_stride_yuy2,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert UYVY to I420. // Convert UYVY to I420.
LIBYUV_API LIBYUV_API
int UYVYToI420(const uint8* src_uyvy, int src_stride_uyvy, int UYVYToI420(const uint8_t* src_uyvy,
uint8* dst_y, int dst_stride_y, int src_stride_uyvy,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert AYUV to NV12.
LIBYUV_API
int AYUVToNV12(const uint8_t* src_ayuv,
int src_stride_ayuv,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert M420 to I420. // Convert AYUV to NV21.
LIBYUV_API LIBYUV_API
int M420ToI420(const uint8* src_m420, int src_stride_m420, int AYUVToNV21(const uint8_t* src_ayuv,
uint8* dst_y, int dst_stride_y, int src_stride_ayuv,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
// Convert Android420 to I420. // Convert Android420 to I420.
LIBYUV_API LIBYUV_API
int Android420ToI420(const uint8* src_y, int src_stride_y, int Android420ToI420(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
int pixel_stride_uv, int src_stride_u,
uint8* dst_y, int dst_stride_y, const uint8_t* src_v,
uint8* dst_u, int dst_stride_u, int src_stride_v,
uint8* dst_v, int dst_stride_v, int src_pixel_stride_uv,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// ARGB little endian (bgra in memory) to I420. // ARGB little endian (bgra in memory) to I420.
LIBYUV_API LIBYUV_API
int ARGBToI420(const uint8* src_frame, int src_stride_frame, int ARGBToI420(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// BGRA little endian (argb in memory) to I420. // BGRA little endian (argb in memory) to I420.
LIBYUV_API LIBYUV_API
int BGRAToI420(const uint8* src_frame, int src_stride_frame, int BGRAToI420(const uint8_t* src_bgra,
uint8* dst_y, int dst_stride_y, int src_stride_bgra,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// ABGR little endian (rgba in memory) to I420. // ABGR little endian (rgba in memory) to I420.
LIBYUV_API LIBYUV_API
int ABGRToI420(const uint8* src_frame, int src_stride_frame, int ABGRToI420(const uint8_t* src_abgr,
uint8* dst_y, int dst_stride_y, int src_stride_abgr,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGBA little endian (abgr in memory) to I420. // RGBA little endian (abgr in memory) to I420.
LIBYUV_API LIBYUV_API
int RGBAToI420(const uint8* src_frame, int src_stride_frame, int RGBAToI420(const uint8_t* src_rgba,
uint8* dst_y, int dst_stride_y, int src_stride_rgba,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB little endian (bgr in memory) to I420. // RGB little endian (bgr in memory) to I420.
LIBYUV_API LIBYUV_API
int RGB24ToI420(const uint8* src_frame, int src_stride_frame, int RGB24ToI420(const uint8_t* src_rgb24,
uint8* dst_y, int dst_stride_y, int src_stride_rgb24,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB little endian (bgr in memory) to J420.
LIBYUV_API
int RGB24ToJ420(const uint8_t* src_rgb24,
int src_stride_rgb24,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB big endian (rgb in memory) to I420. // RGB big endian (rgb in memory) to I420.
LIBYUV_API LIBYUV_API
int RAWToI420(const uint8* src_frame, int src_stride_frame, int RAWToI420(const uint8_t* src_raw,
uint8* dst_y, int dst_stride_y, int src_stride_raw,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB big endian (rgb in memory) to J420.
LIBYUV_API
int RAWToJ420(const uint8_t* src_raw,
int src_stride_raw,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB16 (RGBP fourcc) little endian to I420. // RGB16 (RGBP fourcc) little endian to I420.
LIBYUV_API LIBYUV_API
int RGB565ToI420(const uint8* src_frame, int src_stride_frame, int RGB565ToI420(const uint8_t* src_rgb565,
uint8* dst_y, int dst_stride_y, int src_stride_rgb565,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB15 (RGBO fourcc) little endian to I420. // RGB15 (RGBO fourcc) little endian to I420.
LIBYUV_API LIBYUV_API
int ARGB1555ToI420(const uint8* src_frame, int src_stride_frame, int ARGB1555ToI420(const uint8_t* src_argb1555,
uint8* dst_y, int dst_stride_y, int src_stride_argb1555,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB12 (R444 fourcc) little endian to I420. // RGB12 (R444 fourcc) little endian to I420.
LIBYUV_API LIBYUV_API
int ARGB4444ToI420(const uint8* src_frame, int src_stride_frame, int ARGB4444ToI420(const uint8_t* src_argb4444,
uint8* dst_y, int dst_stride_y, int src_stride_argb4444,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// RGB little endian (bgr in memory) to J400.
LIBYUV_API
int RGB24ToJ400(const uint8_t* src_rgb24,
int src_stride_rgb24,
uint8_t* dst_yj,
int dst_stride_yj,
int width,
int height);
// RGB big endian (rgb in memory) to J400.
LIBYUV_API
int RAWToJ400(const uint8_t* src_raw,
int src_stride_raw,
uint8_t* dst_yj,
int dst_stride_yj,
int width,
int height);
#ifdef HAVE_JPEG
// src_width/height provided by capture. // src_width/height provided by capture.
// dst_width/height for clipping determine final size. // dst_width/height for clipping determine final size.
LIBYUV_API LIBYUV_API
int MJPGToI420(const uint8* sample, size_t sample_size, int MJPGToI420(const uint8_t* sample,
uint8* dst_y, int dst_stride_y, size_t sample_size,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int src_width, int src_height, uint8_t* dst_u,
int dst_width, int dst_height); int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int src_width,
int src_height,
int dst_width,
int dst_height);
// JPEG to NV21
LIBYUV_API
int MJPGToNV21(const uint8_t* sample,
size_t sample_size,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int src_width,
int src_height,
int dst_width,
int dst_height);
// JPEG to NV12
LIBYUV_API
int MJPGToNV12(const uint8_t* sample,
size_t sample_size,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int src_width,
int src_height,
int dst_width,
int dst_height);
// Query size of MJPG in pixels. // Query size of MJPG in pixels.
LIBYUV_API LIBYUV_API
int MJPGSize(const uint8* sample, size_t sample_size, int MJPGSize(const uint8_t* sample,
int* width, int* height); size_t sample_size,
#endif int* width,
int* height);
// Convert camera sample to I420 with cropping, rotation and vertical flip. // Convert camera sample to I420 with cropping, rotation and vertical flip.
// "src_size" is needed to parse MJPG. // "src_size" is needed to parse MJPG.
@ -238,18 +877,25 @@ int MJPGSize(const uint8* sample, size_t sample_size,
// Must be less than or equal to src_width/src_height // Must be less than or equal to src_width/src_height
// Cropping parameters are pre-rotation. // Cropping parameters are pre-rotation.
// "rotation" can be 0, 90, 180 or 270. // "rotation" can be 0, 90, 180 or 270.
// "format" is a fourcc. ie 'I420', 'YUY2' // "fourcc" is a fourcc. ie 'I420', 'YUY2'
// Returns 0 for successful; -1 for invalid parameter. Non-zero for failure. // Returns 0 for successful; -1 for invalid parameter. Non-zero for failure.
LIBYUV_API LIBYUV_API
int ConvertToI420(const uint8* src_frame, size_t src_size, int ConvertToI420(const uint8_t* sample,
uint8* dst_y, int dst_stride_y, size_t sample_size,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int crop_x, int crop_y, uint8_t* dst_u,
int src_width, int src_height, int dst_stride_u,
int crop_width, int crop_height, uint8_t* dst_v,
int dst_stride_v,
int crop_x,
int crop_y,
int src_width,
int src_height,
int crop_width,
int crop_height,
enum RotationMode rotation, enum RotationMode rotation,
uint32 format); uint32_t fourcc);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

File diff suppressed because it is too large Load Diff

@ -21,155 +21,179 @@ extern "C" {
// See Also convert.h for conversions from formats to I420. // See Also convert.h for conversions from formats to I420.
// I420Copy in convert to I420ToI420. // Convert 8 bit YUV to 10 bit.
#define H420ToH010 I420ToI010
LIBYUV_API LIBYUV_API
int I420ToI422(const uint8* src_y, int src_stride_y, int I420ToI010(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int width, int height); uint16_t* dst_y,
int dst_stride_y,
LIBYUV_API uint16_t* dst_u,
int I420ToI444(const uint8* src_y, int src_stride_y, int dst_stride_u,
const uint8* src_u, int src_stride_u, uint16_t* dst_v,
const uint8* src_v, int src_stride_v, int dst_stride_v,
uint8* dst_y, int dst_stride_y, int width,
uint8* dst_u, int dst_stride_u, int height);
uint8* dst_v, int dst_stride_v,
int width, int height); // Convert 8 bit YUV to 12 bit.
#define H420ToH012 I420ToI012
LIBYUV_API LIBYUV_API
int I420ToI411(const uint8* src_y, int src_stride_y, int I420ToI012(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int width, int height); uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int width,
int height);
LIBYUV_API
int I420ToI422(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
LIBYUV_API
int I420ToI444(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Copy to I400. Source can be I420, I422, I444, I400, NV12 or NV21. // Copy to I400. Source can be I420, I422, I444, I400, NV12 or NV21.
LIBYUV_API LIBYUV_API
int I400Copy(const uint8* src_y, int src_stride_y, int I400Copy(const uint8_t* src_y,
uint8* dst_y, int dst_stride_y, int src_stride_y,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
LIBYUV_API int width,
int I420ToNV12(const uint8* src_y, int src_stride_y, int height);
const uint8* src_u, int src_stride_u,
const uint8* src_v, int src_stride_v, LIBYUV_API
uint8* dst_y, int dst_stride_y, int I420ToNV12(const uint8_t* src_y,
uint8* dst_uv, int dst_stride_uv, int src_stride_y,
int width, int height); const uint8_t* src_u,
int src_stride_u,
LIBYUV_API const uint8_t* src_v,
int I420ToNV21(const uint8* src_y, int src_stride_y, int src_stride_v,
const uint8* src_u, int src_stride_u, uint8_t* dst_y,
const uint8* src_v, int src_stride_v, int dst_stride_y,
uint8* dst_y, int dst_stride_y, uint8_t* dst_uv,
uint8* dst_vu, int dst_stride_vu, int dst_stride_uv,
int width, int height); int width,
int height);
LIBYUV_API
int I420ToYUY2(const uint8* src_y, int src_stride_y, LIBYUV_API
const uint8* src_u, int src_stride_u, int I420ToNV21(const uint8_t* src_y,
const uint8* src_v, int src_stride_v, int src_stride_y,
uint8* dst_frame, int dst_stride_frame, const uint8_t* src_u,
int width, int height); int src_stride_u,
const uint8_t* src_v,
LIBYUV_API int src_stride_v,
int I420ToUYVY(const uint8* src_y, int src_stride_y, uint8_t* dst_y,
const uint8* src_u, int src_stride_u, int dst_stride_y,
const uint8* src_v, int src_stride_v, uint8_t* dst_vu,
uint8* dst_frame, int dst_stride_frame, int dst_stride_vu,
int width, int height); int width,
int height);
LIBYUV_API
int I420ToARGB(const uint8* src_y, int src_stride_y, LIBYUV_API
const uint8* src_u, int src_stride_u, int I420ToYUY2(const uint8_t* src_y,
const uint8* src_v, int src_stride_v, int src_stride_y,
uint8* dst_argb, int dst_stride_argb, const uint8_t* src_u,
int width, int height); int src_stride_u,
const uint8_t* src_v,
LIBYUV_API int src_stride_v,
int I420ToBGRA(const uint8* src_y, int src_stride_y, uint8_t* dst_yuy2,
const uint8* src_u, int src_stride_u, int dst_stride_yuy2,
const uint8* src_v, int src_stride_v, int width,
uint8* dst_argb, int dst_stride_argb, int height);
int width, int height);
LIBYUV_API
LIBYUV_API int I420ToUYVY(const uint8_t* src_y,
int I420ToABGR(const uint8* src_y, int src_stride_y, int src_stride_y,
const uint8* src_u, int src_stride_u, const uint8_t* src_u,
const uint8* src_v, int src_stride_v, int src_stride_u,
uint8* dst_argb, int dst_stride_argb, const uint8_t* src_v,
int width, int height); int src_stride_v,
uint8_t* dst_uyvy,
LIBYUV_API int dst_stride_uyvy,
int I420ToRGBA(const uint8* src_y, int src_stride_y, int width,
const uint8* src_u, int src_stride_u, int height);
const uint8* src_v, int src_stride_v,
uint8* dst_rgba, int dst_stride_rgba, // The following are from convert_argb.h
int width, int height); // DEPRECATED: The prototypes will be removed in future. Use convert_argb.h
LIBYUV_API // Convert I420 to ARGB.
int I420ToRGB24(const uint8* src_y, int src_stride_y, LIBYUV_API
const uint8* src_u, int src_stride_u, int I420ToARGB(const uint8_t* src_y,
const uint8* src_v, int src_stride_v, int src_stride_y,
uint8* dst_frame, int dst_stride_frame, const uint8_t* src_u,
int width, int height); int src_stride_u,
const uint8_t* src_v,
LIBYUV_API int src_stride_v,
int I420ToRAW(const uint8* src_y, int src_stride_y, uint8_t* dst_argb,
const uint8* src_u, int src_stride_u, int dst_stride_argb,
const uint8* src_v, int src_stride_v, int width,
uint8* dst_frame, int dst_stride_frame, int height);
int width, int height);
// Convert I420 to ABGR.
LIBYUV_API LIBYUV_API
int I420ToRGB565(const uint8* src_y, int src_stride_y, int I420ToABGR(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_frame, int dst_stride_frame, int src_stride_u,
int width, int height); const uint8_t* src_v,
int src_stride_v,
// Convert I420 To RGB565 with 4x4 dither matrix (16 bytes). uint8_t* dst_abgr,
// Values in dither matrix from 0 to 7 recommended. int dst_stride_abgr,
// The order of the dither matrix is first byte is upper left. int width,
int height);
LIBYUV_API
int I420ToRGB565Dither(const uint8* src_y, int src_stride_y,
const uint8* src_u, int src_stride_u,
const uint8* src_v, int src_stride_v,
uint8* dst_frame, int dst_stride_frame,
const uint8* dither4x4, int width, int height);
LIBYUV_API
int I420ToARGB1555(const uint8* src_y, int src_stride_y,
const uint8* src_u, int src_stride_u,
const uint8* src_v, int src_stride_v,
uint8* dst_frame, int dst_stride_frame,
int width, int height);
LIBYUV_API
int I420ToARGB4444(const uint8* src_y, int src_stride_y,
const uint8* src_u, int src_stride_u,
const uint8* src_v, int src_stride_v,
uint8* dst_frame, int dst_stride_frame,
int width, int height);
// Convert I420 to specified format. // Convert I420 to specified format.
// "dst_sample_stride" is bytes in a row for the destination. Pass 0 if the // "dst_sample_stride" is bytes in a row for the destination. Pass 0 if the
// buffer has contiguous rows. Can be negative. A multiple of 16 is optimal. // buffer has contiguous rows. Can be negative. A multiple of 16 is optimal.
LIBYUV_API LIBYUV_API
int ConvertFromI420(const uint8* y, int y_stride, int ConvertFromI420(const uint8_t* y,
const uint8* u, int u_stride, int y_stride,
const uint8* v, int v_stride, const uint8_t* u,
uint8* dst_sample, int dst_sample_stride, int u_stride,
int width, int height, const uint8_t* v,
uint32 format); int v_stride,
uint8_t* dst_sample,
int dst_sample_stride,
int width,
int height,
uint32_t fourcc);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -21,166 +21,322 @@ extern "C" {
// Copy ARGB to ARGB. // Copy ARGB to ARGB.
#define ARGBToARGB ARGBCopy #define ARGBToARGB ARGBCopy
LIBYUV_API LIBYUV_API
int ARGBCopy(const uint8* src_argb, int src_stride_argb, int ARGBCopy(const uint8_t* src_argb,
uint8* dst_argb, int dst_stride_argb, int src_stride_argb,
int width, int height); uint8_t* dst_argb,
int dst_stride_argb,
int width,
int height);
// Convert ARGB To BGRA. // Convert ARGB To BGRA.
LIBYUV_API LIBYUV_API
int ARGBToBGRA(const uint8* src_argb, int src_stride_argb, int ARGBToBGRA(const uint8_t* src_argb,
uint8* dst_bgra, int dst_stride_bgra, int src_stride_argb,
int width, int height); uint8_t* dst_bgra,
int dst_stride_bgra,
int width,
int height);
// Convert ARGB To ABGR. // Convert ARGB To ABGR.
LIBYUV_API LIBYUV_API
int ARGBToABGR(const uint8* src_argb, int src_stride_argb, int ARGBToABGR(const uint8_t* src_argb,
uint8* dst_abgr, int dst_stride_abgr, int src_stride_argb,
int width, int height); uint8_t* dst_abgr,
int dst_stride_abgr,
int width,
int height);
// Convert ARGB To RGBA. // Convert ARGB To RGBA.
LIBYUV_API LIBYUV_API
int ARGBToRGBA(const uint8* src_argb, int src_stride_argb, int ARGBToRGBA(const uint8_t* src_argb,
uint8* dst_rgba, int dst_stride_rgba, int src_stride_argb,
int width, int height); uint8_t* dst_rgba,
int dst_stride_rgba,
int width,
int height);
// Aliases
#define ARGBToAB30 ABGRToAR30
#define ABGRToAB30 ARGBToAR30
// Convert ABGR To AR30.
LIBYUV_API
int ABGRToAR30(const uint8_t* src_abgr,
int src_stride_abgr,
uint8_t* dst_ar30,
int dst_stride_ar30,
int width,
int height);
// Convert ARGB To AR30.
LIBYUV_API
int ARGBToAR30(const uint8_t* src_argb,
int src_stride_argb,
uint8_t* dst_ar30,
int dst_stride_ar30,
int width,
int height);
// Aliases
#define ABGRToRGB24 ARGBToRAW
#define ABGRToRAW ARGBToRGB24
// Convert ARGB To RGB24. // Convert ARGB To RGB24.
LIBYUV_API LIBYUV_API
int ARGBToRGB24(const uint8* src_argb, int src_stride_argb, int ARGBToRGB24(const uint8_t* src_argb,
uint8* dst_rgb24, int dst_stride_rgb24, int src_stride_argb,
int width, int height); uint8_t* dst_rgb24,
int dst_stride_rgb24,
int width,
int height);
// Convert ARGB To RAW. // Convert ARGB To RAW.
LIBYUV_API LIBYUV_API
int ARGBToRAW(const uint8* src_argb, int src_stride_argb, int ARGBToRAW(const uint8_t* src_argb,
uint8* dst_rgb, int dst_stride_rgb, int src_stride_argb,
int width, int height); uint8_t* dst_raw,
int dst_stride_raw,
int width,
int height);
// Convert ARGB To RGB565. // Convert ARGB To RGB565.
LIBYUV_API LIBYUV_API
int ARGBToRGB565(const uint8* src_argb, int src_stride_argb, int ARGBToRGB565(const uint8_t* src_argb,
uint8* dst_rgb565, int dst_stride_rgb565, int src_stride_argb,
int width, int height); uint8_t* dst_rgb565,
int dst_stride_rgb565,
int width,
int height);
// Convert ARGB To RGB565 with 4x4 dither matrix (16 bytes). // Convert ARGB To RGB565 with 4x4 dither matrix (16 bytes).
// Values in dither matrix from 0 to 7 recommended. // Values in dither matrix from 0 to 7 recommended.
// The order of the dither matrix is first byte is upper left. // The order of the dither matrix is first byte is upper left.
// TODO(fbarchard): Consider pointer to 2d array for dither4x4. // TODO(fbarchard): Consider pointer to 2d array for dither4x4.
// const uint8(*dither)[4][4]; // const uint8_t(*dither)[4][4];
LIBYUV_API LIBYUV_API
int ARGBToRGB565Dither(const uint8* src_argb, int src_stride_argb, int ARGBToRGB565Dither(const uint8_t* src_argb,
uint8* dst_rgb565, int dst_stride_rgb565, int src_stride_argb,
const uint8* dither4x4, int width, int height); uint8_t* dst_rgb565,
int dst_stride_rgb565,
const uint8_t* dither4x4,
int width,
int height);
// Convert ARGB To ARGB1555. // Convert ARGB To ARGB1555.
LIBYUV_API LIBYUV_API
int ARGBToARGB1555(const uint8* src_argb, int src_stride_argb, int ARGBToARGB1555(const uint8_t* src_argb,
uint8* dst_argb1555, int dst_stride_argb1555, int src_stride_argb,
int width, int height); uint8_t* dst_argb1555,
int dst_stride_argb1555,
int width,
int height);
// Convert ARGB To ARGB4444. // Convert ARGB To ARGB4444.
LIBYUV_API LIBYUV_API
int ARGBToARGB4444(const uint8* src_argb, int src_stride_argb, int ARGBToARGB4444(const uint8_t* src_argb,
uint8* dst_argb4444, int dst_stride_argb4444, int src_stride_argb,
int width, int height); uint8_t* dst_argb4444,
int dst_stride_argb4444,
int width,
int height);
// Convert ARGB To I444. // Convert ARGB To I444.
LIBYUV_API LIBYUV_API
int ARGBToI444(const uint8* src_argb, int src_stride_argb, int ARGBToI444(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert ARGB to AR64.
LIBYUV_API
int ARGBToAR64(const uint8_t* src_argb,
int src_stride_argb,
uint16_t* dst_ar64,
int dst_stride_ar64,
int width,
int height);
// Convert ABGR to AB64.
#define ABGRToAB64 ARGBToAR64
// Convert ARGB to AB64.
LIBYUV_API
int ARGBToAB64(const uint8_t* src_argb,
int src_stride_argb,
uint16_t* dst_ab64,
int dst_stride_ab64,
int width,
int height);
// Convert ABGR to AR64.
#define ABGRToAR64 ARGBToAB64
// Convert ARGB To I422. // Convert ARGB To I422.
LIBYUV_API LIBYUV_API
int ARGBToI422(const uint8* src_argb, int src_stride_argb, int ARGBToI422(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert ARGB To I420. (also in convert.h) // Convert ARGB To I420. (also in convert.h)
LIBYUV_API LIBYUV_API
int ARGBToI420(const uint8* src_argb, int src_stride_argb, int ARGBToI420(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_y,
uint8* dst_v, int dst_stride_v, int dst_stride_y,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert ARGB to J420. (JPeg full range I420). // Convert ARGB to J420. (JPeg full range I420).
LIBYUV_API LIBYUV_API
int ARGBToJ420(const uint8* src_argb, int src_stride_argb, int ARGBToJ420(const uint8_t* src_argb,
uint8* dst_yj, int dst_stride_yj, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_yj,
uint8* dst_v, int dst_stride_v, int dst_stride_yj,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert ARGB to J422. // Convert ARGB to J422.
LIBYUV_API LIBYUV_API
int ARGBToJ422(const uint8* src_argb, int src_stride_argb, int ARGBToJ422(const uint8_t* src_argb,
uint8* dst_yj, int dst_stride_yj, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_yj,
uint8* dst_v, int dst_stride_v, int dst_stride_yj,
int width, int height); uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height);
// Convert ARGB To I411. // Convert ARGB to J400. (JPeg full range).
LIBYUV_API LIBYUV_API
int ARGBToI411(const uint8* src_argb, int src_stride_argb, int ARGBToJ400(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_u, int dst_stride_u, uint8_t* dst_yj,
uint8* dst_v, int dst_stride_v, int dst_stride_yj,
int width, int height); int width,
int height);
// Convert ARGB to J400. (JPeg full range). // Convert RGBA to J400. (JPeg full range).
LIBYUV_API LIBYUV_API
int ARGBToJ400(const uint8* src_argb, int src_stride_argb, int RGBAToJ400(const uint8_t* src_rgba,
uint8* dst_yj, int dst_stride_yj, int src_stride_rgba,
int width, int height); uint8_t* dst_yj,
int dst_stride_yj,
int width,
int height);
// Convert ARGB to I400. // Convert ARGB to I400.
LIBYUV_API LIBYUV_API
int ARGBToI400(const uint8* src_argb, int src_stride_argb, int ARGBToI400(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
int width, int height); uint8_t* dst_y,
int dst_stride_y,
int width,
int height);
// Convert ARGB to G. (Reverse of J400toARGB, which replicates G back to ARGB) // Convert ARGB to G. (Reverse of J400toARGB, which replicates G back to ARGB)
LIBYUV_API LIBYUV_API
int ARGBToG(const uint8* src_argb, int src_stride_argb, int ARGBToG(const uint8_t* src_argb,
uint8* dst_g, int dst_stride_g, int src_stride_argb,
int width, int height); uint8_t* dst_g,
int dst_stride_g,
int width,
int height);
// Convert ARGB To NV12. // Convert ARGB To NV12.
LIBYUV_API LIBYUV_API
int ARGBToNV12(const uint8* src_argb, int src_stride_argb, int ARGBToNV12(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_uv, int dst_stride_uv, uint8_t* dst_y,
int width, int height); int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert ARGB To NV21. // Convert ARGB To NV21.
LIBYUV_API LIBYUV_API
int ARGBToNV21(const uint8* src_argb, int src_stride_argb, int ARGBToNV21(const uint8_t* src_argb,
uint8* dst_y, int dst_stride_y, int src_stride_argb,
uint8* dst_vu, int dst_stride_vu, uint8_t* dst_y,
int width, int height); int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
// Convert ARGB To NV21. // Convert ABGR To NV12.
LIBYUV_API LIBYUV_API
int ARGBToNV21(const uint8* src_argb, int src_stride_argb, int ABGRToNV12(const uint8_t* src_abgr,
uint8* dst_y, int dst_stride_y, int src_stride_abgr,
uint8* dst_vu, int dst_stride_vu, uint8_t* dst_y,
int width, int height); int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int width,
int height);
// Convert ABGR To NV21.
LIBYUV_API
int ABGRToNV21(const uint8_t* src_abgr,
int src_stride_abgr,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
// Convert ARGB To YUY2. // Convert ARGB To YUY2.
LIBYUV_API LIBYUV_API
int ARGBToYUY2(const uint8* src_argb, int src_stride_argb, int ARGBToYUY2(const uint8_t* src_argb,
uint8* dst_yuy2, int dst_stride_yuy2, int src_stride_argb,
int width, int height); uint8_t* dst_yuy2,
int dst_stride_yuy2,
int width,
int height);
// Convert ARGB To UYVY. // Convert ARGB To UYVY.
LIBYUV_API LIBYUV_API
int ARGBToUYVY(const uint8* src_argb, int src_stride_argb, int ARGBToUYVY(const uint8_t* src_argb,
uint8* dst_uyvy, int dst_stride_uyvy, int src_stride_argb,
int width, int height); uint8_t* dst_uyvy,
int dst_stride_uyvy,
int width,
int height);
// RAW to JNV21 full range NV21
LIBYUV_API
int RAWToJNV21(const uint8_t* src_raw,
int src_stride_raw,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_vu,
int dst_stride_vu,
int width,
int height);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -31,47 +31,93 @@ static const int kCpuHasX86 = 0x10;
static const int kCpuHasSSE2 = 0x20; static const int kCpuHasSSE2 = 0x20;
static const int kCpuHasSSSE3 = 0x40; static const int kCpuHasSSSE3 = 0x40;
static const int kCpuHasSSE41 = 0x80; static const int kCpuHasSSE41 = 0x80;
static const int kCpuHasSSE42 = 0x100; static const int kCpuHasSSE42 = 0x100; // unused at this time.
static const int kCpuHasAVX = 0x200; static const int kCpuHasAVX = 0x200;
static const int kCpuHasAVX2 = 0x400; static const int kCpuHasAVX2 = 0x400;
static const int kCpuHasERMS = 0x800; static const int kCpuHasERMS = 0x800;
static const int kCpuHasFMA3 = 0x1000; static const int kCpuHasFMA3 = 0x1000;
static const int kCpuHasAVX3 = 0x2000; static const int kCpuHasF16C = 0x2000;
// 0x2000, 0x4000, 0x8000 reserved for future X86 flags. static const int kCpuHasGFNI = 0x4000;
static const int kCpuHasAVX512BW = 0x8000;
static const int kCpuHasAVX512VL = 0x10000;
static const int kCpuHasAVX512VNNI = 0x20000;
static const int kCpuHasAVX512VBMI = 0x40000;
static const int kCpuHasAVX512VBMI2 = 0x80000;
static const int kCpuHasAVX512VBITALG = 0x100000;
static const int kCpuHasAVX512VPOPCNTDQ = 0x200000;
// These flags are only valid on MIPS processors. // These flags are only valid on MIPS processors.
static const int kCpuHasMIPS = 0x10000; static const int kCpuHasMIPS = 0x400000;
static const int kCpuHasDSPR2 = 0x20000; static const int kCpuHasMSA = 0x800000;
static const int kCpuHasMSA = 0x40000;
// Internal function used to auto-init. // These flags are only valid on LOONGARCH processors.
LIBYUV_API static const int kCpuHasLOONGARCH = 0x2000000;
int InitCpuFlags(void); static const int kCpuHasLSX = 0x4000000;
static const int kCpuHasLASX = 0x8000000;
// Internal function for parsing /proc/cpuinfo. // Optional init function. TestCpuFlag does an auto-init.
// Returns cpu_info flags.
LIBYUV_API LIBYUV_API
int ArmCpuCaps(const char* cpuinfo_name); int InitCpuFlags(void);
// Detect CPU has SSE2 etc. // Detect CPU has SSE2 etc.
// Test_flag parameter should be one of kCpuHas constants above. // Test_flag parameter should be one of kCpuHas constants above.
// returns non-zero if instruction set is detected // Returns non-zero if instruction set is detected
static __inline int TestCpuFlag(int test_flag) { static __inline int TestCpuFlag(int test_flag) {
LIBYUV_API extern int cpu_info_; LIBYUV_API extern int cpu_info_;
return (!cpu_info_ ? InitCpuFlags() : cpu_info_) & test_flag; #ifdef __ATOMIC_RELAXED
int cpu_info = __atomic_load_n(&cpu_info_, __ATOMIC_RELAXED);
#else
int cpu_info = cpu_info_;
#endif
return (!cpu_info ? InitCpuFlags() : cpu_info) & test_flag;
} }
// Internal function for parsing /proc/cpuinfo.
LIBYUV_API
int ArmCpuCaps(const char* cpuinfo_name);
LIBYUV_API
int MipsCpuCaps(const char* cpuinfo_name);
// For testing, allow CPU flags to be disabled. // For testing, allow CPU flags to be disabled.
// ie MaskCpuFlags(~kCpuHasSSSE3) to disable SSSE3. // ie MaskCpuFlags(~kCpuHasSSSE3) to disable SSSE3.
// MaskCpuFlags(-1) to enable all cpu specific optimizations. // MaskCpuFlags(-1) to enable all cpu specific optimizations.
// MaskCpuFlags(1) to disable all cpu specific optimizations. // MaskCpuFlags(1) to disable all cpu specific optimizations.
// MaskCpuFlags(0) to reset state so next call will auto init.
// Returns cpu_info flags.
LIBYUV_API LIBYUV_API
void MaskCpuFlags(int enable_flags); int MaskCpuFlags(int enable_flags);
// Sets the CPU flags to |cpu_flags|, bypassing the detection code. |cpu_flags|
// should be a valid combination of the kCpuHas constants above and include
// kCpuInitialized. Use this method when running in a sandboxed process where
// the detection code might fail (as it might access /proc/cpuinfo). In such
// cases the cpu_info can be obtained from a non sandboxed process by calling
// InitCpuFlags() and passed to the sandboxed process (via command line
// parameters, IPC...) which can then call this method to initialize the CPU
// flags.
// Notes:
// - when specifying 0 for |cpu_flags|, the auto initialization is enabled
// again.
// - enabling CPU features that are not supported by the CPU will result in
// undefined behavior.
// TODO(fbarchard): consider writing a helper function that translates from
// other library CPU info to libyuv CPU info and add a .md doc that explains
// CPU detection.
static __inline void SetCpuFlags(int cpu_flags) {
LIBYUV_API extern int cpu_info_;
#ifdef __ATOMIC_RELAXED
__atomic_store_n(&cpu_info_, cpu_flags, __ATOMIC_RELAXED);
#else
cpu_info_ = cpu_flags;
#endif
}
// Low level cpuid for X86. Returns zeros on other CPUs. // Low level cpuid for X86. Returns zeros on other CPUs.
// eax is the info type that you want. // eax is the info type that you want.
// ecx is typically the cpu number, and should normally be zero. // ecx is typically the cpu number, and should normally be zero.
LIBYUV_API LIBYUV_API
void CpuId(uint32 eax, uint32 ecx, uint32* cpu_info); void CpuId(int info_eax, int info_ecx, int* cpu_info);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

File diff suppressed because it is too large Load Diff

@ -12,15 +12,153 @@
#define INCLUDE_LIBYUV_MACROS_MSA_H_ #define INCLUDE_LIBYUV_MACROS_MSA_H_
#if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) #if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
#include <stdint.h>
#include <msa.h> #include <msa.h>
#include <stdint.h>
#if (__mips_isa_rev >= 6)
#define LW(psrc) \
({ \
const uint8_t* psrc_lw_m = (const uint8_t*)(psrc); \
uint32_t val_m; \
asm volatile("lw %[val_m], %[psrc_lw_m] \n" \
: [val_m] "=r"(val_m) \
: [psrc_lw_m] "m"(*psrc_lw_m)); \
val_m; \
})
#if (__mips == 64)
#define LD(psrc) \
({ \
const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \
uint64_t val_m = 0; \
asm volatile("ld %[val_m], %[psrc_ld_m] \n" \
: [val_m] "=r"(val_m) \
: [psrc_ld_m] "m"(*psrc_ld_m)); \
val_m; \
})
#else // !(__mips == 64)
#define LD(psrc) \
({ \
const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \
uint32_t val0_m, val1_m; \
uint64_t val_m = 0; \
val0_m = LW(psrc_ld_m); \
val1_m = LW(psrc_ld_m + 4); \
val_m = (uint64_t)(val1_m); /* NOLINT */ \
val_m = (uint64_t)((val_m << 32) & 0xFFFFFFFF00000000); /* NOLINT */ \
val_m = (uint64_t)(val_m | (uint64_t)val0_m); /* NOLINT */ \
val_m; \
})
#endif // (__mips == 64)
#define SW(val, pdst) \
({ \
uint8_t* pdst_sw_m = (uint8_t*)(pdst); /* NOLINT */ \
uint32_t val_m = (val); \
asm volatile("sw %[val_m], %[pdst_sw_m] \n" \
: [pdst_sw_m] "=m"(*pdst_sw_m) \
: [val_m] "r"(val_m)); \
})
#if (__mips == 64)
#define SD(val, pdst) \
({ \
uint8_t* pdst_sd_m = (uint8_t*)(pdst); /* NOLINT */ \
uint64_t val_m = (val); \
asm volatile("sd %[val_m], %[pdst_sd_m] \n" \
: [pdst_sd_m] "=m"(*pdst_sd_m) \
: [val_m] "r"(val_m)); \
})
#else // !(__mips == 64)
#define SD(val, pdst) \
({ \
uint8_t* pdst_sd_m = (uint8_t*)(pdst); /* NOLINT */ \
uint32_t val0_m, val1_m; \
val0_m = (uint32_t)((val)&0x00000000FFFFFFFF); \
val1_m = (uint32_t)(((val) >> 32) & 0x00000000FFFFFFFF); \
SW(val0_m, pdst_sd_m); \
SW(val1_m, pdst_sd_m + 4); \
})
#endif // !(__mips == 64)
#else // !(__mips_isa_rev >= 6)
#define LW(psrc) \
({ \
uint8_t* psrc_lw_m = (uint8_t*)(psrc); \
uint32_t val_lw_m; \
\
__asm__ volatile( \
"lwr %[val_lw_m], 0(%[psrc_lw_m]) \n\t" \
"lwl %[val_lw_m], 3(%[psrc_lw_m]) \n\t" \
\
: [val_lw_m] "=&r"(val_lw_m) \
: [psrc_lw_m] "r"(psrc_lw_m)); \
\
val_lw_m; \
})
#if (__mips == 64)
#define LD(psrc) \
({ \
uint8_t* psrc_ld_m = (uint8_t*)(psrc); \
uint64_t val_ld_m = 0; \
\
__asm__ volatile( \
"ldr %[val_ld_m], 0(%[psrc_ld_m]) \n\t" \
"ldl %[val_ld_m], 7(%[psrc_ld_m]) \n\t" \
\
: [val_ld_m] "=&r"(val_ld_m) \
: [psrc_ld_m] "r"(psrc_ld_m)); \
\
val_ld_m; \
})
#else // !(__mips == 64)
#define LD(psrc) \
({ \
const uint8_t* psrc_ld_m = (const uint8_t*)(psrc); \
uint32_t val0_m, val1_m; \
uint64_t val_m = 0; \
val0_m = LW(psrc_ld_m); \
val1_m = LW(psrc_ld_m + 4); \
val_m = (uint64_t)(val1_m); /* NOLINT */ \
val_m = (uint64_t)((val_m << 32) & 0xFFFFFFFF00000000); /* NOLINT */ \
val_m = (uint64_t)(val_m | (uint64_t)val0_m); /* NOLINT */ \
val_m; \
})
#endif // (__mips == 64)
#define SW(val, pdst) \
({ \
uint8_t* pdst_sw_m = (uint8_t*)(pdst); /* NOLINT */ \
uint32_t val_m = (val); \
asm volatile("usw %[val_m], %[pdst_sw_m] \n" \
: [pdst_sw_m] "=m"(*pdst_sw_m) \
: [val_m] "r"(val_m)); \
})
#define SD(val, pdst) \
({ \
uint8_t* pdst_sd_m = (uint8_t*)(pdst); /* NOLINT */ \
uint32_t val0_m, val1_m; \
val0_m = (uint32_t)((val)&0x00000000FFFFFFFF); \
val1_m = (uint32_t)(((val) >> 32) & 0x00000000FFFFFFFF); \
SW(val0_m, pdst_sd_m); \
SW(val1_m, pdst_sd_m + 4); \
})
#endif // (__mips_isa_rev >= 6)
// TODO(fbarchard): Consider removing __VAR_ARGS versions.
#define LD_B(RTYPE, psrc) *((RTYPE*)(psrc)) /* NOLINT */ #define LD_B(RTYPE, psrc) *((RTYPE*)(psrc)) /* NOLINT */
#define LD_UB(...) LD_B(v16u8, __VA_ARGS__) #define LD_UB(...) LD_B(const v16u8, __VA_ARGS__)
#define LD_H(RTYPE, psrc) *((RTYPE*)(psrc)) /* NOLINT */
#define LD_UH(...) LD_H(const v8u16, __VA_ARGS__)
#define ST_B(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) /* NOLINT */ #define ST_B(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) /* NOLINT */
#define ST_UB(...) ST_B(v16u8, __VA_ARGS__) #define ST_UB(...) ST_B(v16u8, __VA_ARGS__)
#define ST_H(RTYPE, in, pdst) *((RTYPE*)(pdst)) = (in) /* NOLINT */
#define ST_UH(...) ST_H(v8u16, __VA_ARGS__)
/* Description : Load two vectors with 16 'byte' sized elements /* Description : Load two vectors with 16 'byte' sized elements
Arguments : Inputs - psrc, stride Arguments : Inputs - psrc, stride
Outputs - out0, out1 Outputs - out0, out1
@ -28,17 +166,19 @@
Details : Load 16 byte elements in 'out0' from (psrc) Details : Load 16 byte elements in 'out0' from (psrc)
Load 16 byte elements in 'out1' from (psrc + stride) Load 16 byte elements in 'out1' from (psrc + stride)
*/ */
#define LD_B2(RTYPE, psrc, stride, out0, out1) { \ #define LD_B2(RTYPE, psrc, stride, out0, out1) \
{ \
out0 = LD_B(RTYPE, (psrc)); \ out0 = LD_B(RTYPE, (psrc)); \
out1 = LD_B(RTYPE, (psrc) + stride); \ out1 = LD_B(RTYPE, (psrc) + stride); \
} }
#define LD_UB2(...) LD_B2(v16u8, __VA_ARGS__) #define LD_UB2(...) LD_B2(const v16u8, __VA_ARGS__)
#define LD_B4(RTYPE, psrc, stride, out0, out1, out2, out3) { \ #define LD_B4(RTYPE, psrc, stride, out0, out1, out2, out3) \
{ \
LD_B2(RTYPE, (psrc), stride, out0, out1); \ LD_B2(RTYPE, (psrc), stride, out0, out1); \
LD_B2(RTYPE, (psrc) + 2 * stride, stride, out2, out3); \ LD_B2(RTYPE, (psrc) + 2 * stride, stride, out2, out3); \
} }
#define LD_UB4(...) LD_B4(v16u8, __VA_ARGS__) #define LD_UB4(...) LD_B4(const v16u8, __VA_ARGS__)
/* Description : Store two vectors with stride each having 16 'byte' sized /* Description : Store two vectors with stride each having 16 'byte' sized
elements elements
@ -46,18 +186,33 @@
Details : Store 16 byte elements from 'in0' to (pdst) Details : Store 16 byte elements from 'in0' to (pdst)
Store 16 byte elements from 'in1' to (pdst + stride) Store 16 byte elements from 'in1' to (pdst + stride)
*/ */
#define ST_B2(RTYPE, in0, in1, pdst, stride) { \ #define ST_B2(RTYPE, in0, in1, pdst, stride) \
{ \
ST_B(RTYPE, in0, (pdst)); \ ST_B(RTYPE, in0, (pdst)); \
ST_B(RTYPE, in1, (pdst) + stride); \ ST_B(RTYPE, in1, (pdst) + stride); \
} }
#define ST_UB2(...) ST_B2(v16u8, __VA_ARGS__) #define ST_UB2(...) ST_B2(v16u8, __VA_ARGS__)
#
#define ST_B4(RTYPE, in0, in1, in2, in3, pdst, stride) { \ #define ST_B4(RTYPE, in0, in1, in2, in3, pdst, stride) \
{ \
ST_B2(RTYPE, in0, in1, (pdst), stride); \ ST_B2(RTYPE, in0, in1, (pdst), stride); \
ST_B2(RTYPE, in2, in3, (pdst) + 2 * stride, stride); \ ST_B2(RTYPE, in2, in3, (pdst) + 2 * stride, stride); \
} }
#define ST_UB4(...) ST_B4(v16u8, __VA_ARGS__) #define ST_UB4(...) ST_B4(v16u8, __VA_ARGS__)
#
/* Description : Store vectors of 8 halfword elements with stride
Arguments : Inputs - in0, in1, pdst, stride
Details : Store 8 halfword elements from 'in0' to (pdst)
Store 8 halfword elements from 'in1' to (pdst + stride)
*/
#define ST_H2(RTYPE, in0, in1, pdst, stride) \
{ \
ST_H(RTYPE, in0, (pdst)); \
ST_H(RTYPE, in1, (pdst) + stride); \
}
#define ST_UH2(...) ST_H2(v8u16, __VA_ARGS__)
// TODO(fbarchard): Consider using __msa_vshf_b and __msa_ilvr_b directly.
/* Description : Shuffle byte vector elements as per mask vector /* Description : Shuffle byte vector elements as per mask vector
Arguments : Inputs - in0, in1, in2, in3, mask0, mask1 Arguments : Inputs - in0, in1, in2, in3, mask0, mask1
Outputs - out0, out1 Outputs - out0, out1
@ -65,12 +220,27 @@
Details : Byte elements from 'in0' & 'in1' are copied selectively to Details : Byte elements from 'in0' & 'in1' are copied selectively to
'out0' as per control vector 'mask0' 'out0' as per control vector 'mask0'
*/ */
#define VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1) { \ #define VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1) \
{ \
out0 = (RTYPE)__msa_vshf_b((v16i8)mask0, (v16i8)in1, (v16i8)in0); \ out0 = (RTYPE)__msa_vshf_b((v16i8)mask0, (v16i8)in1, (v16i8)in0); \
out1 = (RTYPE)__msa_vshf_b((v16i8)mask1, (v16i8)in3, (v16i8)in2); \ out1 = (RTYPE)__msa_vshf_b((v16i8)mask1, (v16i8)in3, (v16i8)in2); \
} }
#define VSHF_B2_UB(...) VSHF_B2(v16u8, __VA_ARGS__) #define VSHF_B2_UB(...) VSHF_B2(v16u8, __VA_ARGS__)
/* Description : Interleave both left and right half of input vectors
Arguments : Inputs - in0, in1
Outputs - out0, out1
Return Type - as per RTYPE
Details : Right half of byte elements from 'in0' and 'in1' are
interleaved and written to 'out0'
*/
#define ILVRL_B2(RTYPE, in0, in1, out0, out1) \
{ \
out0 = (RTYPE)__msa_ilvr_b((v16i8)in0, (v16i8)in1); \
out1 = (RTYPE)__msa_ilvl_b((v16i8)in0, (v16i8)in1); \
}
#define ILVRL_B2_UB(...) ILVRL_B2(v16u8, __VA_ARGS__)
#endif /* !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) */ #endif /* !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa) */
#endif // INCLUDE_LIBYUV_MACROS_MSA_H_ #endif // INCLUDE_LIBYUV_MACROS_MSA_H_

@ -26,25 +26,24 @@ namespace libyuv {
extern "C" { extern "C" {
#endif #endif
LIBYUV_BOOL ValidateJpeg(const uint8* sample, size_t sample_size); LIBYUV_BOOL ValidateJpeg(const uint8_t* sample, size_t sample_size);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
static const uint32 kUnknownDataSize = 0xFFFFFFFF; static const uint32_t kUnknownDataSize = 0xFFFFFFFF;
enum JpegSubsamplingType { enum JpegSubsamplingType {
kJpegYuv420, kJpegYuv420,
kJpegYuv422, kJpegYuv422,
kJpegYuv411,
kJpegYuv444, kJpegYuv444,
kJpegYuv400, kJpegYuv400,
kJpegUnknown kJpegUnknown
}; };
struct Buffer { struct Buffer {
const uint8* data; const uint8_t* data;
int len; int len;
}; };
@ -66,7 +65,7 @@ struct SetJmpErrorMgr;
class LIBYUV_API MJpegDecoder { class LIBYUV_API MJpegDecoder {
public: public:
typedef void (*CallbackFunction)(void* opaque, typedef void (*CallbackFunction)(void* opaque,
const uint8* const* data, const uint8_t* const* data,
const int* strides, const int* strides,
int rows); int rows);
@ -86,7 +85,7 @@ class LIBYUV_API MJpegDecoder {
// If return value is LIBYUV_TRUE, then the values for all the following // If return value is LIBYUV_TRUE, then the values for all the following
// getters are populated. // getters are populated.
// src_len is the size of the compressed mjpeg frame in bytes. // src_len is the size of the compressed mjpeg frame in bytes.
LIBYUV_BOOL LoadFrame(const uint8* src, size_t src_len); LIBYUV_BOOL LoadFrame(const uint8_t* src, size_t src_len);
// Returns width of the last loaded frame in pixels. // Returns width of the last loaded frame in pixels.
int GetWidth(); int GetWidth();
@ -139,18 +138,22 @@ class LIBYUV_API MJpegDecoder {
// at least GetComponentSize(i). The pointers in planes are incremented // at least GetComponentSize(i). The pointers in planes are incremented
// to point to after the end of the written data. // to point to after the end of the written data.
// TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded. // TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded.
LIBYUV_BOOL DecodeToBuffers(uint8** planes, int dst_width, int dst_height); LIBYUV_BOOL DecodeToBuffers(uint8_t** planes, int dst_width, int dst_height);
// Decodes the entire image and passes the data via repeated calls to a // Decodes the entire image and passes the data via repeated calls to a
// callback function. Each call will get the data for a whole number of // callback function. Each call will get the data for a whole number of
// image scanlines. // image scanlines.
// TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded. // TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded.
LIBYUV_BOOL DecodeToCallback(CallbackFunction fn, void* opaque, LIBYUV_BOOL DecodeToCallback(CallbackFunction fn,
int dst_width, int dst_height); void* opaque,
int dst_width,
int dst_height);
// The helper function which recognizes the jpeg sub-sampling type. // The helper function which recognizes the jpeg sub-sampling type.
static JpegSubsamplingType JpegSubsamplingTypeHelper( static JpegSubsamplingType JpegSubsamplingTypeHelper(
int* subsample_x, int* subsample_y, int number_of_components); int* subsample_x,
int* subsample_y,
int number_of_components);
private: private:
void AllocOutputBuffers(int num_outbufs); void AllocOutputBuffers(int num_outbufs);
@ -159,7 +162,7 @@ class LIBYUV_API MJpegDecoder {
LIBYUV_BOOL StartDecode(); LIBYUV_BOOL StartDecode();
LIBYUV_BOOL FinishDecode(); LIBYUV_BOOL FinishDecode();
void SetScanlinePointers(uint8** data); void SetScanlinePointers(uint8_t** data);
LIBYUV_BOOL DecodeImcuRow(); LIBYUV_BOOL DecodeImcuRow();
int GetComponentScanlinePadding(int component); int GetComponentScanlinePadding(int component);
@ -178,11 +181,11 @@ class LIBYUV_API MJpegDecoder {
// Temporaries used to point to scanline outputs. // Temporaries used to point to scanline outputs.
int num_outbufs_; // Outermost size of all arrays below. int num_outbufs_; // Outermost size of all arrays below.
uint8*** scanlines_; uint8_t*** scanlines_;
int* scanlines_sizes_; int* scanlines_sizes_;
// Temporary buffer used for decoding when we can't decode directly to the // Temporary buffer used for decoding when we can't decode directly to the
// output buffers. Large enough for just one iMCU row. // output buffers. Large enough for just one iMCU row.
uint8** databuf_; uint8_t** databuf_;
int* databuf_strides_; int* databuf_strides_;
}; };

File diff suppressed because it is too large Load Diff

@ -33,81 +33,196 @@ typedef enum RotationMode {
// Rotate I420 frame. // Rotate I420 frame.
LIBYUV_API LIBYUV_API
int I420Rotate(const uint8* src_y, int src_stride_y, int I420Rotate(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint8* dst_y, int dst_stride_y, int src_stride_u,
uint8* dst_u, int dst_stride_u, const uint8_t* src_v,
uint8* dst_v, int dst_stride_v, int src_stride_v,
int src_width, int src_height, enum RotationMode mode); uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode mode);
// Rotate I422 frame.
LIBYUV_API
int I422Rotate(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode mode);
// Rotate I444 frame.
LIBYUV_API
int I444Rotate(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_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode mode);
// Rotate NV12 input and store in I420. // Rotate NV12 input and store in I420.
LIBYUV_API LIBYUV_API
int NV12ToI420Rotate(const uint8* src_y, int src_stride_y, int NV12ToI420Rotate(const uint8_t* src_y,
const uint8* src_uv, int src_stride_uv, int src_stride_y,
uint8* dst_y, int dst_stride_y, const uint8_t* src_uv,
uint8* dst_u, int dst_stride_u, int src_stride_uv,
uint8* dst_v, int dst_stride_v, uint8_t* dst_y,
int src_width, int src_height, enum RotationMode mode); int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode mode);
// Convert Android420 to I420 with rotation.
// "rotation" can be 0, 90, 180 or 270.
LIBYUV_API
int Android420ToI420Rotate(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,
int src_pixel_stride_uv,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode rotation);
// Rotate a plane by 0, 90, 180, or 270. // Rotate a plane by 0, 90, 180, or 270.
LIBYUV_API LIBYUV_API
int RotatePlane(const uint8* src, int src_stride, int RotatePlane(const uint8_t* src,
uint8* dst, int dst_stride, int src_stride,
int src_width, int src_height, enum RotationMode mode); uint8_t* dst,
int dst_stride,
int width,
int height,
enum RotationMode mode);
// Rotate planes by 90, 180, 270. Deprecated. // Rotate planes by 90, 180, 270. Deprecated.
LIBYUV_API LIBYUV_API
void RotatePlane90(const uint8* src, int src_stride, void RotatePlane90(const uint8_t* src,
uint8* dst, int dst_stride, int src_stride,
int width, int height); uint8_t* dst,
int dst_stride,
LIBYUV_API int width,
void RotatePlane180(const uint8* src, int src_stride, int height);
uint8* dst, int dst_stride,
int width, int height);
LIBYUV_API LIBYUV_API
void RotatePlane270(const uint8* src, int src_stride, void RotatePlane180(const uint8_t* src,
uint8* dst, int dst_stride, int src_stride,
int width, int height); uint8_t* dst,
int dst_stride,
int width,
int height);
LIBYUV_API LIBYUV_API
void RotateUV90(const uint8* src, int src_stride, void RotatePlane270(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, uint8_t* dst,
int width, int height); int dst_stride,
int width,
int height);
// Rotations for when U and V are interleaved. // Rotations for when U and V are interleaved.
// These functions take one input pointer and // These functions take one UV input pointer and
// split the data into two buffers while // split the data into two buffers while
// rotating them. Deprecated. // rotating them.
// width and height expected to be half size for NV12.
LIBYUV_API
int SplitRotateUV(const uint8_t* src_uv,
int src_stride_uv,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int width,
int height,
enum RotationMode mode);
LIBYUV_API
void SplitRotateUV90(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width,
int height);
LIBYUV_API LIBYUV_API
void RotateUV180(const uint8* src, int src_stride, void SplitRotateUV180(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, uint8_t* dst_a,
int width, int height); int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width,
int height);
LIBYUV_API LIBYUV_API
void RotateUV270(const uint8* src, int src_stride, void SplitRotateUV270(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, uint8_t* dst_a,
int width, int height); int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width,
int height);
// The 90 and 270 functions are based on transposes. // The 90 and 270 functions are based on transposes.
// Doing a transpose with reversing the read/write // Doing a transpose with reversing the read/write
// order will result in a rotation by +- 90 degrees. // order will result in a rotation by +- 90 degrees.
// Deprecated. // Deprecated.
LIBYUV_API LIBYUV_API
void TransposePlane(const uint8* src, int src_stride, void TransposePlane(const uint8_t* src,
uint8* dst, int dst_stride, int src_stride,
int width, int height); uint8_t* dst,
int dst_stride,
int width,
int height);
LIBYUV_API LIBYUV_API
void TransposeUV(const uint8* src, int src_stride, void SplitTransposeUV(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, uint8_t* dst_a,
int width, int height); int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width,
int height);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -21,9 +21,13 @@ extern "C" {
// Rotate ARGB frame // Rotate ARGB frame
LIBYUV_API LIBYUV_API
int ARGBRotate(const uint8* src_argb, int src_stride_argb, int ARGBRotate(const uint8_t* src_argb,
uint8* dst_argb, int dst_stride_argb, int src_stride_argb,
int src_width, int src_height, enum RotationMode mode); uint8_t* dst_argb,
int dst_stride_argb,
int src_width,
int src_height,
enum RotationMode mode);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

@ -19,99 +19,202 @@ extern "C" {
#endif #endif
#if defined(__pnacl__) || defined(__CLR_VER) || \ #if defined(__pnacl__) || defined(__CLR_VER) || \
(defined(__i386__) && !defined(__SSE2__)) (defined(__native_client__) && defined(__x86_64__)) || \
(defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
#define LIBYUV_DISABLE_X86 #define LIBYUV_DISABLE_X86
#endif #endif
#if defined(__native_client__)
#define LIBYUV_DISABLE_NEON
#endif
// MemorySanitizer does not support assembly code yet. http://crbug.com/344505 // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
#if defined(__has_feature) #if defined(__has_feature)
#if __has_feature(memory_sanitizer) #if __has_feature(memory_sanitizer)
#define LIBYUV_DISABLE_X86 #define LIBYUV_DISABLE_X86
#endif #endif
#endif #endif
// The following are available for Visual C and clangcl 32 bit: // The following are available for Visual C 32 bit:
#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) #if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) && \
!defined(__clang__)
#define HAS_TRANSPOSEWX8_SSSE3 #define HAS_TRANSPOSEWX8_SSSE3
#define HAS_TRANSPOSEUVWX8_SSE2 #define HAS_TRANSPOSEUVWX8_SSE2
#endif #endif
// The following are available for GCC 32 or 64 bit but not NaCL for 64 bit: // The following are available for GCC 32 or 64 bit:
#if !defined(LIBYUV_DISABLE_X86) && \ #if !defined(LIBYUV_DISABLE_X86) && (defined(__i386__) || defined(__x86_64__))
(defined(__i386__) || (defined(__x86_64__) && !defined(__native_client__)))
#define HAS_TRANSPOSEWX8_SSSE3 #define HAS_TRANSPOSEWX8_SSSE3
#endif #endif
// The following are available for 64 bit GCC but not NaCL: // The following are available for 64 bit GCC:
#if !defined(LIBYUV_DISABLE_X86) && !defined(__native_client__) && \ #if !defined(LIBYUV_DISABLE_X86) && defined(__x86_64__)
defined(__x86_64__)
#define HAS_TRANSPOSEWX8_FAST_SSSE3 #define HAS_TRANSPOSEWX8_FAST_SSSE3
#define HAS_TRANSPOSEUVWX8_SSE2 #define HAS_TRANSPOSEUVWX8_SSE2
#endif #endif
#if !defined(LIBYUV_DISABLE_NEON) && !defined(__native_client__) && \ #if !defined(LIBYUV_DISABLE_NEON) && \
(defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__)) (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__))
#define HAS_TRANSPOSEWX8_NEON #define HAS_TRANSPOSEWX8_NEON
#define HAS_TRANSPOSEUVWX8_NEON #define HAS_TRANSPOSEUVWX8_NEON
#endif #endif
#if !defined(LIBYUV_DISABLE_MIPS) && !defined(__native_client__) && \ #if !defined(LIBYUV_DISABLE_MSA) && defined(__mips_msa)
defined(__mips__) && \ #define HAS_TRANSPOSEWX16_MSA
defined(__mips_dsp) && (__mips_dsp_rev >= 2) #define HAS_TRANSPOSEUVWX16_MSA
#define HAS_TRANSPOSEWX8_DSPR2 #endif
#define HAS_TRANSPOSEUVWX8_DSPR2
#endif // defined(__mips__) #if !defined(LIBYUV_DISABLE_LSX) && defined(__loongarch_sx)
#define HAS_TRANSPOSEWX16_LSX
void TransposeWxH_C(const uint8* src, int src_stride, #define HAS_TRANSPOSEUVWX16_LSX
uint8* dst, int dst_stride, int width, int height); #endif
void TransposeWx8_C(const uint8* src, int src_stride, void TransposeWxH_C(const uint8_t* src,
uint8* dst, int dst_stride, int width); int src_stride,
void TransposeWx8_NEON(const uint8* src, int src_stride, uint8_t* dst,
uint8* dst, int dst_stride, int width); int dst_stride,
void TransposeWx8_SSSE3(const uint8* src, int src_stride, int width,
uint8* dst, int dst_stride, int width); int height);
void TransposeWx8_Fast_SSSE3(const uint8* src, int src_stride,
uint8* dst, int dst_stride, int width); void TransposeWx8_C(const uint8_t* src,
void TransposeWx8_DSPR2(const uint8* src, int src_stride, int src_stride,
uint8* dst, int dst_stride, int width); uint8_t* dst,
void TransposeWx8_Fast_DSPR2(const uint8* src, int src_stride, int dst_stride,
uint8* dst, int dst_stride, int width); int width);
void TransposeWx16_C(const uint8_t* src,
void TransposeWx8_Any_NEON(const uint8* src, int src_stride, int src_stride,
uint8* dst, int dst_stride, int width); uint8_t* dst,
void TransposeWx8_Any_SSSE3(const uint8* src, int src_stride, int dst_stride,
uint8* dst, int dst_stride, int width); int width);
void TransposeWx8_Fast_Any_SSSE3(const uint8* src, int src_stride, void TransposeWx8_NEON(const uint8_t* src,
uint8* dst, int dst_stride, int width); int src_stride,
void TransposeWx8_Any_DSPR2(const uint8* src, int src_stride, uint8_t* dst,
uint8* dst, int dst_stride, int width); int dst_stride,
int width);
void TransposeUVWxH_C(const uint8* src, int src_stride, void TransposeWx8_SSSE3(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, uint8_t* dst,
int width, int height); int dst_stride,
int width);
void TransposeUVWx8_C(const uint8* src, int src_stride, void TransposeWx8_Fast_SSSE3(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, int width); uint8_t* dst,
void TransposeUVWx8_SSE2(const uint8* src, int src_stride, int dst_stride,
uint8* dst_a, int dst_stride_a, int width);
uint8* dst_b, int dst_stride_b, int width); void TransposeWx16_MSA(const uint8_t* src,
void TransposeUVWx8_NEON(const uint8* src, int src_stride, int src_stride,
uint8* dst_a, int dst_stride_a, uint8_t* dst,
uint8* dst_b, int dst_stride_b, int width); int dst_stride,
void TransposeUVWx8_DSPR2(const uint8* src, int src_stride, int width);
uint8* dst_a, int dst_stride_a, void TransposeWx16_LSX(const uint8_t* src,
uint8* dst_b, int dst_stride_b, int width); int src_stride,
uint8_t* dst,
void TransposeUVWx8_Any_SSE2(const uint8* src, int src_stride, int dst_stride,
uint8* dst_a, int dst_stride_a, int width);
uint8* dst_b, int dst_stride_b, int width);
void TransposeUVWx8_Any_NEON(const uint8* src, int src_stride, void TransposeWx8_Any_NEON(const uint8_t* src,
uint8* dst_a, int dst_stride_a, int src_stride,
uint8* dst_b, int dst_stride_b, int width); uint8_t* dst,
void TransposeUVWx8_Any_DSPR2(const uint8* src, int src_stride, int dst_stride,
uint8* dst_a, int dst_stride_a, int width);
uint8* dst_b, int dst_stride_b, int width); void TransposeWx8_Any_SSSE3(const uint8_t* src,
int src_stride,
uint8_t* dst,
int dst_stride,
int width);
void TransposeWx8_Fast_Any_SSSE3(const uint8_t* src,
int src_stride,
uint8_t* dst,
int dst_stride,
int width);
void TransposeWx16_Any_MSA(const uint8_t* src,
int src_stride,
uint8_t* dst,
int dst_stride,
int width);
void TransposeWx16_Any_LSX(const uint8_t* src,
int src_stride,
uint8_t* dst,
int dst_stride,
int width);
void TransposeUVWxH_C(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width,
int height);
void TransposeUVWx8_C(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx16_C(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx8_SSE2(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx8_NEON(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx16_MSA(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx16_LSX(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx8_Any_SSE2(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx8_Any_NEON(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx16_Any_MSA(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
void TransposeUVWx16_Any_LSX(const uint8_t* src,
int src_stride,
uint8_t* dst_a,
int dst_stride_a,
uint8_t* dst_b,
int dst_stride_b,
int width);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

File diff suppressed because it is too large Load Diff

@ -28,17 +28,37 @@ typedef enum FilterMode {
// Scale a YUV plane. // Scale a YUV plane.
LIBYUV_API LIBYUV_API
void ScalePlane(const uint8* src, int src_stride, void ScalePlane(const uint8_t* src,
int src_width, int src_height, int src_stride,
uint8* dst, int dst_stride, int src_width,
int dst_width, int dst_height, int src_height,
uint8_t* dst,
int dst_stride,
int dst_width,
int dst_height,
enum FilterMode filtering); enum FilterMode filtering);
LIBYUV_API LIBYUV_API
void ScalePlane_16(const uint16* src, int src_stride, void ScalePlane_16(const uint16_t* src,
int src_width, int src_height, int src_stride,
uint16* dst, int dst_stride, int src_width,
int dst_width, int dst_height, int src_height,
uint16_t* dst,
int dst_stride,
int dst_width,
int dst_height,
enum FilterMode filtering);
// Sample is expected to be in the low 12 bits.
LIBYUV_API
void ScalePlane_12(const uint16_t* src,
int src_stride,
int src_width,
int src_height,
uint16_t* dst,
int dst_stride,
int dst_width,
int dst_height,
enum FilterMode filtering); enum FilterMode filtering);
// Scales a YUV 4:2:0 image from the src width and height to the // Scales a YUV 4:2:0 image from the src width and height to the
@ -52,42 +72,239 @@ void ScalePlane_16(const uint16* src, int src_stride,
// Returns 0 if successful. // Returns 0 if successful.
LIBYUV_API LIBYUV_API
int I420Scale(const uint8* src_y, int src_stride_y, int I420Scale(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
int src_width, int src_height, int src_stride_u,
uint8* dst_y, int dst_stride_y, const uint8_t* src_v,
uint8* dst_u, int dst_stride_u, int src_stride_v,
uint8* dst_v, int dst_stride_v, int src_width,
int dst_width, int dst_height, int src_height,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering); enum FilterMode filtering);
LIBYUV_API LIBYUV_API
int I420Scale_16(const uint16* src_y, int src_stride_y, int I420Scale_16(const uint16_t* src_y,
const uint16* src_u, int src_stride_u, int src_stride_y,
const uint16* src_v, int src_stride_v, const uint16_t* src_u,
int src_width, int src_height, int src_stride_u,
uint16* dst_y, int dst_stride_y, const uint16_t* src_v,
uint16* dst_u, int dst_stride_u, int src_stride_v,
uint16* dst_v, int dst_stride_v, int src_width,
int dst_width, int dst_height, int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering); enum FilterMode filtering);
#ifdef __cplusplus
// Legacy API. Deprecated.
LIBYUV_API LIBYUV_API
int Scale(const uint8* src_y, const uint8* src_u, const uint8* src_v, int I420Scale_12(const uint16_t* src_y,
int src_stride_y, int src_stride_u, int src_stride_v, int src_stride_y,
int src_width, int src_height, const uint16_t* src_u,
uint8* dst_y, uint8* dst_u, uint8* dst_v, int src_stride_u,
int dst_stride_y, int dst_stride_u, int dst_stride_v, const uint16_t* src_v,
int dst_width, int dst_height, int src_stride_v,
LIBYUV_BOOL interpolate); int src_width,
int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
// Scales a YUV 4:4:4 image from the src width and height to the
// dst width and height.
// If filtering is kFilterNone, a simple nearest-neighbor algorithm is
// used. This produces basic (blocky) quality at the fastest speed.
// If filtering is kFilterBilinear, interpolation is used to produce a better
// quality image, at the expense of speed.
// If filtering is kFilterBox, averaging is used to produce ever better
// quality image, at further expense of speed.
// Returns 0 if successful.
LIBYUV_API
int I444Scale(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,
int src_width,
int src_height,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
LIBYUV_API
int I444Scale_16(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
int src_width,
int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
LIBYUV_API
int I444Scale_12(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
int src_width,
int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
// Scales a YUV 4:2:2 image from the src width and height to the
// dst width and height.
// If filtering is kFilterNone, a simple nearest-neighbor algorithm is
// used. This produces basic (blocky) quality at the fastest speed.
// If filtering is kFilterBilinear, interpolation is used to produce a better
// quality image, at the expense of speed.
// If filtering is kFilterBox, averaging is used to produce ever better
// quality image, at further expense of speed.
// Returns 0 if successful.
LIBYUV_API
int I422Scale(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,
int src_width,
int src_height,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_u,
int dst_stride_u,
uint8_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
LIBYUV_API
int I422Scale_16(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
int src_width,
int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
LIBYUV_API
int I422Scale_12(const uint16_t* src_y,
int src_stride_y,
const uint16_t* src_u,
int src_stride_u,
const uint16_t* src_v,
int src_stride_v,
int src_width,
int src_height,
uint16_t* dst_y,
int dst_stride_y,
uint16_t* dst_u,
int dst_stride_u,
uint16_t* dst_v,
int dst_stride_v,
int dst_width,
int dst_height,
enum FilterMode filtering);
// Scales an NV12 image from the src width and height to the
// dst width and height.
// If filtering is kFilterNone, a simple nearest-neighbor algorithm is
// used. This produces basic (blocky) quality at the fastest speed.
// If filtering is kFilterBilinear, interpolation is used to produce a better
// quality image, at the expense of speed.
// kFilterBox is not supported for the UV channel and will be treated as
// bilinear.
// Returns 0 if successful.
LIBYUV_API
int NV12Scale(const uint8_t* src_y,
int src_stride_y,
const uint8_t* src_uv,
int src_stride_uv,
int src_width,
int src_height,
uint8_t* dst_y,
int dst_stride_y,
uint8_t* dst_uv,
int dst_stride_uv,
int dst_width,
int dst_height,
enum FilterMode filtering);
#ifdef __cplusplus
// Legacy API. Deprecated. // Legacy API. Deprecated.
LIBYUV_API LIBYUV_API
int ScaleOffset(const uint8* src_i420, int src_width, int src_height, int Scale(const uint8_t* src_y,
uint8* dst_i420, int dst_width, int dst_height, int dst_yoffset, const uint8_t* src_u,
const uint8_t* src_v,
int src_stride_y,
int src_stride_u,
int src_stride_v,
int src_width,
int src_height,
uint8_t* dst_y,
uint8_t* dst_u,
uint8_t* dst_v,
int dst_stride_y,
int dst_stride_u,
int dst_stride_v,
int dst_width,
int dst_height,
LIBYUV_BOOL interpolate); LIBYUV_BOOL interpolate);
// For testing, allow disabling of specialized scalers. // For testing, allow disabling of specialized scalers.

@ -20,32 +20,52 @@ extern "C" {
#endif #endif
LIBYUV_API LIBYUV_API
int ARGBScale(const uint8* src_argb, int src_stride_argb, int ARGBScale(const uint8_t* src_argb,
int src_width, int src_height, int src_stride_argb,
uint8* dst_argb, int dst_stride_argb, int src_width,
int dst_width, int dst_height, int src_height,
uint8_t* dst_argb,
int dst_stride_argb,
int dst_width,
int dst_height,
enum FilterMode filtering); enum FilterMode filtering);
// Clipped scale takes destination rectangle coordinates for clip values. // Clipped scale takes destination rectangle coordinates for clip values.
LIBYUV_API LIBYUV_API
int ARGBScaleClip(const uint8* src_argb, int src_stride_argb, int ARGBScaleClip(const uint8_t* src_argb,
int src_width, int src_height, int src_stride_argb,
uint8* dst_argb, int dst_stride_argb, int src_width,
int dst_width, int dst_height, int src_height,
int clip_x, int clip_y, int clip_width, int clip_height, uint8_t* dst_argb,
int dst_stride_argb,
int dst_width,
int dst_height,
int clip_x,
int clip_y,
int clip_width,
int clip_height,
enum FilterMode filtering); enum FilterMode filtering);
// Scale with YUV conversion to ARGB and clipping. // Scale with YUV conversion to ARGB and clipping.
LIBYUV_API LIBYUV_API
int YUVToARGBScaleClip(const uint8* src_y, int src_stride_y, int YUVToARGBScaleClip(const uint8_t* src_y,
const uint8* src_u, int src_stride_u, int src_stride_y,
const uint8* src_v, int src_stride_v, const uint8_t* src_u,
uint32 src_fourcc, int src_stride_u,
int src_width, int src_height, const uint8_t* src_v,
uint8* dst_argb, int dst_stride_argb, int src_stride_v,
uint32 dst_fourcc, uint32_t src_fourcc,
int dst_width, int dst_height, int src_width,
int clip_x, int clip_y, int clip_width, int clip_height, int src_height,
uint8_t* dst_argb,
int dst_stride_argb,
uint32_t dst_fourcc,
int dst_width,
int dst_height,
int clip_x,
int clip_y,
int clip_width,
int clip_height,
enum FilterMode filtering); enum FilterMode filtering);
#ifdef __cplusplus #ifdef __cplusplus

@ -0,0 +1,42 @@
/*
* Copyright 2022 The LibYuv Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef INCLUDE_LIBYUV_SCALE_RGB_H_
#define INCLUDE_LIBYUV_SCALE_RGB_H_
#include "libyuv/basic_types.h"
#include "libyuv/scale.h" // For FilterMode
#ifdef __cplusplus
namespace libyuv {
extern "C" {
#endif
// RGB can be RAW, RGB24 or YUV24
// RGB scales 24 bit images by converting a row at a time to ARGB
// and using ARGB row functions to scale, then convert to RGB.
// TODO(fbarchard): Allow input/output formats to be specified.
LIBYUV_API
int RGBScale(const uint8_t* src_rgb,
int src_stride_rgb,
int src_width,
int src_height,
uint8_t* dst_rgb,
int dst_stride_rgb,
int dst_width,
int dst_height,
enum FilterMode filtering);
#ifdef __cplusplus
} // extern "C"
} // namespace libyuv
#endif
#endif // INCLUDE_LIBYUV_SCALE_UV_H_

File diff suppressed because it is too large Load Diff

@ -0,0 +1,51 @@
/*
* Copyright 2020 The LibYuv Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef INCLUDE_LIBYUV_SCALE_UV_H_
#define INCLUDE_LIBYUV_SCALE_UV_H_
#include "libyuv/basic_types.h"
#include "libyuv/scale.h" // For FilterMode
#ifdef __cplusplus
namespace libyuv {
extern "C" {
#endif
LIBYUV_API
int UVScale(const uint8_t* src_uv,
int src_stride_uv,
int src_width,
int src_height,
uint8_t* dst_uv,
int dst_stride_uv,
int dst_width,
int dst_height,
enum FilterMode filtering);
// Scale a 16 bit UV image.
// This function is currently incomplete, it can't handle all cases.
LIBYUV_API
int UVScale_16(const uint16_t* src_uv,
int src_stride_uv,
int src_width,
int src_height,
uint16_t* dst_uv,
int dst_stride_uv,
int dst_width,
int dst_height,
enum FilterMode filtering);
#ifdef __cplusplus
} // extern "C"
} // namespace libyuv
#endif
#endif // INCLUDE_LIBYUV_SCALE_UV_H_

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1622 #define LIBYUV_VERSION 1822
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_

@ -28,13 +28,14 @@ extern "C" {
// Needs to be a macro otherwise the OS X compiler complains when the kFormat* // Needs to be a macro otherwise the OS X compiler complains when the kFormat*
// constants are used in a switch. // constants are used in a switch.
#ifdef __cplusplus #ifdef __cplusplus
#define FOURCC(a, b, c, d) ( \ #define FOURCC(a, b, c, d) \
(static_cast<uint32>(a)) | (static_cast<uint32>(b) << 8) | \ ((static_cast<uint32_t>(a)) | (static_cast<uint32_t>(b) << 8) | \
(static_cast<uint32>(c) << 16) | (static_cast<uint32>(d) << 24)) (static_cast<uint32_t>(c) << 16) | /* NOLINT */ \
(static_cast<uint32_t>(d) << 24)) /* NOLINT */
#else #else
#define FOURCC(a, b, c, d) ( \ #define FOURCC(a, b, c, d) \
((uint32)(a)) | ((uint32)(b) << 8) | /* NOLINT */ \ (((uint32_t)(a)) | ((uint32_t)(b) << 8) | /* NOLINT */ \
((uint32)(c) << 16) | ((uint32)(d) << 24)) /* NOLINT */ ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24)) /* NOLINT */
#endif #endif
// Some pages discussing FourCC codes: // Some pages discussing FourCC codes:
@ -49,25 +50,29 @@ extern "C" {
// Secondary formats are converted in 2 steps. // Secondary formats are converted in 2 steps.
// Auxilliary formats call primary converters. // Auxilliary formats call primary converters.
enum FourCC { enum FourCC {
// 9 Primary YUV formats: 5 planar, 2 biplanar, 2 packed. // 10 Primary YUV formats: 5 planar, 2 biplanar, 2 packed.
FOURCC_I420 = FOURCC('I', '4', '2', '0'), FOURCC_I420 = FOURCC('I', '4', '2', '0'),
FOURCC_I422 = FOURCC('I', '4', '2', '2'), FOURCC_I422 = FOURCC('I', '4', '2', '2'),
FOURCC_I444 = FOURCC('I', '4', '4', '4'), FOURCC_I444 = FOURCC('I', '4', '4', '4'),
FOURCC_I411 = FOURCC('I', '4', '1', '1'),
FOURCC_I400 = FOURCC('I', '4', '0', '0'), FOURCC_I400 = FOURCC('I', '4', '0', '0'),
FOURCC_NV21 = FOURCC('N', 'V', '2', '1'), FOURCC_NV21 = FOURCC('N', 'V', '2', '1'),
FOURCC_NV12 = FOURCC('N', 'V', '1', '2'), FOURCC_NV12 = FOURCC('N', 'V', '1', '2'),
FOURCC_YUY2 = FOURCC('Y', 'U', 'Y', '2'), FOURCC_YUY2 = FOURCC('Y', 'U', 'Y', '2'),
FOURCC_UYVY = FOURCC('U', 'Y', 'V', 'Y'), FOURCC_UYVY = FOURCC('U', 'Y', 'V', 'Y'),
FOURCC_I010 = FOURCC('I', '0', '1', '0'), // bt.601 10 bit 420
FOURCC_I210 = FOURCC('I', '2', '1', '0'), // bt.601 10 bit 422
// 2 Secondary YUV formats: row biplanar. // 1 Secondary YUV format: row biplanar. deprecated.
FOURCC_M420 = FOURCC('M', '4', '2', '0'), FOURCC_M420 = FOURCC('M', '4', '2', '0'),
FOURCC_Q420 = FOURCC('Q', '4', '2', '0'), // deprecated.
// 9 Primary RGB formats: 4 32 bpp, 2 24 bpp, 3 16 bpp. // 13 Primary RGB formats: 4 32 bpp, 2 24 bpp, 3 16 bpp, 1 10 bpc 2 64 bpp
FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'), FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'),
FOURCC_BGRA = FOURCC('B', 'G', 'R', 'A'), FOURCC_BGRA = FOURCC('B', 'G', 'R', 'A'),
FOURCC_ABGR = FOURCC('A', 'B', 'G', 'R'), FOURCC_ABGR = FOURCC('A', 'B', 'G', 'R'),
FOURCC_AR30 = FOURCC('A', 'R', '3', '0'), // 10 bit per channel. 2101010.
FOURCC_AB30 = FOURCC('A', 'B', '3', '0'), // ABGR version of 10 bit
FOURCC_AR64 = FOURCC('A', 'R', '6', '4'), // 16 bit per channel.
FOURCC_AB64 = FOURCC('A', 'B', '6', '4'), // ABGR version of 16 bit
FOURCC_24BG = FOURCC('2', '4', 'B', 'G'), FOURCC_24BG = FOURCC('2', '4', 'B', 'G'),
FOURCC_RAW = FOURCC('r', 'a', 'w', ' '), FOURCC_RAW = FOURCC('r', 'a', 'w', ' '),
FOURCC_RGBA = FOURCC('R', 'G', 'B', 'A'), FOURCC_RGBA = FOURCC('R', 'G', 'B', 'A'),
@ -75,23 +80,39 @@ enum FourCC {
FOURCC_RGBO = FOURCC('R', 'G', 'B', 'O'), // argb1555 LE. FOURCC_RGBO = FOURCC('R', 'G', 'B', 'O'), // argb1555 LE.
FOURCC_R444 = FOURCC('R', '4', '4', '4'), // argb4444 LE. FOURCC_R444 = FOURCC('R', '4', '4', '4'), // argb4444 LE.
// 4 Secondary RGB formats: 4 Bayer Patterns. deprecated.
FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'),
FOURCC_BGGR = FOURCC('B', 'G', 'G', 'R'),
FOURCC_GRBG = FOURCC('G', 'R', 'B', 'G'),
FOURCC_GBRG = FOURCC('G', 'B', 'R', 'G'),
// 1 Primary Compressed YUV format. // 1 Primary Compressed YUV format.
FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'),
// 5 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. // 14 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias.
FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'), FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'),
FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'), FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'),
FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'), FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'),
FOURCC_YU12 = FOURCC('Y', 'U', '1', '2'), // Linux version of I420. FOURCC_YU12 = FOURCC('Y', 'U', '1', '2'), // Linux version of I420.
FOURCC_J420 = FOURCC('J', '4', '2', '0'), FOURCC_J420 =
FOURCC_J400 = FOURCC('J', '4', '0', '0'), // unofficial fourcc FOURCC('J', '4', '2', '0'), // jpeg (bt.601 full), unofficial fourcc
FOURCC_H420 = FOURCC('H', '4', '2', '0'), // unofficial fourcc FOURCC_J422 =
FOURCC('J', '4', '2', '2'), // jpeg (bt.601 full), unofficial fourcc
FOURCC_J444 =
FOURCC('J', '4', '4', '4'), // jpeg (bt.601 full), unofficial fourcc
FOURCC_J400 =
FOURCC('J', '4', '0', '0'), // jpeg (bt.601 full), unofficial fourcc
FOURCC_F420 = FOURCC('F', '4', '2', '0'), // bt.709 full, unofficial fourcc
FOURCC_F422 = FOURCC('F', '4', '2', '2'), // bt.709 full, unofficial fourcc
FOURCC_F444 = FOURCC('F', '4', '4', '4'), // bt.709 full, unofficial fourcc
FOURCC_H420 = FOURCC('H', '4', '2', '0'), // bt.709, unofficial fourcc
FOURCC_H422 = FOURCC('H', '4', '2', '2'), // bt.709, unofficial fourcc
FOURCC_H444 = FOURCC('H', '4', '4', '4'), // bt.709, unofficial fourcc
FOURCC_U420 = FOURCC('U', '4', '2', '0'), // bt.2020, unofficial fourcc
FOURCC_U422 = FOURCC('U', '4', '2', '2'), // bt.2020, unofficial fourcc
FOURCC_U444 = FOURCC('U', '4', '4', '4'), // bt.2020, unofficial fourcc
FOURCC_F010 = FOURCC('F', '0', '1', '0'), // bt.709 full range 10 bit 420
FOURCC_H010 = FOURCC('H', '0', '1', '0'), // bt.709 10 bit 420
FOURCC_U010 = FOURCC('U', '0', '1', '0'), // bt.2020 10 bit 420
FOURCC_F210 = FOURCC('F', '2', '1', '0'), // bt.709 full range 10 bit 422
FOURCC_H210 = FOURCC('H', '2', '1', '0'), // bt.709 10 bit 422
FOURCC_U210 = FOURCC('U', '2', '1', '0'), // bt.2020 10 bit 422
FOURCC_P010 = FOURCC('P', '0', '1', '0'),
FOURCC_P210 = FOURCC('P', '2', '1', '0'),
// 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc. // 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc.
FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420. FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420.
@ -112,7 +133,13 @@ enum FourCC {
FOURCC_L565 = FOURCC('L', '5', '6', '5'), // Alias for RGBP. FOURCC_L565 = FOURCC('L', '5', '6', '5'), // Alias for RGBP.
FOURCC_5551 = FOURCC('5', '5', '5', '1'), // Alias for RGBO. FOURCC_5551 = FOURCC('5', '5', '5', '1'), // Alias for RGBO.
// 1 Auxiliary compressed YUV format set aside for capturer. // deprecated formats. Not supported, but defined for backward compatibility.
FOURCC_I411 = FOURCC('I', '4', '1', '1'),
FOURCC_Q420 = FOURCC('Q', '4', '2', '0'),
FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'),
FOURCC_BGGR = FOURCC('B', 'G', 'G', 'R'),
FOURCC_GRBG = FOURCC('G', 'R', 'B', 'G'),
FOURCC_GBRG = FOURCC('G', 'B', 'R', 'G'),
FOURCC_H264 = FOURCC('H', '2', '6', '4'), FOURCC_H264 = FOURCC('H', '2', '6', '4'),
// Match any fourcc. // Match any fourcc.
@ -130,12 +157,16 @@ enum FourCCBpp {
FOURCC_BPP_NV12 = 12, FOURCC_BPP_NV12 = 12,
FOURCC_BPP_YUY2 = 16, FOURCC_BPP_YUY2 = 16,
FOURCC_BPP_UYVY = 16, FOURCC_BPP_UYVY = 16,
FOURCC_BPP_M420 = 12, FOURCC_BPP_M420 = 12, // deprecated
FOURCC_BPP_Q420 = 12, FOURCC_BPP_Q420 = 12,
FOURCC_BPP_ARGB = 32, FOURCC_BPP_ARGB = 32,
FOURCC_BPP_BGRA = 32, FOURCC_BPP_BGRA = 32,
FOURCC_BPP_ABGR = 32, FOURCC_BPP_ABGR = 32,
FOURCC_BPP_RGBA = 32, FOURCC_BPP_RGBA = 32,
FOURCC_BPP_AR30 = 32,
FOURCC_BPP_AB30 = 32,
FOURCC_BPP_AR64 = 64,
FOURCC_BPP_AB64 = 64,
FOURCC_BPP_24BG = 24, FOURCC_BPP_24BG = 24,
FOURCC_BPP_RAW = 24, FOURCC_BPP_RAW = 24,
FOURCC_BPP_RGBP = 16, FOURCC_BPP_RGBP = 16,
@ -152,6 +183,13 @@ enum FourCCBpp {
FOURCC_BPP_J420 = 12, FOURCC_BPP_J420 = 12,
FOURCC_BPP_J400 = 8, FOURCC_BPP_J400 = 8,
FOURCC_BPP_H420 = 12, FOURCC_BPP_H420 = 12,
FOURCC_BPP_H422 = 16,
FOURCC_BPP_I010 = 15,
FOURCC_BPP_I210 = 20,
FOURCC_BPP_H010 = 15,
FOURCC_BPP_H210 = 20,
FOURCC_BPP_P010 = 15,
FOURCC_BPP_P210 = 20,
FOURCC_BPP_MJPG = 0, // 0 means unknown. FOURCC_BPP_MJPG = 0, // 0 means unknown.
FOURCC_BPP_H264 = 0, FOURCC_BPP_H264 = 0,
FOURCC_BPP_IYUV = 12, FOURCC_BPP_IYUV = 12,
@ -174,7 +212,7 @@ enum FourCCBpp {
}; };
// Converts fourcc aliases into canonical ones. // Converts fourcc aliases into canonical ones.
LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc); LIBYUV_API uint32_t CanonicalFourCC(uint32_t fourcc);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

Binary file not shown.
Loading…
Cancel
Save