cog: use glib instead of stdint types

This commit is contained in:
David Schleef 2010-06-09 19:16:03 -07:00
parent 999e3982a1
commit 0e89bc8d54
3 changed files with 1489 additions and 1410 deletions

File diff suppressed because it is too large Load diff

View file

@ -10,42 +10,83 @@
extern "C" {
#endif
void cogorc_downsample_horiz_cosite_1tap (uint8_t * d1, const uint16_t * s1, int n);
void cogorc_downsample_horiz_cosite_3tap (uint8_t * d1, const uint16_t * s1, const uint16_t * s2, int n);
void cogorc_downsample_420_jpeg (uint8_t * d1, const uint16_t * s1, const uint16_t * s2, int n);
void cogorc_downsample_vert_halfsite_2tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
void cogorc_downsample_vert_cosite_3tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
void cogorc_downsample_vert_halfsite_4tap (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, const uint8_t * s4, int n);
void cogorc_upsample_horiz_cosite_1tap (uint8_t * d1, const uint8_t * s1, int n);
void cogorc_upsample_horiz_cosite (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
void cogorc_upsample_vert_avgub (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int n);
void orc_unpack_yuyv_y (uint8_t * d1, const uint16_t * s1, int n);
void orc_unpack_yuyv_u (uint8_t * d1, const uint32_t * s1, int n);
void orc_unpack_yuyv_v (uint8_t * d1, const uint32_t * s1, int n);
void orc_pack_yuyv (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
void orc_unpack_uyvy_y (uint8_t * d1, const uint16_t * s1, int n);
void orc_unpack_uyvy_u (uint8_t * d1, const uint32_t * s1, int n);
void orc_unpack_uyvy_v (uint8_t * d1, const uint32_t * s1, int n);
void orc_pack_uyvy (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int n);
void orc_addc_convert_u8_s16 (uint8_t * d1, const int16_t * s1, int n);
void orc_subc_convert_s16_u8 (int16_t * d1, const uint8_t * s1, int n);
void orc_splat_u8_ns (uint8_t * d1, int p1, int n);
void orc_splat_s16_ns (int16_t * d1, int p1, int n);
void orc_matrix2_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int p3, int n);
void orc_matrix2_11_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
void orc_matrix2_12_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
void orc_matrix3_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int n);
void orc_matrix3_100_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int n);
void orc_matrix3_100_offset_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int p5, int n);
void orc_matrix3_000_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int p2, int p3, int p4, int p5, int n);
void orc_pack_123x (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int n);
void orc_pack_x123 (uint32_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, int p1, int n);
void cogorc_combine2_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, int p1, int p2, int n);
void cogorc_combine4_u8 (uint8_t * d1, const uint8_t * s1, const uint8_t * s2, const uint8_t * s3, const uint8_t * s4, int p1, int p2, int p3, int p4, int n);
void cogorc_unpack_axyz_0 (uint8_t * d1, const uint32_t * s1, int n);
void cogorc_unpack_axyz_1 (uint8_t * d1, const uint32_t * s1, int n);
void cogorc_unpack_axyz_2 (uint8_t * d1, const uint32_t * s1, int n);
void cogorc_unpack_axyz_3 (uint8_t * d1, const uint32_t * s1, int n);
#ifndef _ORC_INTEGER_TYPEDEFS_
#define _ORC_INTEGER_TYPEDEFS_
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#include <stdint.h>
typedef int8_t orc_int8;
typedef int16_t orc_int16;
typedef int32_t orc_int32;
typedef int64_t orc_int64;
typedef uint8_t orc_uint8;
typedef uint16_t orc_uint16;
typedef uint32_t orc_uint32;
typedef uint64_t orc_uint64;
#elif defined(_MSC_VER)
typedef signed __int8 orc_int8;
typedef signed __int16 orc_int16;
typedef signed __int32 orc_int32;
typedef signed __int64 orc_int64;
typedef unsigned __int8 orc_uint8;
typedef unsigned __int16 orc_uint16;
typedef unsigned __int32 orc_uint32;
typedef unsigned __int64 orc_uint64;
#else
#include <limits.h>
typedef signed char orc_int8;
typedef short orc_int16;
typedef int orc_int32;
typedef unsigned char orc_uint8;
typedef unsigned short orc_uint16;
typedef unsigned int orc_uint32;
#if INT_MAX == LONG_MAX
typedef long long orc_int64;
typedef unsigned long long orc_uint64;
#else
typedef long orc_int64;
typedef unsigned long orc_uint64;
#endif
#endif
typedef union { orc_int32 i; float f; } orc_union32;
typedef union { orc_int64 i; double f; } orc_union64;
#endif
void cogorc_downsample_horiz_cosite_1tap (orc_uint8 * d1, const orc_uint16 * s1, int n);
void cogorc_downsample_horiz_cosite_3tap (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n);
void cogorc_downsample_420_jpeg (orc_uint8 * d1, const orc_uint16 * s1, const orc_uint16 * s2, int n);
void cogorc_downsample_vert_halfsite_2tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n);
void cogorc_downsample_vert_cosite_3tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n);
void cogorc_downsample_vert_halfsite_4tap (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, const orc_uint8 * s4, int n);
void cogorc_upsample_horiz_cosite_1tap (guint8 * d1, const orc_uint8 * s1, int n);
void cogorc_upsample_horiz_cosite (guint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n);
void cogorc_upsample_vert_avgub (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int n);
void orc_unpack_yuyv_y (orc_uint8 * d1, const orc_uint16 * s1, int n);
void orc_unpack_yuyv_u (orc_uint8 * d1, const orc_uint32 * s1, int n);
void orc_unpack_yuyv_v (orc_uint8 * d1, const orc_uint32 * s1, int n);
void orc_pack_yuyv (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n);
void orc_unpack_uyvy_y (orc_uint8 * d1, const orc_uint16 * s1, int n);
void orc_unpack_uyvy_u (orc_uint8 * d1, const orc_uint32 * s1, int n);
void orc_unpack_uyvy_v (orc_uint8 * d1, const orc_uint32 * s1, int n);
void orc_pack_uyvy (orc_uint32 * d1, const guint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int n);
void orc_addc_convert_u8_s16 (orc_uint8 * d1, const gint16 * s1, int n);
void orc_subc_convert_s16_u8 (gint16 * d1, const orc_uint8 * s1, int n);
void orc_splat_u8_ns (orc_uint8 * d1, int p1, int n);
void orc_splat_s16_ns (gint16 * d1, int p1, int n);
void orc_matrix2_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int p3, int n);
void orc_matrix2_11_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int n);
void orc_matrix2_12_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, int p1, int p2, int n);
void orc_matrix3_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int n);
void orc_matrix3_100_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int n);
void orc_matrix3_100_offset_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int p5, int n);
void orc_matrix3_000_u8 (guint8 * d1, const guint8 * s1, const guint8 * s2, const guint8 * s3, int p1, int p2, int p3, int p4, int p5, int n);
void orc_pack_123x (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int p1, int n);
void orc_pack_x123 (guint32 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, int p1, int n);
void cogorc_combine2_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, int p1, int p2, int n);
void cogorc_combine4_u8 (orc_uint8 * d1, const orc_uint8 * s1, const orc_uint8 * s2, const orc_uint8 * s3, const orc_uint8 * s4, int p1, int p2, int p3, int p4, int n);
void cogorc_unpack_axyz_0 (orc_uint8 * d1, const orc_uint32 * s1, int n);
void cogorc_unpack_axyz_1 (orc_uint8 * d1, const orc_uint32 * s1, int n);
void cogorc_unpack_axyz_2 (orc_uint8 * d1, const orc_uint32 * s1, int n);
void cogorc_unpack_axyz_3 (orc_uint8 * d1, const orc_uint32 * s1, int n);
#ifdef __cplusplus
}

View file

@ -109,7 +109,7 @@ convsuswb d1, t2
.function cogorc_upsample_horiz_cosite_1tap
.dest 2 d1 uint8_t
.dest 2 d1 guint8
.source 1 s1
.temp 1 t1
@ -118,7 +118,7 @@ mergebw d1, t1, t1
.function cogorc_upsample_horiz_cosite
.dest 2 d1 uint8_t
.dest 2 d1 guint8
.source 1 s1
.source 1 s2
.temp 1 t1
@ -166,7 +166,7 @@ select1wb d1, t1
.function orc_pack_yuyv
.dest 4 d1
.source 2 s1 uint8_t
.source 2 s1 guint8
.source 1 s2
.source 1 s3
.temp 1 t1
@ -210,7 +210,7 @@ select0wb d1, t1
.function orc_pack_uyvy
.dest 4 d1
.source 2 s1 uint8_t
.source 2 s1 guint8
.source 1 s2
.source 1 s3
.temp 1 t1
@ -229,7 +229,7 @@ mergewl d1, t3, t4
.function orc_addc_convert_u8_s16
.dest 1 d1
.source 2 s1 int16_t
.source 2 s1 gint16
.temp 2 t1
addw t1, s1, 128
@ -237,7 +237,7 @@ convsuswb d1, t1
.function orc_subc_convert_s16_u8
.dest 2 d1 int16_t
.dest 2 d1 gint16
.source 1 s1
.temp 2 t1
@ -253,16 +253,16 @@ copyb d1, p1
.function orc_splat_s16_ns
.dest 2 d1 int16_t
.dest 2 d1 gint16
.param 2 p1
copyw d1, p1
.function orc_matrix2_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.param 2 p1
.param 2 p2
.param 2 p3
@ -280,9 +280,9 @@ convsuswb d1, t1
.function orc_matrix2_11_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.param 2 p1
.param 2 p2
.temp 2 t1
@ -305,9 +305,9 @@ convsuswb d1, t3
.function orc_matrix2_12_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.param 2 p1
.param 2 p2
.temp 2 t1
@ -331,10 +331,10 @@ convsuswb d1, t3
.function orc_matrix3_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.source 1 s3 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.source 1 s3 guint8
.param 2 p1
.param 2 p2
.param 2 p3
@ -356,10 +356,10 @@ convsuswb d1, t1
.function orc_matrix3_100_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.source 1 s3 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.source 1 s3 guint8
.param 2 p1
.param 2 p2
.param 2 p3
@ -386,10 +386,10 @@ convsuswb d1, t3
.function orc_matrix3_100_offset_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.source 1 s3 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.source 1 s3 guint8
.param 2 p1
.param 2 p2
.param 2 p3
@ -419,10 +419,10 @@ convsuswb d1, t1
.function orc_matrix3_000_u8
.dest 1 d1 uint8_t
.source 1 s1 uint8_t
.source 1 s2 uint8_t
.source 1 s3 uint8_t
.dest 1 d1 guint8
.source 1 s1 guint8
.source 1 s2 guint8
.source 1 s3 guint8
.param 2 p1
.param 2 p2
.param 2 p3
@ -450,7 +450,7 @@ convwb d1, t1
.function orc_pack_123x
.dest 4 d1 uint32_t
.dest 4 d1 guint32
.source 1 s1
.source 1 s2
.source 1 s3
@ -464,7 +464,7 @@ mergewl d1, t1, t2
.function orc_pack_x123
.dest 4 d1 uint32_t
.dest 4 d1 guint32
.source 1 s1
.source 1 s2
.source 1 s3