Skip to content

L
libyuv
Commit 8798e040 authored by fbarchard@google.com's avatar fbarchard@google.com
Browse files
Options

Port conversion functions to c. 

BUG=303
TESTED=cl /c /TC /Iinclude source\convert_from.cc source\convert_argb.cc source\convert_from_argb.cc
R=harryjin@google.com

Review URL: https://webrtc-codereview.appspot.com/17909004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1030 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent a2fbf9de
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
README.chromium
View file @ 8798e040
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1029 Version: 1030
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
include/libyuv/version.h
View file @ 8798e040
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1029 #define LIBYUV_VERSION 1030
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
source/convert.cc
View file @ 8798e040
...@@ -519,9 +519,9 @@ int YUY2ToI420(const uint8* src_yuy2, int src_stride_yuy2, ...@@ -519,9 +519,9 @@ int YUY2ToI420(const uint8* src_yuy2, int src_stride_yuy2,
int width, int height) { int width, int height) {
int y; int y;
void (*YUY2ToUVRow)(const uint8* src_yuy2, int src_stride_yuy2, void (*YUY2ToUVRow)(const uint8* src_yuy2, int src_stride_yuy2,
uint8* dst_u, uint8* dst_v, int pix) = YUY2ToUVRow_C; uint8* dst_u, uint8* dst_v, int pix) = YUY2ToUVRow_C;
void (*YUY2ToYRow)(const uint8* src_yuy2, void (*YUY2ToYRow)(const uint8* src_yuy2,
uint8* dst_y, int pix) = YUY2ToYRow_C; uint8* dst_y, int pix) = YUY2ToYRow_C;
// Negative height means invert the image. // Negative height means invert the image.
if (height < 0) { if (height < 0) {
height = -height; height = -height;
...@@ -592,9 +592,9 @@ int UYVYToI420(const uint8* src_uyvy, int src_stride_uyvy, ...@@ -592,9 +592,9 @@ int UYVYToI420(const uint8* src_uyvy, int src_stride_uyvy,
int width, int height) { int width, int height) {
int y; int y;
void (*UYVYToUVRow)(const uint8* src_uyvy, int src_stride_uyvy, void (*UYVYToUVRow)(const uint8* src_uyvy, int src_stride_uyvy,
uint8* dst_u, uint8* dst_v, int pix) = UYVYToUVRow_C; uint8* dst_u, uint8* dst_v, int pix) = UYVYToUVRow_C;
void (*UYVYToYRow)(const uint8* src_uyvy, void (*UYVYToYRow)(const uint8* src_uyvy,
uint8* dst_y, int pix) = UYVYToYRow_C; uint8* dst_y, int pix) = UYVYToYRow_C;
// Negative height means invert the image. // Negative height means invert the image.
if (height < 0) { if (height < 0) {
height = -height; height = -height;
...@@ -665,7 +665,7 @@ int ARGBToI420(const uint8* src_argb, int src_stride_argb, ...@@ -665,7 +665,7 @@ int ARGBToI420(const uint8* src_argb, int src_stride_argb,
int width, int height) { int width, int height) {
int y; int y;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
if (!src_argb || if (!src_argb ||
...@@ -745,7 +745,7 @@ int BGRAToI420(const uint8* src_bgra, int src_stride_bgra, ...@@ -745,7 +745,7 @@ int BGRAToI420(const uint8* src_bgra, int src_stride_bgra,
int width, int height) { int width, int height) {
int y; int y;
void (*BGRAToUVRow)(const uint8* src_bgra0, int src_stride_bgra, void (*BGRAToUVRow)(const uint8* src_bgra0, int src_stride_bgra,
uint8* dst_u, uint8* dst_v, int width) = BGRAToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = BGRAToUVRow_C;
void (*BGRAToYRow)(const uint8* src_bgra, uint8* dst_y, int pix) = void (*BGRAToYRow)(const uint8* src_bgra, uint8* dst_y, int pix) =
BGRAToYRow_C; BGRAToYRow_C;
if (!src_bgra || if (!src_bgra ||
...@@ -814,7 +814,7 @@ int ABGRToI420(const uint8* src_abgr, int src_stride_abgr, ...@@ -814,7 +814,7 @@ int ABGRToI420(const uint8* src_abgr, int src_stride_abgr,
int width, int height) { int width, int height) {
int y; int y;
void (*ABGRToUVRow)(const uint8* src_abgr0, int src_stride_abgr, void (*ABGRToUVRow)(const uint8* src_abgr0, int src_stride_abgr,
uint8* dst_u, uint8* dst_v, int width) = ABGRToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ABGRToUVRow_C;
void (*ABGRToYRow)(const uint8* src_abgr, uint8* dst_y, int pix) = void (*ABGRToYRow)(const uint8* src_abgr, uint8* dst_y, int pix) =
ABGRToYRow_C; ABGRToYRow_C;
if (!src_abgr || if (!src_abgr ||
...@@ -883,7 +883,7 @@ int RGBAToI420(const uint8* src_rgba, int src_stride_rgba, ...@@ -883,7 +883,7 @@ int RGBAToI420(const uint8* src_rgba, int src_stride_rgba,
int width, int height) { int width, int height) {
int y; int y;
void (*RGBAToUVRow)(const uint8* src_rgba0, int src_stride_rgba, void (*RGBAToUVRow)(const uint8* src_rgba0, int src_stride_rgba,
uint8* dst_u, uint8* dst_v, int width) = RGBAToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = RGBAToUVRow_C;
void (*RGBAToYRow)(const uint8* src_rgba, uint8* dst_y, int pix) = void (*RGBAToYRow)(const uint8* src_rgba, uint8* dst_y, int pix) =
RGBAToYRow_C; RGBAToYRow_C;
if (!src_rgba || if (!src_rgba ||
...@@ -960,7 +960,7 @@ int RGB24ToI420(const uint8* src_rgb24, int src_stride_rgb24, ...@@ -960,7 +960,7 @@ int RGB24ToI420(const uint8* src_rgb24, int src_stride_rgb24,
void (*RGB24ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) = void (*RGB24ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) =
RGB24ToARGBRow_C; RGB24ToARGBRow_C;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
// Allocate 2 rows of ARGB. // Allocate 2 rows of ARGB.
...@@ -1072,7 +1072,7 @@ int RAWToI420(const uint8* src_raw, int src_stride_raw, ...@@ -1072,7 +1072,7 @@ int RAWToI420(const uint8* src_raw, int src_stride_raw,
void (*RAWToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) = void (*RAWToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) =
RAWToARGBRow_C; RAWToARGBRow_C;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
// Allocate 2 rows of ARGB. // Allocate 2 rows of ARGB.
...@@ -1184,7 +1184,7 @@ int RGB565ToI420(const uint8* src_rgb565, int src_stride_rgb565, ...@@ -1184,7 +1184,7 @@ int RGB565ToI420(const uint8* src_rgb565, int src_stride_rgb565,
void (*RGB565ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) = void (*RGB565ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) =
RGB565ToARGBRow_C; RGB565ToARGBRow_C;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
// Allocate 2 rows of ARGB. // Allocate 2 rows of ARGB.
...@@ -1282,10 +1282,10 @@ int RGB565ToI420(const uint8* src_rgb565, int src_stride_rgb565, ...@@ -1282,10 +1282,10 @@ int RGB565ToI420(const uint8* src_rgb565, int src_stride_rgb565,
// Convert ARGB1555 to I420. // Convert ARGB1555 to I420.
LIBYUV_API LIBYUV_API
int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555, int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555,
uint8* dst_y, int dst_stride_y, uint8* dst_y, int dst_stride_y,
uint8* dst_u, int dst_stride_u, uint8* dst_u, int dst_stride_u,
uint8* dst_v, int dst_stride_v, uint8* dst_v, int dst_stride_v,
int width, int height) { int width, int height) {
int y; int y;
#if defined(HAS_ARGB1555TOYROW_NEON) #if defined(HAS_ARGB1555TOYROW_NEON)
void (*ARGB1555ToUVRow)(const uint8* src_argb1555, int src_stride_argb1555, void (*ARGB1555ToUVRow)(const uint8* src_argb1555, int src_stride_argb1555,
...@@ -1296,7 +1296,7 @@ int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555, ...@@ -1296,7 +1296,7 @@ int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555,
void (*ARGB1555ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) = void (*ARGB1555ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) =
ARGB1555ToARGBRow_C; ARGB1555ToARGBRow_C;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
// Allocate 2 rows of ARGB. // Allocate 2 rows of ARGB.
...@@ -1396,10 +1396,10 @@ int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555, ...@@ -1396,10 +1396,10 @@ int ARGB1555ToI420(const uint8* src_argb1555, int src_stride_argb1555,
// Convert ARGB4444 to I420. // Convert ARGB4444 to I420.
LIBYUV_API LIBYUV_API
int ARGB4444ToI420(const uint8* src_argb4444, int src_stride_argb4444, int ARGB4444ToI420(const uint8* src_argb4444, int src_stride_argb4444,
uint8* dst_y, int dst_stride_y, uint8* dst_y, int dst_stride_y,
uint8* dst_u, int dst_stride_u, uint8* dst_u, int dst_stride_u,
uint8* dst_v, int dst_stride_v, uint8* dst_v, int dst_stride_v,
int width, int height) { int width, int height) {
int y; int y;
#if defined(HAS_ARGB4444TOYROW_NEON) #if defined(HAS_ARGB4444TOYROW_NEON)
void (*ARGB4444ToUVRow)(const uint8* src_argb4444, int src_stride_argb4444, void (*ARGB4444ToUVRow)(const uint8* src_argb4444, int src_stride_argb4444,
...@@ -1410,7 +1410,7 @@ int ARGB4444ToI420(const uint8* src_argb4444, int src_stride_argb4444, ...@@ -1410,7 +1410,7 @@ int ARGB4444ToI420(const uint8* src_argb4444, int src_stride_argb4444,
void (*ARGB4444ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) = void (*ARGB4444ToARGBRow)(const uint8* src_rgb, uint8* dst_argb, int pix) =
ARGB4444ToARGBRow_C; ARGB4444ToARGBRow_C;
void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb, void (*ARGBToUVRow)(const uint8* src_argb0, int src_stride_argb,
uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C; uint8* dst_u, uint8* dst_v, int width) = ARGBToUVRow_C;
void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) = void (*ARGBToYRow)(const uint8* src_argb, uint8* dst_y, int pix) =
ARGBToYRow_C; ARGBToYRow_C;
// Allocate 2 rows of ARGB. // Allocate 2 rows of ARGB.
......
source/convert_argb.cc
View file @ 8798e040
This diff is collapsed.
source/convert_from.cc
View file @ 8798e040
This diff is collapsed.
source/convert_from_argb.cc
View file @ 8798e040
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment