--- a/gst_plugins_base/gst/ffmpegcolorspace/imgconvert_template.h Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst/ffmpegcolorspace/imgconvert_template.h Wed Sep 01 12:16:41 2010 +0100
@@ -103,7 +103,7 @@
/* handle width */
if (w) {
YUV_TO_RGB1_CCIR(cb_ptr[0], cr_ptr[0]);
- /* output 2 pixel */
+ /* output 2 pixels */
YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
RGB_OUT(d1, r, g, b);
d1 += BPP;
@@ -115,182 +115,6 @@
}
}
-static void glue(nv12_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const uint8_t *y1_ptr, *y2_ptr, *c_ptr;
- uint8_t *d, *d1, *d2;
- int w, y, cb, cr, r_add, g_add, b_add;
- uint8_t *cm = cropTbl + MAX_NEG_CROP;
- unsigned int r, g, b;
- int c_wrap = src->linesize[1] - ((width+1) & ~0x01);
-
- d = dst->data[0];
- y1_ptr = src->data[0];
- c_ptr = src->data[1];
- for(;height >= 2; height -= 2) {
- d1 = d;
- d2 = d + dst->linesize[0];
- y2_ptr = y1_ptr + src->linesize[0];
- for(w = width; w >= 2; w -= 2) {
- YUV_TO_RGB1_CCIR(c_ptr[0], c_ptr[1]);
- /* output 4 pixels */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[1]);
- RGB_OUT(d1 + BPP, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[0]);
- RGB_OUT(d2, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[1]);
- RGB_OUT(d2 + BPP, r, g, b);
-
- d1 += 2 * BPP;
- d2 += 2 * BPP;
-
- y1_ptr += 2;
- y2_ptr += 2;
- c_ptr += 2;
- }
- /* handle odd width */
- if (w) {
- YUV_TO_RGB1_CCIR(c_ptr[0], c_ptr[1]);
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[0]);
- RGB_OUT(d2, r, g, b);
- d1 += BPP;
- d2 += BPP;
- y1_ptr++;
- y2_ptr++;
- c_ptr += 2;
- }
- d += 2 * dst->linesize[0];
- y1_ptr += 2 * src->linesize[0] - width;
- c_ptr += c_wrap;
- }
- /* handle odd height */
- if (height) {
- d1 = d;
- for(w = width; w >= 2; w -= 2) {
- YUV_TO_RGB1_CCIR(c_ptr[0], c_ptr[1]);
- /* output 2 pixels */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[1]);
- RGB_OUT(d1 + BPP, r, g, b);
-
- d1 += 2 * BPP;
-
- y1_ptr += 2;
- c_ptr += 2;
- }
- /* handle odd width */
- if (w) {
- YUV_TO_RGB1_CCIR(c_ptr[0], c_ptr[1]);
- /* output 1 pixel */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
- d1 += BPP;
-
- y1_ptr++;
- c_ptr += 2;
- }
- }
-}
-
-static void glue(nv21_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const uint8_t *y1_ptr, *y2_ptr, *c_ptr;
- uint8_t *d, *d1, *d2;
- int w, y, cb, cr, r_add, g_add, b_add;
- uint8_t *cm = cropTbl + MAX_NEG_CROP;
- unsigned int r, g, b;
- int c_wrap = src->linesize[1] - ((width+1) & ~0x01);
-
- d = dst->data[0];
- y1_ptr = src->data[0];
- c_ptr = src->data[1];
- for(;height >= 2; height -= 2) {
- d1 = d;
- d2 = d + dst->linesize[0];
- y2_ptr = y1_ptr + src->linesize[0];
- for(w = width; w >= 2; w -= 2) {
- YUV_TO_RGB1_CCIR(c_ptr[1], c_ptr[0]);
- /* output 4 pixels */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[1]);
- RGB_OUT(d1 + BPP, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[0]);
- RGB_OUT(d2, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[1]);
- RGB_OUT(d2 + BPP, r, g, b);
-
- d1 += 2 * BPP;
- d2 += 2 * BPP;
-
- y1_ptr += 2;
- y2_ptr += 2;
- c_ptr += 2;
- }
- /* handle odd width */
- if (w) {
- YUV_TO_RGB1_CCIR(c_ptr[1], c_ptr[0]);
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y2_ptr[0]);
- RGB_OUT(d2, r, g, b);
- d1 += BPP;
- d2 += BPP;
- y1_ptr++;
- y2_ptr++;
- c_ptr += 2;
- }
- d += 2 * dst->linesize[0];
- y1_ptr += 2 * src->linesize[0] - width;
- c_ptr += c_wrap;
- }
- /* handle odd height */
- if (height) {
- d1 = d;
- for(w = width; w >= 2; w -= 2) {
- YUV_TO_RGB1_CCIR(c_ptr[1], c_ptr[0]);
- /* output 2 pixels */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
-
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[1]);
- RGB_OUT(d1 + BPP, r, g, b);
-
- d1 += 2 * BPP;
-
- y1_ptr += 2;
- c_ptr += 2;
- }
- /* handle odd width */
- if (w) {
- YUV_TO_RGB1_CCIR(c_ptr[1], c_ptr[0]);
- /* output 1 pixel */
- YUV_TO_RGB2_CCIR(r, g, b, y1_ptr[0]);
- RGB_OUT(d1, r, g, b);
- d1 += BPP;
-
- y1_ptr++;
- c_ptr += 2;
- }
- }
-}
-
static void glue(yuvj420p_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
int width, int height)
{
@@ -493,214 +317,6 @@
}
}
-static void glue(RGB_NAME, _to_nv12)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- int wrap, wrap3;
- int r, g, b, r1, g1, b1, w;
- uint8_t *lum, *c;
- const uint8_t *p;
-
- lum = dst->data[0];
- c = dst->data[1];
-
- wrap = dst->linesize[0];
- wrap3 = src->linesize[0];
- p = src->data[0];
- for(;height>=2;height -= 2) {
- for(w = width; w >= 2; w -= 2) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
- p += wrap3;
- lum += wrap;
-
- RGB_IN(r, g, b, p);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
-
- c[0] = RGB_TO_U_CCIR(r1, g1, b1, 2);
- c[1] = RGB_TO_V_CCIR(r1, g1, b1, 2);
-
-
- c += 2;
- p += -wrap3 + 2 * BPP;
- lum += -wrap + 2;
- }
- /* handle odd width */
- if (w) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- p += wrap3;
- lum += wrap;
- RGB_IN(r, g, b, p);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- c[0] = RGB_TO_U_CCIR(r1, g1, b1, 1);
- c[1] = RGB_TO_V_CCIR(r1, g1, b1, 1);
- c += 2;
- p += -wrap3 + BPP;
- lum += -wrap + 1;
- }
- p += wrap3 + (wrap3 - width * BPP);
- lum += wrap + (wrap - width);
- c += dst->linesize[1] - width;
- }
- /* handle odd height */
- if (height) {
- for(w = width; w >= 2; w -= 2) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
- c[0] = RGB_TO_U_CCIR(r1, g1, b1, 1);
- c[1] = RGB_TO_V_CCIR(r1, g1, b1, 1);
- c += 2;
- p += 2 * BPP;
- lum += 2;
- }
- /* handle odd width */
- if (w) {
- RGB_IN(r, g, b, p);
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- c[0] = RGB_TO_U_CCIR(r, g, b, 0);
- c[1] = RGB_TO_V_CCIR(r, g, b, 0);
- }
- }
-}
-
-static void glue(RGB_NAME, _to_nv21)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- int wrap, wrap3;
- int r, g, b, r1, g1, b1, w;
- uint8_t *lum, *c;
- const uint8_t *p;
-
- lum = dst->data[0];
- c = dst->data[1];
-
- wrap = dst->linesize[0];
- wrap3 = src->linesize[0];
- p = src->data[0];
- for(;height>=2;height -= 2) {
- for(w = width; w >= 2; w -= 2) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
- p += wrap3;
- lum += wrap;
-
- RGB_IN(r, g, b, p);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
-
- c[1] = RGB_TO_U_CCIR(r1, g1, b1, 2);
- c[0] = RGB_TO_V_CCIR(r1, g1, b1, 2);
-
-
- c += 2;
- p += -wrap3 + 2 * BPP;
- lum += -wrap + 2;
- }
- /* handle odd width */
- if (w) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- p += wrap3;
- lum += wrap;
- RGB_IN(r, g, b, p);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- c[1] = RGB_TO_U_CCIR(r1, g1, b1, 1);
- c[0] = RGB_TO_V_CCIR(r1, g1, b1, 1);
- c += 2;
- p += -wrap3 + BPP;
- lum += -wrap + 1;
- }
- p += wrap3 + (wrap3 - width * BPP);
- lum += wrap + (wrap - width);
- c += dst->linesize[1] - width;
- }
- /* handle odd height */
- if (height) {
- for(w = width; w >= 2; w -= 2) {
- RGB_IN(r, g, b, p);
- r1 = r;
- g1 = g;
- b1 = b;
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
-
- RGB_IN(r, g, b, p + BPP);
- r1 += r;
- g1 += g;
- b1 += b;
- lum[1] = RGB_TO_Y_CCIR(r, g, b);
- c[1] = RGB_TO_U_CCIR(r1, g1, b1, 1);
- c[0] = RGB_TO_V_CCIR(r1, g1, b1, 1);
- c += 2;
- p += 2 * BPP;
- lum += 2;
- }
- /* handle odd width */
- if (w) {
- RGB_IN(r, g, b, p);
- lum[0] = RGB_TO_Y_CCIR(r, g, b);
- c[1] = RGB_TO_U_CCIR(r, g, b, 0);
- c[0] = RGB_TO_V_CCIR(r, g, b, 0);
- }
- }
-}
-
static void glue(RGB_NAME, _to_gray)(AVPicture *dst, const AVPicture *src,
int width, int height)
{
@@ -753,110 +369,6 @@
}
}
-static void glue(RGB_NAME, _to_gray16_l)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const unsigned char *p;
- unsigned char *q;
- int r, g, b, dst_wrap, src_wrap;
- int x, y;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - BPP * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - 2 * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- RGB_IN(r, g, b, p);
- GST_WRITE_UINT16_LE (q, RGB_TO_Y(r, g, b) << 8);
- q += 2;
- p += BPP;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-static void glue(gray16_l_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const unsigned char *p;
- unsigned char *q;
- int r, dst_wrap, src_wrap;
- int x, y;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - 2 * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - BPP * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- r = GST_READ_UINT16_LE (p) >> 8;
- RGB_OUT(q, r, r, r);
- q += BPP;
- p += 2;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-static void glue(RGB_NAME, _to_gray16_b)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const unsigned char *p;
- unsigned char *q;
- int r, g, b, dst_wrap, src_wrap;
- int x, y;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - BPP * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - 2 * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- RGB_IN(r, g, b, p);
- GST_WRITE_UINT16_BE (q, RGB_TO_Y(r, g, b) << 8);
- q += 2;
- p += BPP;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-static void glue(gray16_b_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- const unsigned char *p;
- unsigned char *q;
- int r, dst_wrap, src_wrap;
- int x, y;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - 2 * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - BPP * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- r = GST_READ_UINT16_BE (p) >> 8;
- RGB_OUT(q, r, r, r);
- q += BPP;
- p += 2;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
static void glue(pal8_to_, RGB_NAME)(AVPicture *dst, const AVPicture *src,
int width, int height)
{
@@ -1406,58 +918,6 @@
d += dst_wrap;
}
}
-
-static void v308_to_rgb24(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- uint8_t *s, *d, *d1, *s1;
- int w, y, cb, cr, r_add, g_add, b_add;
- uint8_t *cm = cropTbl + MAX_NEG_CROP;
- unsigned int r, g, b;
-
- d = dst->data[0];
- s = src->data[0];
- for(;height > 0; height --) {
- d1 = d;
- s1 = s;
- for(w = width; w > 0; w--) {
- YUV_TO_RGB1_CCIR(s1[1], s1[2]);
-
- YUV_TO_RGB2_CCIR(r, g, b, s1[0]);
- RGB_OUT(d1, r, g, b);
- d1 += BPP;
- s1 += 3;
- }
- d += dst->linesize[0];
- s += src->linesize[0];
- }
-}
-
-static void rgb24_to_v308(AVPicture *dst, const AVPicture *src,
- int width, int height)
-{
- int src_wrap, dst_wrap, x, y;
- int r, g, b;
- uint8_t *d;
- const uint8_t *p;
-
- src_wrap = src->linesize[0] - width * BPP;
- dst_wrap = dst->linesize[0] - width * 3;
- d = dst->data[0];
- p = src->data[0];
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- RGB_IN(r, g, b, p);
- d[0] = RGB_TO_Y_CCIR(r, g, b);
- d[1] = RGB_TO_U_CCIR(r, g, b, 0);
- d[2] = RGB_TO_V_CCIR(r, g, b, 0);
- p += BPP;
- d += 3;
- }
- p += src_wrap;
- d += dst_wrap;
- }
-}
#endif /* FMT_RGB24 */
#if defined(FMT_RGB24) || defined(FMT_RGBA32)