From 7e389884a14285de2085052c819abee4e53139af Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 22 Jan 2018 18:35:52 -0800 Subject: Switch to C99 types Append _t to all sized types. uint64 becomes uint64_t etc Bug: libyuv:774 Test: try bots build on all platforms Change-Id: Ide273d7f8012313d6610415d514a956d6f3a8cac Reviewed-on: https://chromium-review.googlesource.com/879922 Reviewed-by: Miguel Casas --- source/convert_from.cc | 310 ++++++++++++++++++++++++------------------------- 1 file changed, 155 insertions(+), 155 deletions(-) (limited to 'source/convert_from.cc') diff --git a/source/convert_from.cc b/source/convert_from.cc index 484c13c9..0a38a27c 100644 --- a/source/convert_from.cc +++ b/source/convert_from.cc @@ -30,17 +30,17 @@ static __inline int Abs(int v) { } // I420 To any I4xx YUV format with mirroring. -static int I420ToI4xx(const uint8* src_y, +static int I420ToI4xx(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, - uint8* dst_u, + uint8_t* dst_u, int dst_stride_u, - uint8* dst_v, + uint8_t* dst_v, int dst_stride_v, int src_y_width, int src_y_height, @@ -67,17 +67,17 @@ static int I420ToI4xx(const uint8* src_y, // Convert 8 bit YUV to 10 bit. LIBYUV_API -int I420ToI010(const uint8* src_y, +int I420ToI010(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint16* dst_y, + uint16_t* dst_y, int dst_stride_y, - uint16* dst_u, + uint16_t* dst_u, int dst_stride_u, - uint16* dst_v, + uint16_t* dst_v, int dst_stride_v, int width, int height) { @@ -112,17 +112,17 @@ int I420ToI010(const uint8* src_y, // 420 chroma is 1/2 width, 1/2 height // 422 chroma is 1/2 width, 1x height LIBYUV_API -int I420ToI422(const uint8* src_y, +int I420ToI422(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, - uint8* dst_u, + uint8_t* dst_u, int dst_stride_u, - uint8* dst_v, + uint8_t* dst_v, int dst_stride_v, int width, int height) { @@ -137,17 +137,17 @@ int I420ToI422(const uint8* src_y, // 420 chroma is 1/2 width, 1/2 height // 444 chroma is 1x width, 1x height LIBYUV_API -int I420ToI444(const uint8* src_y, +int I420ToI444(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, - uint8* dst_u, + uint8_t* dst_u, int dst_stride_u, - uint8* dst_v, + uint8_t* dst_v, int dst_stride_v, int width, int height) { @@ -161,9 +161,9 @@ int I420ToI444(const uint8* src_y, // Copy to I400. Source can be I420,422,444,400,NV12,NV21 LIBYUV_API -int I400Copy(const uint8* src_y, +int I400Copy(const uint8_t* src_y, int src_stride_y, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, int width, int height) { @@ -181,19 +181,19 @@ int I400Copy(const uint8* src_y, } LIBYUV_API -int I422ToYUY2(const uint8* src_y, +int I422ToYUY2(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_yuy2, + uint8_t* dst_yuy2, int dst_stride_yuy2, int width, int height) { int y; - void (*I422ToYUY2Row)(const uint8* src_y, const uint8* src_u, - const uint8* src_v, uint8* dst_yuy2, int width) = + void (*I422ToYUY2Row)(const uint8_t* src_y, const uint8_t* src_u, + const uint8_t* src_v, uint8_t* dst_yuy2, int width) = I422ToYUY2Row_C; if (!src_y || !src_u || !src_v || !dst_yuy2 || width <= 0 || height == 0) { return -1; @@ -239,19 +239,19 @@ int I422ToYUY2(const uint8* src_y, } LIBYUV_API -int I420ToYUY2(const uint8* src_y, +int I420ToYUY2(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_yuy2, + uint8_t* dst_yuy2, int dst_stride_yuy2, int width, int height) { int y; - void (*I422ToYUY2Row)(const uint8* src_y, const uint8* src_u, - const uint8* src_v, uint8* dst_yuy2, int width) = + void (*I422ToYUY2Row)(const uint8_t* src_y, const uint8_t* src_u, + const uint8_t* src_v, uint8_t* dst_yuy2, int width) = I422ToYUY2Row_C; if (!src_y || !src_u || !src_v || !dst_yuy2 || width <= 0 || height == 0) { return -1; @@ -303,19 +303,19 @@ int I420ToYUY2(const uint8* src_y, } LIBYUV_API -int I422ToUYVY(const uint8* src_y, +int I422ToUYVY(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_uyvy, + uint8_t* dst_uyvy, int dst_stride_uyvy, int width, int height) { int y; - void (*I422ToUYVYRow)(const uint8* src_y, const uint8* src_u, - const uint8* src_v, uint8* dst_uyvy, int width) = + void (*I422ToUYVYRow)(const uint8_t* src_y, const uint8_t* src_u, + const uint8_t* src_v, uint8_t* dst_uyvy, int width) = I422ToUYVYRow_C; if (!src_y || !src_u || !src_v || !dst_uyvy || width <= 0 || height == 0) { return -1; @@ -369,19 +369,19 @@ int I422ToUYVY(const uint8* src_y, } LIBYUV_API -int I420ToUYVY(const uint8* src_y, +int I420ToUYVY(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_uyvy, + uint8_t* dst_uyvy, int dst_stride_uyvy, int width, int height) { int y; - void (*I422ToUYVYRow)(const uint8* src_y, const uint8* src_u, - const uint8* src_v, uint8* dst_uyvy, int width) = + void (*I422ToUYVYRow)(const uint8_t* src_y, const uint8_t* src_u, + const uint8_t* src_v, uint8_t* dst_uyvy, int width) = I422ToUYVYRow_C; if (!src_y || !src_u || !src_v || !dst_uyvy || width <= 0 || height == 0) { return -1; @@ -434,15 +434,15 @@ int I420ToUYVY(const uint8* src_y, // TODO(fbarchard): test negative height for invert. LIBYUV_API -int I420ToNV12(const uint8* src_y, +int I420ToNV12(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, - uint8* dst_uv, + uint8_t* dst_uv, int dst_stride_uv, int width, int height) { @@ -461,15 +461,15 @@ int I420ToNV12(const uint8* src_y, } LIBYUV_API -int I420ToNV21(const uint8* src_y, +int I420ToNV21(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_y, + uint8_t* dst_y, int dst_stride_y, - uint8* dst_vu, + uint8_t* dst_vu, int dst_stride_vu, int width, int height) { @@ -479,20 +479,20 @@ int I420ToNV21(const uint8* src_y, } // Convert I422 to RGBA with matrix -static int I420ToRGBAMatrix(const uint8* src_y, +static int I420ToRGBAMatrix(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgba, + uint8_t* dst_rgba, int dst_stride_rgba, const struct YuvConstants* yuvconstants, int width, int height) { int y; - void (*I422ToRGBARow)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToRGBARow)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToRGBARow_C; if (!src_y || !src_u || !src_v || !dst_rgba || width <= 0 || height == 0) { @@ -551,13 +551,13 @@ static int I420ToRGBAMatrix(const uint8* src_y, // Convert I420 to RGBA. LIBYUV_API -int I420ToRGBA(const uint8* src_y, +int I420ToRGBA(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgba, + uint8_t* dst_rgba, int dst_stride_rgba, int width, int height) { @@ -568,13 +568,13 @@ int I420ToRGBA(const uint8* src_y, // Convert I420 to BGRA. LIBYUV_API -int I420ToBGRA(const uint8* src_y, +int I420ToBGRA(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_bgra, + uint8_t* dst_bgra, int dst_stride_bgra, int width, int height) { @@ -586,20 +586,20 @@ int I420ToBGRA(const uint8* src_y, } // Convert I420 to RGB24 with matrix -static int I420ToRGB24Matrix(const uint8* src_y, +static int I420ToRGB24Matrix(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb24, + uint8_t* dst_rgb24, int dst_stride_rgb24, const struct YuvConstants* yuvconstants, int width, int height) { int y; - void (*I422ToRGB24Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToRGB24Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToRGB24Row_C; if (!src_y || !src_u || !src_v || !dst_rgb24 || width <= 0 || height == 0) { @@ -658,13 +658,13 @@ static int I420ToRGB24Matrix(const uint8* src_y, // Convert I420 to RGB24. LIBYUV_API -int I420ToRGB24(const uint8* src_y, +int I420ToRGB24(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb24, + uint8_t* dst_rgb24, int dst_stride_rgb24, int width, int height) { @@ -675,13 +675,13 @@ int I420ToRGB24(const uint8* src_y, // Convert I420 to RAW. LIBYUV_API -int I420ToRAW(const uint8* src_y, +int I420ToRAW(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_raw, + uint8_t* dst_raw, int dst_stride_raw, int width, int height) { @@ -694,13 +694,13 @@ int I420ToRAW(const uint8* src_y, // Convert H420 to RGB24. LIBYUV_API -int H420ToRGB24(const uint8* src_y, +int H420ToRGB24(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb24, + uint8_t* dst_rgb24, int dst_stride_rgb24, int width, int height) { @@ -711,13 +711,13 @@ int H420ToRGB24(const uint8* src_y, // Convert H420 to RAW. LIBYUV_API -int H420ToRAW(const uint8* src_y, +int H420ToRAW(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_raw, + uint8_t* dst_raw, int dst_stride_raw, int width, int height) { @@ -730,19 +730,19 @@ int H420ToRAW(const uint8* src_y, // Convert I420 to ARGB1555. LIBYUV_API -int I420ToARGB1555(const uint8* src_y, +int I420ToARGB1555(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_argb1555, + uint8_t* dst_argb1555, int dst_stride_argb1555, int width, int height) { int y; - void (*I422ToARGB1555Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToARGB1555Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToARGB1555Row_C; if (!src_y || !src_u || !src_v || !dst_argb1555 || width <= 0 || @@ -803,19 +803,19 @@ int I420ToARGB1555(const uint8* src_y, // Convert I420 to ARGB4444. LIBYUV_API -int I420ToARGB4444(const uint8* src_y, +int I420ToARGB4444(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_argb4444, + uint8_t* dst_argb4444, int dst_stride_argb4444, int width, int height) { int y; - void (*I422ToARGB4444Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToARGB4444Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToARGB4444Row_C; if (!src_y || !src_u || !src_v || !dst_argb4444 || width <= 0 || @@ -876,19 +876,19 @@ int I420ToARGB4444(const uint8* src_y, // Convert I420 to RGB565. LIBYUV_API -int I420ToRGB565(const uint8* src_y, +int I420ToRGB565(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb565, + uint8_t* dst_rgb565, int dst_stride_rgb565, int width, int height) { int y; - void (*I422ToRGB565Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToRGB565Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToRGB565Row_C; if (!src_y || !src_u || !src_v || !dst_rgb565 || width <= 0 || height == 0) { @@ -947,19 +947,19 @@ int I420ToRGB565(const uint8* src_y, // Convert I422 to RGB565. LIBYUV_API -int I422ToRGB565(const uint8* src_y, +int I422ToRGB565(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb565, + uint8_t* dst_rgb565, int dst_stride_rgb565, int width, int height) { int y; - void (*I422ToRGB565Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToRGB565Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToRGB565Row_C; if (!src_y || !src_u || !src_v || !dst_rgb565 || width <= 0 || height == 0) { @@ -1015,30 +1015,30 @@ int I422ToRGB565(const uint8* src_y, } // Ordered 8x8 dither for 888 to 565. Values from 0 to 7. -static const uint8 kDither565_4x4[16] = { +static const uint8_t kDither565_4x4[16] = { 0, 4, 1, 5, 6, 2, 7, 3, 1, 5, 0, 4, 7, 3, 6, 2, }; // Convert I420 to RGB565 with dithering. LIBYUV_API -int I420ToRGB565Dither(const uint8* src_y, +int I420ToRGB565Dither(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_rgb565, + uint8_t* dst_rgb565, int dst_stride_rgb565, - const uint8* dither4x4, + const uint8_t* dither4x4, int width, int height) { int y; - void (*I422ToARGBRow)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToARGBRow)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToARGBRow_C; - void (*ARGBToRGB565DitherRow)(const uint8* src_argb, uint8* dst_rgb, - const uint32 dither4, int width) = + void (*ARGBToRGB565DitherRow)(const uint8_t* src_argb, uint8_t* dst_rgb, + const uint32_t dither4, int width) = ARGBToRGB565DitherRow_C; if (!src_y || !src_u || !src_v || !dst_rgb565 || width <= 0 || height == 0) { return -1; @@ -1122,7 +1122,7 @@ int I420ToRGB565Dither(const uint8* src_y, for (y = 0; y < height; ++y) { I422ToARGBRow(src_y, src_u, src_v, row_argb, &kYuvI601Constants, width); ARGBToRGB565DitherRow(row_argb, dst_rgb565, - *(uint32*)(dither4x4 + ((y & 3) << 2)), // NOLINT + *(uint32_t*)(dither4x4 + ((y & 3) << 2)), // NOLINT width); // NOLINT dst_rgb565 += dst_stride_rgb565; src_y += src_stride_y; @@ -1137,20 +1137,20 @@ int I420ToRGB565Dither(const uint8* src_y, } // Convert I420 to AR30 with matrix -static int I420ToAR30Matrix(const uint8* src_y, +static int I420ToAR30Matrix(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_ar30, + uint8_t* dst_ar30, int dst_stride_ar30, const struct YuvConstants* yuvconstants, int width, int height) { int y; - void (*I422ToAR30Row)(const uint8* y_buf, const uint8* u_buf, - const uint8* v_buf, uint8* rgb_buf, + void (*I422ToAR30Row)(const uint8_t* y_buf, const uint8_t* u_buf, + const uint8_t* v_buf, uint8_t* rgb_buf, const struct YuvConstants* yuvconstants, int width) = I422ToAR30Row_C; @@ -1195,13 +1195,13 @@ static int I420ToAR30Matrix(const uint8* src_y, // Convert I420 to AR30. LIBYUV_API -int I420ToAR30(const uint8* src_y, +int I420ToAR30(const uint8_t* src_y, int src_stride_y, - const uint8* src_u, + const uint8_t* src_u, int src_stride_u, - const uint8* src_v, + const uint8_t* src_v, int src_stride_v, - uint8* dst_ar30, + uint8_t* dst_ar30, int dst_stride_ar30, int width, int height) { @@ -1212,18 +1212,18 @@ int I420ToAR30(const uint8* src_y, // Convert I420 to specified format LIBYUV_API -int ConvertFromI420(const uint8* y, +int ConvertFromI420(const uint8_t* y, int y_stride, - const uint8* u, + const uint8_t* u, int u_stride, - const uint8* v, + const uint8_t* v, int v_stride, - uint8* dst_sample, + uint8_t* dst_sample, int dst_sample_stride, int width, int height, - uint32 fourcc) { - uint32 format = CanonicalFourCC(fourcc); + uint32_t fourcc) { + uint32_t format = CanonicalFourCC(fourcc); int r = 0; if (!y || !u || !v || !dst_sample || width <= 0 || height == 0) { return -1; @@ -1296,7 +1296,7 @@ int ConvertFromI420(const uint8* y, height); break; case FOURCC_NV12: { - uint8* dst_uv = dst_sample + width * height; + uint8_t* dst_uv = dst_sample + width * height; r = I420ToNV12(y, y_stride, u, u_stride, v, v_stride, dst_sample, dst_sample_stride ? dst_sample_stride : width, dst_uv, dst_sample_stride ? dst_sample_stride : width, width, @@ -1304,7 +1304,7 @@ int ConvertFromI420(const uint8* y, break; } case FOURCC_NV21: { - uint8* dst_vu = dst_sample + width * height; + uint8_t* dst_vu = dst_sample + width * height; r = I420ToNV21(y, y_stride, u, u_stride, v, v_stride, dst_sample, dst_sample_stride ? dst_sample_stride : width, dst_vu, dst_sample_stride ? dst_sample_stride : width, width, @@ -1318,8 +1318,8 @@ int ConvertFromI420(const uint8* y, dst_sample_stride = dst_sample_stride ? dst_sample_stride : width; int halfstride = (dst_sample_stride + 1) / 2; int halfheight = (height + 1) / 2; - uint8* dst_u; - uint8* dst_v; + uint8_t* dst_u; + uint8_t* dst_v; if (format == FOURCC_YV12) { dst_v = dst_sample + dst_sample_stride * height; dst_u = dst_v + halfstride * halfheight; @@ -1336,8 +1336,8 @@ int ConvertFromI420(const uint8* y, case FOURCC_YV16: { dst_sample_stride = dst_sample_stride ? dst_sample_stride : width; int halfstride = (dst_sample_stride + 1) / 2; - uint8* dst_u; - uint8* dst_v; + uint8_t* dst_u; + uint8_t* dst_v; if (format == FOURCC_YV16) { dst_v = dst_sample + dst_sample_stride * height; dst_u = dst_v + halfstride * height; @@ -1353,8 +1353,8 @@ int ConvertFromI420(const uint8* y, case FOURCC_I444: case FOURCC_YV24: { dst_sample_stride = dst_sample_stride ? dst_sample_stride : width; - uint8* dst_u; - uint8* dst_v; + uint8_t* dst_u; + uint8_t* dst_v; if (format == FOURCC_YV24) { dst_v = dst_sample + dst_sample_stride * height; dst_u = dst_v + dst_sample_stride * height; -- cgit v1.2.3