From 2d078e42a8e85414776aa510d05ef2c35487eeae Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 29 May 2012 15:20:08 +0200 Subject: [PATCH] video: rename orc function names --- gst-libs/gst/video/video.c | 62 +++++++++++++++++------------------- gst-libs/gst/video/videoblendorc.orc | 58 ++++++++++++++++----------------- 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c index 57a51b6..d82a236 100644 --- a/gst-libs/gst/video/video.c +++ b/gst-libs/gst/video/video.c @@ -80,7 +80,7 @@ unpack_planar_420 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_I420 (dest, + orc_unpack_I420 (dest, GET_Y_LINE (y), GET_U_LINE (y >> 1), GET_V_LINE (y >> 1), width); } @@ -90,7 +90,7 @@ pack_planar_420 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_I420 (GET_Y_LINE (y), + orc_pack_I420 (GET_Y_LINE (y), GET_U_LINE (y >> 1), GET_V_LINE (y >> 1), src, width / 2); } @@ -100,7 +100,7 @@ unpack_YUY2 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_YUY2 (dest, GET_LINE (y), width / 2); + orc_unpack_YUY2 (dest, GET_LINE (y), width / 2); } static void @@ -109,7 +109,7 @@ pack_YUY2 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_YUY2 (GET_LINE (y), src, width / 2); + orc_pack_YUY2 (GET_LINE (y), src, width / 2); } #define PACK_UYVY GST_VIDEO_FORMAT_AYUV, unpack_UYVY, pack_UYVY @@ -118,7 +118,7 @@ unpack_UYVY (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_UYVY (dest, GET_LINE (y), width / 2); + orc_unpack_UYVY (dest, GET_LINE (y), width / 2); } static void @@ -127,7 +127,7 @@ pack_UYVY (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_UYVY (GET_LINE (y), src, width / 2); + orc_pack_UYVY (GET_LINE (y), src, width / 2); } #define PACK_YVYU GST_VIDEO_FORMAT_AYUV, unpack_YVYU, pack_YVYU @@ -136,7 +136,7 @@ unpack_YVYU (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_YVYU (dest, GET_LINE (y), width / 2); + orc_unpack_YVYU (dest, GET_LINE (y), width / 2); } static void @@ -145,7 +145,7 @@ pack_YVYU (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_YVYU (GET_LINE (y), src, width / 2); + orc_pack_YVYU (GET_LINE (y), src, width / 2); } #define PACK_v308 GST_VIDEO_FORMAT_AYUV, unpack_v308, pack_v308 @@ -355,7 +355,7 @@ unpack_Y41B (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_YUV9 (dest, + orc_unpack_YUV9 (dest, GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), width / 2); } @@ -410,7 +410,7 @@ unpack_Y42B (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_Y42B (dest, + orc_unpack_Y42B (dest, GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), width / 2); } @@ -420,7 +420,7 @@ pack_Y42B (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_Y42B (GET_Y_LINE (y), + orc_pack_Y42B (GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), src, width / 2); } @@ -430,8 +430,7 @@ unpack_Y444 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_Y444 (dest, - GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), width); + orc_unpack_Y444 (dest, GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), width); } static void @@ -440,8 +439,7 @@ pack_Y444 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_Y444 (GET_Y_LINE (y), - GET_U_LINE (y), GET_V_LINE (y), src, width); + orc_pack_Y444 (GET_Y_LINE (y), GET_U_LINE (y), GET_V_LINE (y), src, width); } #define PACK_Y800 GST_VIDEO_FORMAT_AYUV, unpack_Y800, pack_Y800 @@ -450,7 +448,7 @@ unpack_Y800 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_Y800 (dest, GET_LINE (y), width); + orc_unpack_Y800 (dest, GET_LINE (y), width); } static void @@ -459,7 +457,7 @@ pack_Y800 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_Y800 (GET_LINE (y), src, width); + orc_pack_Y800 (GET_LINE (y), src, width); } #define PACK_GRAY8 GST_VIDEO_FORMAT_UNKNOWN, NULL, NULL @@ -472,7 +470,7 @@ unpack_Y16 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_Y16 (dest, GET_LINE (y), width); + orc_unpack_Y16 (dest, GET_LINE (y), width); } static void @@ -481,7 +479,7 @@ pack_Y16 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_Y16 (GET_LINE (y), src, width); + orc_pack_Y16 (GET_LINE (y), src, width); } #define PACK_RGB16 GST_VIDEO_FORMAT_ARGB, unpack_RGB16, pack_RGB16 @@ -626,7 +624,7 @@ unpack_BGRA (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_BGRA (dest, GET_LINE (y), width); + orc_unpack_BGRA (dest, GET_LINE (y), width); } static void @@ -635,7 +633,7 @@ pack_BGRA (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_BGRA (GET_LINE (y), src, width); + orc_pack_BGRA (GET_LINE (y), src, width); } #define PACK_ABGR GST_VIDEO_FORMAT_ARGB, unpack_ABGR, pack_ABGR @@ -644,7 +642,7 @@ unpack_ABGR (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_ABGR (dest, GET_LINE (y), width); + orc_unpack_ABGR (dest, GET_LINE (y), width); } static void @@ -653,7 +651,7 @@ pack_ABGR (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_ABGR (GET_LINE (y), src, width); + orc_pack_ABGR (GET_LINE (y), src, width); } #define PACK_RGBA GST_VIDEO_FORMAT_ARGB, unpack_RGBA, pack_RGBA @@ -662,7 +660,7 @@ unpack_RGBA (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_RGBA (dest, GET_LINE (y), width); + orc_unpack_RGBA (dest, GET_LINE (y), width); } static void @@ -671,7 +669,7 @@ pack_RGBA (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_RGBA (GET_LINE (y), src, width); + orc_pack_RGBA (GET_LINE (y), src, width); } #define PACK_RGB GST_VIDEO_FORMAT_ARGB, unpack_RGB, pack_RGB @@ -750,7 +748,7 @@ unpack_NV12 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_NV12 (dest, + orc_unpack_NV12 (dest, GET_PLANE_LINE (0, y), GET_PLANE_LINE (1, y >> 1), width / 2); } @@ -760,7 +758,7 @@ pack_NV12 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_NV12 (GET_PLANE_LINE (0, y), + orc_pack_NV12 (GET_PLANE_LINE (0, y), GET_PLANE_LINE (1, y >> 1), src, width / 2); } @@ -770,7 +768,7 @@ unpack_NV21 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_NV21 (dest, + orc_unpack_NV21 (dest, GET_PLANE_LINE (0, y), GET_PLANE_LINE (1, y >> 1), width / 2); } @@ -780,7 +778,7 @@ pack_NV21 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_NV21 (GET_PLANE_LINE (0, y), + orc_pack_NV21 (GET_PLANE_LINE (0, y), GET_PLANE_LINE (1, y >> 1), src, width / 2); } @@ -849,7 +847,7 @@ unpack_A420 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_A420 (dest, + orc_unpack_A420 (dest, GET_Y_LINE (y), GET_U_LINE (y >> 1), GET_V_LINE (y >> 1), GET_A_LINE (y), width); } @@ -860,7 +858,7 @@ pack_A420 (GstVideoFormatInfo * info, GstVideoPackFlags flags, const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, gint y, gint width) { - cogorc_putline_A420 (GET_Y_LINE (y), + orc_pack_A420 (GET_Y_LINE (y), GET_U_LINE (y >> 1), GET_V_LINE (y >> 1), GET_A_LINE (y), src, width / 2); } @@ -912,7 +910,7 @@ unpack_410 (GstVideoFormatInfo * info, GstVideoPackFlags flags, gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) { - cogorc_getline_YUV9 (dest, + orc_unpack_YUV9 (dest, GET_Y_LINE (y), GET_U_LINE (y >> 2), GET_V_LINE (y >> 2), width / 2); } diff --git a/gst-libs/gst/video/videoblendorc.orc b/gst-libs/gst/video/videoblendorc.orc index 7042318..ab302aa 100644 --- a/gst-libs/gst/video/videoblendorc.orc +++ b/gst-libs/gst/video/videoblendorc.orc @@ -60,7 +60,7 @@ x4 convwb t, d_wide orl t, t, a_alpha storel d, t -.function cogorc_getline_I420 +.function orc_unpack_I420 .dest 4 d guint8 .source 1 y guint8 .source 1 u guint8 @@ -78,7 +78,7 @@ mergebw ay, c255, y mergewl d, ay, uv -.function cogorc_putline_I420 +.function orc_pack_I420 .dest 2 y guint8 .dest 1 u guint8 .dest 1 v guint8 @@ -98,7 +98,7 @@ avgub u, t1, t2 splitwb t1, t2, vv avgub v, t1, t2 -.function cogorc_getline_YUY2 +.function orc_unpack_YUY2 .dest 8 ayuv guint8 .source 4 yuy2 guint8 .const 2 c255 0xff @@ -113,7 +113,7 @@ mergewl uvuv, uv, uv x2 mergewl ayuv, ayay, uvuv -.function cogorc_putline_YUY2 +.function orc_pack_YUY2 .dest 4 yuy2 guint8 .source 8 ayuv guint8 .temp 2 yy @@ -129,7 +129,7 @@ x2 select1wb yy, ayay x2 mergebw yuy2, yy, uv1 -.function cogorc_putline_UYVY +.function orc_pack_UYVY .dest 4 yuy2 guint8 .source 8 ayuv guint8 .temp 2 yy @@ -145,7 +145,7 @@ x2 select1wb yy, ayay x2 mergebw yuy2, uv1, yy -.function cogorc_getline_UYVY +.function orc_unpack_UYVY .dest 8 ayuv guint8 .source 4 uyvy guint8 .const 2 c255 0xff @@ -160,7 +160,7 @@ mergewl uvuv, uv, uv x2 mergewl ayuv, ayay, uvuv -.function cogorc_getline_YVYU +.function orc_unpack_YVYU .dest 8 ayuv guint8 .source 4 uyvy guint8 .const 2 c255 0xff @@ -176,7 +176,7 @@ mergewl uvuv, uv, uv x2 mergewl ayuv, ayay, uvuv -.function cogorc_putline_YVYU +.function orc_pack_YVYU .dest 4 yuy2 guint8 .source 8 ayuv guint8 .temp 2 yy @@ -193,7 +193,7 @@ swapw uv1, uv1 x2 mergebw yuy2, yy, uv1 -.function cogorc_getline_YUV9 +.function orc_unpack_YUV9 .dest 8 d guint8 .source 2 y guint8 .source 1 u guint8 @@ -213,7 +213,7 @@ x2 mergebw ay, c255, y x2 mergewl d, ay, uv -.function cogorc_getline_Y42B +.function orc_unpack_Y42B .dest 8 ayuv guint8 .source 2 yy guint8 .source 1 u guint8 @@ -229,7 +229,7 @@ x2 mergebw ayay, c255, yy mergewl uvuv, uv, uv x2 mergewl ayuv, ayay, uvuv -.function cogorc_putline_Y42B +.function orc_pack_Y42B .dest 2 y guint8 .dest 1 u guint8 .dest 1 v guint8 @@ -246,7 +246,7 @@ splitwb v, u, uv1 x2 select1wb y, ayay -.function cogorc_getline_Y444 +.function orc_unpack_Y444 .dest 4 ayuv guint8 .source 1 y guint8 .source 1 u guint8 @@ -260,7 +260,7 @@ mergebw ay, c255, y mergewl ayuv, ay, uv -.function cogorc_putline_Y444 +.function orc_pack_Y444 .dest 1 y guint8 .dest 1 u guint8 .dest 1 v guint8 @@ -272,7 +272,7 @@ splitlw uv, ay, ayuv splitwb v, u, uv select1wb y, ay -.function cogorc_getline_Y800 +.function orc_unpack_Y800 .dest 4 ayuv guint8 .source 1 y guint8 .const 1 c255 255 @@ -283,7 +283,7 @@ mergebw ay, c255, y mergewl ayuv, ay, c0x8080 -.function cogorc_putline_Y800 +.function orc_pack_Y800 .dest 1 y guint8 .source 4 ayuv guint8 .temp 2 ay @@ -292,7 +292,7 @@ select0lw ay, ayuv select1wb y, ay -.function cogorc_putline_Y16 +.function orc_pack_Y16 .dest 2 y guint8 .source 4 ayuv guint8 .temp 2 ay @@ -304,7 +304,7 @@ convubw ay, yb shlw y, ay, 8 -.function cogorc_getline_Y16 +.function orc_unpack_Y16 .dest 4 ayuv guint8 .source 2 y guint8 .const 1 c255 255 @@ -316,19 +316,19 @@ convhwb yb, y mergebw ay, c255, yb mergewl ayuv, ay, c0x8080 -.function cogorc_getline_BGRA +.function orc_unpack_BGRA .dest 4 argb guint8 .source 4 bgra guint8 swapl argb, bgra -.function cogorc_putline_BGRA +.function orc_pack_BGRA .dest 4 bgra guint8 .source 4 argb guint8 swapl bgra, argb -.function cogorc_putline_RGBA +.function orc_pack_RGBA .dest 4 rgba guint8 .source 4 argb guint8 .temp 1 a @@ -347,7 +347,7 @@ mergebw ba, b, a mergebw rg, r, g mergewl rgba, rg, ba -.function cogorc_getline_RGBA +.function orc_unpack_RGBA .dest 4 argb guint8 .source 4 rgba guint8 .temp 1 a @@ -367,7 +367,7 @@ mergebw gb, g, b mergewl argb, ar, gb -.function cogorc_getline_ABGR +.function orc_unpack_ABGR .dest 4 argb guint8 .source 4 abgr guint8 .temp 1 a @@ -387,7 +387,7 @@ mergebw gb, g, b mergewl argb, ar, gb -.function cogorc_putline_ABGR +.function orc_pack_ABGR .dest 4 abgr guint8 .source 4 argb guint8 .temp 1 a @@ -406,7 +406,7 @@ mergebw ab, a, b mergebw gr, g, r mergewl abgr, ab, gr -.function cogorc_getline_NV12 +.function orc_unpack_NV12 .dest 8 d guint8 .source 2 y guint8 .source 2 uv guint8 @@ -418,7 +418,7 @@ mergewl uvuv, uv, uv x2 mergebw ay, c255, y x2 mergewl d, ay, uvuv -.function cogorc_putline_NV12 +.function orc_pack_NV12 .dest 2 y guint8 .dest 2 uv guint8 .source 8 ayuv guint8 @@ -432,7 +432,7 @@ x2 select1wb y, ay splitlw uv1, uv2, uvuv x2 avgub uv, uv1, uv2 -.function cogorc_getline_NV21 +.function orc_unpack_NV21 .dest 8 d guint8 .source 2 y guint8 .source 2 vu guint8 @@ -447,7 +447,7 @@ x2 mergebw ay, c255, y x2 mergewl d, ay, uvuv -.function cogorc_putline_NV21 +.function orc_pack_NV21 .dest 2 y guint8 .dest 2 vu guint8 .source 8 ayuv guint8 @@ -464,7 +464,7 @@ x2 avgub uv, uv1, uv2 swapw vu, uv -.function cogorc_getline_A420 +.function orc_unpack_A420 .dest 4 d guint8 .source 1 y guint8 .source 1 u guint8 @@ -481,7 +481,7 @@ mergebw uv, tu, tv mergebw ay, a, y mergewl d, ay, uv -.function cogorc_putline_A420 +.function orc_pack_A420 .dest 2 y guint8 .dest 1 u guint8 .dest 1 v guint8 -- 2.7.4