/*
- * Misc image convertion routines
- * Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
+ * Misc image conversion routines
+ * Copyright (c) 2001, 2002, 2003 Fabrice Bellard
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file imgconvert.c
- * Misc image convertion routines.
+ * @file
+ * misc image conversion routines
*/
+/* TODO:
+ * - write 'ffimg' program to test all the image related stuff
+ * - move all api to slice based system
+ * - integrate deinterlacing, postprocessing and scaling in the conversion process
+ */
#include "avcodec.h"
#include "dsputil.h"
-
-#ifdef USE_FASTMEMCPY
-#include "fastmemcpy.h"
+#include "internal.h"
+#include "libavutil/colorspace.h"
+#include "libavutil/common.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/imgutils.h"
+
+#if HAVE_MMX_EXTERNAL
+#include "x86/dsputil_mmx.h"
#endif
-#ifdef HAVE_MMX
-#include "i386/mmx.h"
+#if HAVE_MMX_EXTERNAL
+#define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx
+#define deinterlace_line ff_deinterlace_line_mmx
+#else
+#define deinterlace_line_inplace deinterlace_line_inplace_c
+#define deinterlace_line deinterlace_line_c
#endif
-typedef struct PixFmtInfo {
- const char *name;
- uint8_t nb_components; /* number of components in AVPicture array */
- uint8_t is_yuv : 1; /* true if YUV instead of RGB color space */
- uint8_t is_packed : 1; /* true if multiple components in same word */
- uint8_t is_paletted : 1; /* true if paletted */
- uint8_t is_alpha : 1; /* true if alpha can be specified */
- uint8_t is_gray : 1; /* true if gray or monochrome format */
- uint8_t x_chroma_shift; /* X chroma subsampling factor is 2 ^ shift */
- uint8_t y_chroma_shift; /* Y chroma subsampling factor is 2 ^ shift */
-} PixFmtInfo;
-
-/* this table gives more information about formats */
-static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
- /* YUV formats */
- [PIX_FMT_YUV420P] = {
- .name = "yuv420p",
- .nb_components = 3, .is_yuv = 1,
- .x_chroma_shift = 1, .y_chroma_shift = 1,
- },
- [PIX_FMT_YUV422P] = {
- .name = "yuv422p",
- .nb_components = 3, .is_yuv = 1,
- .x_chroma_shift = 1, .y_chroma_shift = 0,
- },
- [PIX_FMT_YUV444P] = {
- .name = "yuv444p",
- .nb_components = 3, .is_yuv = 1,
- .x_chroma_shift = 0, .y_chroma_shift = 0,
- },
- [PIX_FMT_YUV422] = {
- .name = "yuv422",
- .nb_components = 1, .is_yuv = 1, .is_packed = 1,
- .x_chroma_shift = 1, .y_chroma_shift = 0,
- },
- [PIX_FMT_YUV410P] = {
- .name = "yuv410p",
- .nb_components = 3, .is_yuv = 1,
- .x_chroma_shift = 2, .y_chroma_shift = 2,
- },
- [PIX_FMT_YUV411P] = {
- .name = "yuv411p",
- .nb_components = 3, .is_yuv = 1,
- .x_chroma_shift = 2, .y_chroma_shift = 0,
- },
-
- /* RGB formats */
- [PIX_FMT_RGB24] = {
- .name = "rgb24",
- .nb_components = 1, .is_packed = 1,
- },
- [PIX_FMT_BGR24] = {
- .name = "bgr24",
- .nb_components = 1, .is_packed = 1,
- },
- [PIX_FMT_RGBA32] = {
- .name = "rgba32",
- .nb_components = 1, .is_packed = 1, .is_alpha = 1,
- },
- [PIX_FMT_RGB565] = {
- .name = "rgb565",
- .nb_components = 1, .is_packed = 1,
- },
- [PIX_FMT_RGB555] = {
- .name = "rgb555",
- .nb_components = 1, .is_packed = 1, .is_alpha = 1,
- },
-
- /* gray / mono formats */
- [PIX_FMT_GRAY8] = {
- .name = "gray",
- .nb_components = 1, .is_gray = 1,
- },
- [PIX_FMT_MONOWHITE] = {
- .name = "monow",
- .nb_components = 1, .is_packed = 1, .is_gray = 1,
- },
- [PIX_FMT_MONOBLACK] = {
- .name = "monob",
- .nb_components = 1, .is_packed = 1, .is_gray = 1,
- },
-
- /* paletted formats */
- [PIX_FMT_PAL8] = {
- .name = "pal8",
- .nb_components = 1, .is_packed = 1, .is_paletted = 1,
- },
-};
-
-void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift)
+void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift)
{
- if (pix_fmt_info[pix_fmt].is_yuv) {
- *h_shift = pix_fmt_info[pix_fmt].x_chroma_shift;
- *v_shift = pix_fmt_info[pix_fmt].y_chroma_shift;
- } else {
- *h_shift=0;
- *v_shift=0;
- }
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+ *h_shift = desc->log2_chroma_w;
+ *v_shift = desc->log2_chroma_h;
}
-const char *avcodec_get_pix_fmt_name(int pix_fmt)
+static int is_gray(const AVPixFmtDescriptor *desc)
{
- if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB)
- return "???";
- else
- return pix_fmt_info[pix_fmt].name;
+ return desc->nb_components - (desc->flags & PIX_FMT_ALPHA) == 1;
}
-/* Picture field are filled with 'ptr' addresses. Also return size */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
- int pix_fmt, int width, int height)
+int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha)
{
- int size, w2, h2, size2;
- PixFmtInfo *pinfo;
-
- pinfo = &pix_fmt_info[pix_fmt];
- size = width * height;
- switch(pix_fmt) {
- case PIX_FMT_YUV420P:
- case PIX_FMT_YUV422P:
- case PIX_FMT_YUV444P:
- case PIX_FMT_YUV410P:
- case PIX_FMT_YUV411P:
- w2 = (width + (1 << pinfo->x_chroma_shift) - 1) >> pinfo->x_chroma_shift;
- h2 = (height + (1 << pinfo->y_chroma_shift) - 1) >> pinfo->y_chroma_shift;
- size2 = w2 * h2;
- picture->data[0] = ptr;
- picture->data[1] = picture->data[0] + size;
- picture->data[2] = picture->data[1] + size2;
- picture->linesize[0] = width;
- picture->linesize[1] = w2;
- picture->linesize[2] = w2;
- return size + 2 * size2;
- case PIX_FMT_RGB24:
- case PIX_FMT_BGR24:
- picture->data[0] = ptr;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->linesize[0] = width * 3;
- return size * 3;
- case PIX_FMT_RGBA32:
- picture->data[0] = ptr;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->linesize[0] = width * 4;
- return size * 4;
- case PIX_FMT_RGB555:
- case PIX_FMT_RGB565:
- case PIX_FMT_YUV422:
- picture->data[0] = ptr;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->linesize[0] = width * 2;
- return size * 2;
- case PIX_FMT_GRAY8:
- picture->data[0] = ptr;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->linesize[0] = width;
- return size;
- case PIX_FMT_MONOWHITE:
- case PIX_FMT_MONOBLACK:
- picture->data[0] = ptr;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->linesize[0] = (width + 7) >> 3;
- return picture->linesize[0] * height;
- case PIX_FMT_PAL8:
- size2 = (size + 3) & ~3;
- picture->data[0] = ptr;
- picture->data[1] = ptr + size2; /* palette is stored here as 256 32 bit words */
- picture->data[2] = NULL;
- picture->linesize[0] = width;
- picture->linesize[1] = 4;
- return size2 + 256 * 4;
- default:
- picture->data[0] = NULL;
- picture->data[1] = NULL;
- picture->data[2] = NULL;
- picture->data[3] = NULL;
- return -1;
- }
-}
+ const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(src_pix_fmt);
+ const AVPixFmtDescriptor *dst_desc = av_pix_fmt_desc_get(dst_pix_fmt);
+ int loss, i, nb_components = FFMIN(src_desc->nb_components,
+ dst_desc->nb_components);
-int avpicture_get_size(int pix_fmt, int width, int height)
-{
- AVPicture dummy_pict;
- return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height);
-}
+ /* compute loss */
+ loss = 0;
+ if (dst_pix_fmt == src_pix_fmt)
+ return 0;
+
+ for (i = 0; i < nb_components; i++)
+ if (src_desc->comp[i].depth_minus1 > dst_desc->comp[i].depth_minus1)
+ loss |= FF_LOSS_DEPTH;
+
+ if (dst_desc->log2_chroma_w > src_desc->log2_chroma_w ||
+ dst_desc->log2_chroma_h > src_desc->log2_chroma_h)
+ loss |= FF_LOSS_RESOLUTION;
+
+ if ((src_desc->flags & PIX_FMT_RGB) != (dst_desc->flags & PIX_FMT_RGB))
+ loss |= FF_LOSS_COLORSPACE;
-/* XXX: totally non optimized */
+ if (has_alpha && !(dst_desc->flags & PIX_FMT_ALPHA) &&
+ (dst_desc->flags & PIX_FMT_ALPHA))
+ loss |= FF_LOSS_ALPHA;
+
+ if (dst_pix_fmt == AV_PIX_FMT_PAL8 && !is_gray(src_desc))
+ return loss | FF_LOSS_COLORQUANT;
+
+ if (src_desc->nb_components > dst_desc->nb_components)
+ if (is_gray(dst_desc))
+ loss |= FF_LOSS_CHROMA;
+
+ return loss;
+}
-static void yuv422_to_yuv420p(AVPicture *dst, AVPicture *src,
- int width, int height)
+static enum AVPixelFormat avcodec_find_best_pix_fmt1(enum AVPixelFormat *pix_fmt_list,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha,
+ int loss_mask)
{
- uint8_t *lum, *cb, *cr;
- int x, y;
- const uint8_t *p;
-
- lum = dst->data[0];
- cb = dst->data[1];
- cr = dst->data[2];
- p = src->data[0];
-
- for(y=0;y<height;y+=2) {
- for(x=0;x<width;x+=2) {
- lum[0] = p[0];
- cb[0] = p[1];
- lum[1] = p[2];
- cr[0] = p[3];
- p += 4;
- lum += 2;
- cb++;
- cr++;
+ int dist, i, loss, min_dist;
+ enum AVPixelFormat dst_pix_fmt;
+
+ /* find exact color match with smallest size */
+ dst_pix_fmt = AV_PIX_FMT_NONE;
+ min_dist = 0x7fffffff;
+ i = 0;
+ while (pix_fmt_list[i] != AV_PIX_FMT_NONE) {
+ enum AVPixelFormat pix_fmt = pix_fmt_list[i];
+
+ if (i > AV_PIX_FMT_NB) {
+ av_log(NULL, AV_LOG_ERROR, "Pixel format list longer than expected, "
+ "it is either not properly terminated or contains duplicates\n");
+ return AV_PIX_FMT_NONE;
}
- for(x=0;x<width;x+=2) {
- lum[0] = p[0];
- lum[1] = p[2];
- p += 4;
- lum += 2;
+
+ loss = avcodec_get_pix_fmt_loss(pix_fmt, src_pix_fmt, has_alpha) & loss_mask;
+ if (loss == 0) {
+ dist = av_get_bits_per_pixel(av_pix_fmt_desc_get(pix_fmt));
+ if (dist < min_dist) {
+ min_dist = dist;
+ dst_pix_fmt = pix_fmt;
+ }
}
+ i++;
}
+ return dst_pix_fmt;
}
-#define SCALEBITS 8
-#define ONE_HALF (1 << (SCALEBITS - 1))
-#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5))
-
-/* XXX: use generic filter ? */
-/* 1x2 -> 1x1 */
-static void shrink2(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
- int width, int height)
+#if FF_API_FIND_BEST_PIX_FMT
+enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
+ int has_alpha, int *loss_ptr)
{
- int w;
- uint8_t *s1, *s2, *d;
+ enum AVPixelFormat list[64];
+ int i, j = 0;
- for(;height > 0; height--) {
- s1 = src;
- s2 = s1 + src_wrap;
- d = dst;
- for(w = width;w >= 4; w-=4) {
- d[0] = (s1[0] + s2[0]) >> 1;
- d[1] = (s1[1] + s2[1]) >> 1;
- d[2] = (s1[2] + s2[2]) >> 1;
- d[3] = (s1[3] + s2[3]) >> 1;
- s1 += 4;
- s2 += 4;
- d += 4;
- }
- for(;w > 0; w--) {
- d[0] = (s1[0] + s2[0]) >> 1;
- s1++;
- s2++;
- d++;
- }
- src += 2 * src_wrap;
- dst += dst_wrap;
+ // test only the first 64 pixel formats to avoid undefined behaviour
+ for (i = 0; i < 64; i++) {
+ if (pix_fmt_mask & (1ULL << i))
+ list[j++] = i;
+ }
+ list[j] = AV_PIX_FMT_NONE;
+
+ return avcodec_find_best_pix_fmt2(list, src_pix_fmt, has_alpha, loss_ptr);
+}
+#endif /* FF_API_FIND_BEST_PIX_FMT */
+
+enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
+ enum AVPixelFormat src_pix_fmt,
+ int has_alpha, int *loss_ptr)
+{
+ enum AVPixelFormat dst_pix_fmt;
+ int loss_mask, i;
+ static const int loss_mask_order[] = {
+ ~0, /* no loss first */
+ ~FF_LOSS_ALPHA,
+ ~FF_LOSS_RESOLUTION,
+ ~(FF_LOSS_COLORSPACE | FF_LOSS_RESOLUTION),
+ ~FF_LOSS_COLORQUANT,
+ ~FF_LOSS_DEPTH,
+ 0,
+ };
+
+ /* try with successive loss */
+ i = 0;
+ for(;;) {
+ loss_mask = loss_mask_order[i++];
+ dst_pix_fmt = avcodec_find_best_pix_fmt1(pix_fmt_list, src_pix_fmt,
+ has_alpha, loss_mask);
+ if (dst_pix_fmt >= 0)
+ goto found;
+ if (loss_mask == 0)
+ break;
}
+ return AV_PIX_FMT_NONE;
+ found:
+ if (loss_ptr)
+ *loss_ptr = avcodec_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha);
+ return dst_pix_fmt;
}
/* 2x2 -> 1x1 */
-static void shrink22(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
+void ff_shrink22(uint8_t *dst, int dst_wrap,
+ const uint8_t *src, int src_wrap,
int width, int height)
{
int w;
- uint8_t *s1, *s2, *d;
+ const uint8_t *s1, *s2;
+ uint8_t *d;
for(;height > 0; height--) {
s1 = src;
s2 = s1 + src_wrap;
d = dst;
for(w = width;w >= 4; w-=4) {
- d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 1;
- d[1] = (s1[2] + s1[3] + s2[2] + s2[3] + 2) >> 1;
- d[2] = (s1[4] + s1[5] + s2[4] + s2[5] + 2) >> 1;
- d[3] = (s1[6] + s1[7] + s2[6] + s2[7] + 2) >> 1;
+ d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
+ d[1] = (s1[2] + s1[3] + s2[2] + s2[3] + 2) >> 2;
+ d[2] = (s1[4] + s1[5] + s2[4] + s2[5] + 2) >> 2;
+ d[3] = (s1[6] + s1[7] + s2[6] + s2[7] + 2) >> 2;
s1 += 8;
s2 += 8;
d += 4;
}
for(;w > 0; w--) {
- d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 1;
+ d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
s1 += 2;
s2 += 2;
d++;
}
}
-/* 1x1 -> 2x2 */
-static void grow22(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
+/* 4x4 -> 1x1 */
+void ff_shrink44(uint8_t *dst, int dst_wrap,
+ const uint8_t *src, int src_wrap,
int width, int height)
{
int w;
- uint8_t *s1, *d;
+ const uint8_t *s1, *s2, *s3, *s4;
+ uint8_t *d;
for(;height > 0; height--) {
s1 = src;
+ s2 = s1 + src_wrap;
+ s3 = s2 + src_wrap;
+ s4 = s3 + src_wrap;
d = dst;
- for(w = width;w >= 4; w-=4) {
- d[1] = d[0] = s1[0];
- d[3] = d[2] = s1[1];
- s1 += 2;
- d += 4;
- }
- for(;w > 0; w--) {
- d[0] = s1[0];
- s1 ++;
+ for(w = width;w > 0; w--) {
+ d[0] = (s1[0] + s1[1] + s1[2] + s1[3] +
+ s2[0] + s2[1] + s2[2] + s2[3] +
+ s3[0] + s3[1] + s3[2] + s3[3] +
+ s4[0] + s4[1] + s4[2] + s4[3] + 8) >> 4;
+ s1 += 4;
+ s2 += 4;
+ s3 += 4;
+ s4 += 4;
d++;
}
- if (height%2)
- src += src_wrap;
+ src += 4 * src_wrap;
dst += dst_wrap;
}
}
-/* 1x2 -> 2x1 */
-static void conv411(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
- int width, int height)
+/* 8x8 -> 1x1 */
+void ff_shrink88(uint8_t *dst, int dst_wrap,
+ const uint8_t *src, int src_wrap,
+ int width, int height)
{
- int w, c;
- uint8_t *s1, *s2, *d;
+ int w, i;
for(;height > 0; height--) {
- s1 = src;
- s2 = src + src_wrap;
- d = dst;
for(w = width;w > 0; w--) {
- c = (s1[0] + s2[0]) >> 1;
- d[0] = c;
- d[1] = c;
- s1++;
- s2++;
- d += 2;
- }
- src += src_wrap * 2;
- dst += dst_wrap;
- }
-}
-
-static void img_copy(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
- int width, int height)
-{
- for(;height > 0; height--) {
- memcpy(dst, src, width);
- dst += dst_wrap;
- src += src_wrap;
- }
-}
-
-#define SCALE_BITS 10
-
-#define C_Y (76309 >> (16 - SCALE_BITS))
-#define C_RV (117504 >> (16 - SCALE_BITS))
-#define C_BU (138453 >> (16 - SCALE_BITS))
-#define C_GU (13954 >> (16 - SCALE_BITS))
-#define C_GV (34903 >> (16 - SCALE_BITS))
-
-#define YUV_TO_RGB2(r, g, b, y1)\
-{\
- y = (y1 - 16) * C_Y;\
- r = cm[(y + r_add) >> SCALE_BITS];\
- g = cm[(y + g_add) >> SCALE_BITS];\
- b = cm[(y + b_add) >> SCALE_BITS];\
-}
-
-/* XXX: no chroma interpolating is done */
-#define RGB_FUNCTIONS(rgb_name) \
- \
-static void yuv420p_to_ ## rgb_name (AVPicture *dst, AVPicture *src, \
- int width, int height) \
-{ \
- uint8_t *y1_ptr, *y2_ptr, *cb_ptr, *cr_ptr, *d, *d1, *d2; \
- int w, y, cb, cr, r_add, g_add, b_add, width2; \
- uint8_t *cm = cropTbl + MAX_NEG_CROP; \
- unsigned int r, g, b; \
- \
- d = dst->data[0]; \
- y1_ptr = src->data[0]; \
- cb_ptr = src->data[1]; \
- cr_ptr = src->data[2]; \
- width2 = (width + 1) >> 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) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- /* output 4 pixels */ \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- \
- YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
- RGB_OUT(d1 + BPP, r, g, b); \
- \
- YUV_TO_RGB2(r, g, b, y2_ptr[0]); \
- RGB_OUT(d2, r, g, b); \
- \
- YUV_TO_RGB2(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; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- /* handle odd width */ \
- if (w) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- \
- YUV_TO_RGB2(r, g, b, y2_ptr[0]); \
- RGB_OUT(d2, r, g, b); \
- d1 += BPP; \
- d2 += BPP; \
- y1_ptr++; \
- y2_ptr++; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- d += 2 * dst->linesize[0]; \
- y1_ptr += 2 * src->linesize[0] - width; \
- cb_ptr += src->linesize[1] - width2; \
- cr_ptr += src->linesize[2] - width2; \
- } \
- /* handle odd height */ \
- if (height) { \
- d1 = d; \
- for(w = width; w >= 2; w -= 2) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- /* output 2 pixels */ \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- \
- YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
- RGB_OUT(d1 + BPP, r, g, b); \
- \
- d1 += 2 * BPP; \
- \
- y1_ptr += 2; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- /* handle width */ \
- if (w) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- /* output 2 pixels */ \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- d1 += BPP; \
- \
- y1_ptr++; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- } \
-} \
- \
-/* XXX: no chroma interpolating is done */ \
-static void yuv422p_to_ ## rgb_name (AVPicture *dst, AVPicture *src, \
- int width, int height) \
-{ \
- uint8_t *y1_ptr, *cb_ptr, *cr_ptr, *d, *d1; \
- int w, y, cb, cr, r_add, g_add, b_add, width2; \
- uint8_t *cm = cropTbl + MAX_NEG_CROP; \
- unsigned int r, g, b; \
- \
- d = dst->data[0]; \
- y1_ptr = src->data[0]; \
- cb_ptr = src->data[1]; \
- cr_ptr = src->data[2]; \
- width2 = (width + 1) >> 1; \
- for(;height > 0; height --) { \
- d1 = d; \
- for(w = width; w >= 2; w -= 2) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- /* output 2 pixels */ \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- \
- YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
- RGB_OUT(d1 + BPP, r, g, b); \
- \
- d1 += 2 * BPP; \
- \
- y1_ptr += 2; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- /* handle width */ \
- if (w) { \
- cb = cb_ptr[0] - 128; \
- cr = cr_ptr[0] - 128; \
- r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
- g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
- b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
- \
- /* output 2 pixels */ \
- YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
- RGB_OUT(d1, r, g, b); \
- d1 += BPP; \
- \
- y1_ptr++; \
- cb_ptr++; \
- cr_ptr++; \
- } \
- d += dst->linesize[0]; \
- y1_ptr += src->linesize[0] - width; \
- cb_ptr += src->linesize[1] - width2; \
- cr_ptr += src->linesize[2] - width2; \
- } \
-} \
- \
-static void rgb_name ## _to_yuv420p(AVPicture *dst, AVPicture *src, \
- int width, int height) \
-{ \
- int wrap, wrap3, x, y; \
- int r, g, b, r1, g1, b1; \
- uint8_t *lum, *cb, *cr; \
- const uint8_t *p; \
- \
- lum = dst->data[0]; \
- cb = dst->data[1]; \
- cr = dst->data[2]; \
- \
- wrap = dst->linesize[0]; \
- wrap3 = src->linesize[0]; \
- p = src->data[0]; \
- for(y=0;y<height;y+=2) { \
- for(x=0;x<width;x+=2) { \
- RGB_IN(r, g, b, p); \
- r1 = r; \
- g1 = g; \
- b1 = b; \
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
- FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
- RGB_IN(r, g, b, p + BPP); \
- r1 += r; \
- g1 += g; \
- b1 += b; \
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + \
- FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
- p += wrap3; \
- lum += wrap; \
- \
- RGB_IN(r, g, b, p); \
- r1 += r; \
- g1 += g; \
- b1 += b; \
- lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
- FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
- \
- RGB_IN(r, g, b, p + BPP); \
- r1 += r; \
- g1 += g; \
- b1 += b; \
- lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + \
- FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
- \
- cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + \
- FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> \
- (SCALEBITS + 2)) + 128; \
- cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 - \
- FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> \
- (SCALEBITS + 2)) + 128; \
- \
- cb++; \
- cr++; \
- p += -wrap3 + 2 * BPP; \
- lum += -wrap + 2; \
- } \
- p += wrap3 + (wrap3 - width * BPP); \
- lum += wrap + (wrap - width); \
- cb += dst->linesize[1] - width / 2; \
- cr += dst->linesize[2] - width / 2; \
- } \
-} \
- \
-static void rgb_name ## _to_gray(AVPicture *dst, 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] - width; \
- \
- for(y=0;y<height;y++) { \
- for(x=0;x<width;x++) { \
- RGB_IN(r, g, b, p); \
- q[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
- FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
- q++; \
- p += BPP; \
- } \
- p += src_wrap; \
- q += dst_wrap; \
- } \
-} \
- \
-static void gray_to_ ## rgb_name(AVPicture *dst, 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] - 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 = p[0]; \
- RGB_OUT(q, r, r, r); \
- q += BPP; \
- p ++; \
- } \
- p += src_wrap; \
- q += dst_wrap; \
- } \
-} \
- \
-static void pal8_to_ ## rgb_name(AVPicture *dst, AVPicture *src, \
- int width, int height) \
-{ \
- const unsigned char *p; \
- unsigned char *q; \
- int r, g, b, dst_wrap, src_wrap; \
- int x, y; \
- uint32_t v;\
- const uint32_t *palette;\
-\
- p = src->data[0]; \
- src_wrap = src->linesize[0] - width; \
- palette = (uint32_t *)src->data[1];\
- \
- q = dst->data[0]; \
- dst_wrap = dst->linesize[0] - BPP * width; \
- \
- for(y=0;y<height;y++) { \
- for(x=0;x<width;x++) { \
- v = palette[p[0]];\
- r = (v >> 16) & 0xff;\
- g = (v >> 8) & 0xff;\
- b = (v) & 0xff;\
- RGB_OUT(q, r, g, b); \
- q += BPP; \
- p ++; \
- } \
- p += src_wrap; \
- q += dst_wrap; \
- } \
-}
-
-/* copy bit n to bits 0 ... n - 1 */
-static inline unsigned int bitcopy_n(unsigned int a, int n)
-{
- int mask;
- mask = (1 << n) - 1;
- return (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
-}
-
-/* rgb555 handling */
-
-#define RGB_IN(r, g, b, s)\
-{\
- unsigned int v = ((const uint16_t *)(s))[0];\
- r = bitcopy_n(v >> (10 - 3), 3);\
- g = bitcopy_n(v >> (5 - 3), 3);\
- b = bitcopy_n(v << 3, 3);\
-}
-
-#define RGB_OUT(d, r, g, b)\
-{\
- ((uint16_t *)(d))[0] = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3) | 0x8000;\
-}
-
-#define BPP 2
-
-RGB_FUNCTIONS(rgb555)
-
-#undef RGB_IN
-#undef RGB_OUT
-#undef BPP
-
-/* rgb565 handling */
-
-#define RGB_IN(r, g, b, s)\
-{\
- unsigned int v = ((const uint16_t *)(s))[0];\
- r = bitcopy_n(v >> (11 - 3), 3);\
- g = bitcopy_n(v >> (5 - 2), 2);\
- b = bitcopy_n(v << 3, 3);\
-}
-
-#define RGB_OUT(d, r, g, b)\
-{\
- ((uint16_t *)(d))[0] = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);\
-}
-
-#define BPP 2
-
-RGB_FUNCTIONS(rgb565)
-
-#undef RGB_IN
-#undef RGB_OUT
-#undef BPP
-
-/* bgr24 handling */
-
-#define RGB_IN(r, g, b, s)\
-{\
- b = (s)[0];\
- g = (s)[1];\
- r = (s)[2];\
-}
-
-#define RGB_OUT(d, r, g, b)\
-{\
- (d)[0] = b;\
- (d)[1] = g;\
- (d)[2] = r;\
-}
-
-#define BPP 3
-
-RGB_FUNCTIONS(bgr24)
-
-#undef RGB_IN
-#undef RGB_OUT
-#undef BPP
-
-/* rgb24 handling */
-
-#define RGB_IN(r, g, b, s)\
-{\
- r = (s)[0];\
- g = (s)[1];\
- b = (s)[2];\
-}
-
-#define RGB_OUT(d, r, g, b)\
-{\
- (d)[0] = r;\
- (d)[1] = g;\
- (d)[2] = b;\
-}
-
-#define BPP 3
-
-RGB_FUNCTIONS(rgb24)
-
-#undef RGB_IN
-#undef RGB_OUT
-#undef BPP
-
-/* rgba32 handling */
-
-#define RGB_IN(r, g, b, s)\
-{\
- unsigned int v = ((const uint32_t *)(s))[0];\
- r = (v >> 16) & 0xff;\
- g = (v >> 8) & 0xff;\
- b = v & 0xff;\
-}
-
-#define RGB_OUT(d, r, g, b)\
-{\
- ((uint32_t *)(d))[0] = (0xff << 24) | (r << 16) | (g << 8) | b;\
-}
-
-#define BPP 4
-
-RGB_FUNCTIONS(rgba32)
-
-#undef RGB_IN
-#undef RGB_OUT
-#undef BPP
-
-
-static void rgb24_to_rgb565(AVPicture *dst, 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] - 3 * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - 2 * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- r = p[0];
- g = p[1];
- b = p[2];
-
- ((unsigned short *)q)[0] =
- ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
- q += 2;
- p += 3;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-/* NOTE: we also add a dummy alpha bit */
-static void rgb24_to_rgb555(AVPicture *dst, 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] - 3 * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - 2 * width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- r = p[0];
- g = p[1];
- b = p[2];
-
- ((unsigned short *)q)[0] =
- ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3) | 0x8000;
- q += 2;
- p += 3;
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-static void mono_to_gray(AVPicture *dst, AVPicture *src,
- int width, int height, int xor_mask)
-{
- const unsigned char *p;
- unsigned char *q;
- int v, dst_wrap, src_wrap;
- int y, w;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - ((width + 7) >> 3);
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - width;
- for(y=0;y<height;y++) {
- w = width;
- while (w >= 8) {
- v = *p++ ^ xor_mask;
- q[0] = -(v >> 7);
- q[1] = -((v >> 6) & 1);
- q[2] = -((v >> 5) & 1);
- q[3] = -((v >> 4) & 1);
- q[4] = -((v >> 3) & 1);
- q[5] = -((v >> 2) & 1);
- q[6] = -((v >> 1) & 1);
- q[7] = -((v >> 0) & 1);
- w -= 8;
- q += 8;
- }
- if (w > 0) {
- v = *p++ ^ xor_mask;
- do {
- q[0] = -((v >> 7) & 1);
- q++;
- v <<= 1;
- } while (--w);
- }
- p += src_wrap;
- q += dst_wrap;
- }
-}
-
-static void monowhite_to_gray(AVPicture *dst, AVPicture *src,
- int width, int height)
-{
- mono_to_gray(dst, src, width, height, 0xff);
-}
-
-static void monoblack_to_gray(AVPicture *dst, AVPicture *src,
- int width, int height)
-{
- mono_to_gray(dst, src, width, height, 0x00);
-}
-
-static void gray_to_mono(AVPicture *dst, AVPicture *src,
- int width, int height, int xor_mask)
-{
- int n;
- const uint8_t *s;
- uint8_t *d;
- int j, b, v, n1, src_wrap, dst_wrap, y;
-
- s = src->data[0];
- src_wrap = src->linesize[0] - width;
-
- d = dst->data[0];
- dst_wrap = dst->linesize[0] - ((width + 7) >> 3);
- printf("%d %d\n", width, height);
-
- for(y=0;y<height;y++) {
- n = width;
- while (n >= 8) {
- v = 0;
- for(j=0;j<8;j++) {
- b = s[0];
- s++;
- v = (v << 1) | (b >> 7);
- }
- d[0] = v ^ xor_mask;
- d++;
- n -= 8;
- }
- if (n > 0) {
- n1 = n;
- v = 0;
- while (n > 0) {
- b = s[0];
- s++;
- v = (v << 1) | (b >> 7);
- n--;
+ int tmp=0;
+ for(i=0; i<8; i++){
+ tmp += src[0] + src[1] + src[2] + src[3] + src[4] + src[5] + src[6] + src[7];
+ src += src_wrap;
}
- d[0] = (v << (8 - (n1 & 7))) ^ xor_mask;
- d++;
+ *(dst++) = (tmp + 32)>>6;
+ src += 8 - 8*src_wrap;
}
- s += src_wrap;
- d += dst_wrap;
+ src += 8*src_wrap - 8*width;
+ dst += dst_wrap - width;
}
}
-static void gray_to_monowhite(AVPicture *dst, AVPicture *src,
- int width, int height)
-{
- gray_to_mono(dst, src, width, height, 0xff);
-}
-
-static void gray_to_monoblack(AVPicture *dst, AVPicture *src,
- int width, int height)
+/* return true if yuv planar */
+static inline int is_yuv_planar(const AVPixFmtDescriptor *desc)
{
- gray_to_mono(dst, src, width, height, 0x00);
+ return (!(desc->flags & PIX_FMT_RGB) &&
+ (desc->flags & PIX_FMT_PLANAR));
}
-/* this is maybe slow, but allows for extensions */
-static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b)
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
+ enum AVPixelFormat pix_fmt, int top_band, int left_band)
{
- return ((((r)/47)%6)*6*6+(((g)/47)%6)*6+(((b)/47)%6));
-}
-
-/* XXX: put jpeg quantize code instead */
-static void rgb24_to_pal8(AVPicture *dst, AVPicture *src,
- int width, int height)
-{
- const unsigned char *p;
- unsigned char *q;
- int r, g, b, dst_wrap, src_wrap;
- int x, y, i;
- static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff };
- uint32_t *pal;
-
- p = src->data[0];
- src_wrap = src->linesize[0] - 3 * width;
-
- q = dst->data[0];
- dst_wrap = dst->linesize[0] - width;
-
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- r = p[0];
- g = p[1];
- b = p[2];
-
- q[0] = gif_clut_index(r, g, b);
- q++;
- p += 3;
- }
- p += src_wrap;
- q += dst_wrap;
- }
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+ int y_shift;
+ int x_shift;
- /* build palette */
- pal = (uint32_t *)dst->data[1];
- i = 0;
- for(r = 0; r < 6; r++) {
- for(g = 0; g < 6; g++) {
- for(b = 0; b < 6; b++) {
- pal[i++] = (0xff << 24) | (pal_value[r] << 16) |
- (pal_value[g] << 8) | pal_value[b];
- }
- }
- }
- while (i < 256)
- pal[i++] = 0;
-}
-
-typedef struct ConvertEntry {
- void (*convert)(AVPicture *dst, AVPicture *src, int width, int height);
-} ConvertEntry;
-
-/* add each new convertion function in this table */
-/* constraints;
- - all non YUV modes must convert at least to and from PIX_FMT_RGB24
-*/
-static ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
- [PIX_FMT_YUV420P] = {
- [PIX_FMT_RGB555] = {
- .convert = yuv420p_to_rgb555
- },
- [PIX_FMT_RGB565] = {
- .convert = yuv420p_to_rgb565
- },
- [PIX_FMT_BGR24] = {
- .convert = yuv420p_to_bgr24
- },
- [PIX_FMT_RGB24] = {
- .convert = yuv420p_to_rgb24
- },
- [PIX_FMT_RGBA32] = {
- .convert = yuv420p_to_rgba32
- },
- },
- [PIX_FMT_YUV422P] = {
- [PIX_FMT_RGB555] = {
- .convert = yuv422p_to_rgb555
- },
- [PIX_FMT_RGB565] = {
- .convert = yuv422p_to_rgb565
- },
- [PIX_FMT_BGR24] = {
- .convert = yuv422p_to_bgr24
- },
- [PIX_FMT_RGB24] = {
- .convert = yuv422p_to_rgb24
- },
- [PIX_FMT_RGBA32] = {
- .convert = yuv422p_to_rgba32
- },
- },
- [PIX_FMT_YUV422] = {
- [PIX_FMT_YUV420P] = {
- .convert = yuv422_to_yuv420p,
- },
- },
+ if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB || !is_yuv_planar(desc))
+ return -1;
- [PIX_FMT_RGB24] = {
- [PIX_FMT_YUV420P] = {
- .convert = rgb24_to_yuv420p
- },
- [PIX_FMT_RGB565] = {
- .convert = rgb24_to_rgb565
- },
- [PIX_FMT_RGB555] = {
- .convert = rgb24_to_rgb555
- },
- [PIX_FMT_GRAY8] = {
- .convert = rgb24_to_gray
- },
- [PIX_FMT_PAL8] = {
- .convert = rgb24_to_pal8
- },
- },
- [PIX_FMT_RGBA32] = {
- [PIX_FMT_YUV420P] = {
- .convert = rgba32_to_yuv420p
- },
- [PIX_FMT_GRAY8] = {
- .convert = rgba32_to_gray
- },
- },
- [PIX_FMT_BGR24] = {
- [PIX_FMT_YUV420P] = {
- .convert = bgr24_to_yuv420p
- },
- [PIX_FMT_GRAY8] = {
- .convert = bgr24_to_gray
- },
- },
- [PIX_FMT_RGB555] = {
- [PIX_FMT_YUV420P] = {
- .convert = rgb555_to_yuv420p
- },
- [PIX_FMT_GRAY8] = {
- .convert = rgb555_to_gray
- },
- },
- [PIX_FMT_RGB565] = {
- [PIX_FMT_YUV420P] = {
- .convert = rgb565_to_yuv420p
- },
- [PIX_FMT_GRAY8] = {
- .convert = rgb565_to_gray
- },
- },
- [PIX_FMT_GRAY8] = {
- [PIX_FMT_RGB555] = {
- .convert = gray_to_rgb555
- },
- [PIX_FMT_RGB565] = {
- .convert = gray_to_rgb565
- },
- [PIX_FMT_RGB24] = {
- .convert = gray_to_rgb24
- },
- [PIX_FMT_BGR24] = {
- .convert = gray_to_bgr24
- },
- [PIX_FMT_RGBA32] = {
- .convert = gray_to_rgba32
- },
- [PIX_FMT_MONOWHITE] = {
- .convert = gray_to_monowhite
- },
- [PIX_FMT_MONOBLACK] = {
- .convert = gray_to_monoblack
- },
- },
- [PIX_FMT_MONOWHITE] = {
- [PIX_FMT_GRAY8] = {
- .convert = monowhite_to_gray
- },
- },
- [PIX_FMT_MONOBLACK] = {
- [PIX_FMT_GRAY8] = {
- .convert = monoblack_to_gray
- },
- },
- [PIX_FMT_PAL8] = {
- [PIX_FMT_RGB555] = {
- .convert = pal8_to_rgb555
- },
- [PIX_FMT_RGB565] = {
- .convert = pal8_to_rgb565
- },
- [PIX_FMT_BGR24] = {
- .convert = pal8_to_bgr24
- },
- [PIX_FMT_RGB24] = {
- .convert = pal8_to_rgb24
- },
- [PIX_FMT_RGBA32] = {
- .convert = pal8_to_rgba32
- },
- },
-};
+ y_shift = desc->log2_chroma_h;
+ x_shift = desc->log2_chroma_w;
-static int avpicture_alloc(AVPicture *picture,
- int pix_fmt, int width, int height)
-{
- unsigned int size;
- void *ptr;
+ dst->data[0] = src->data[0] + (top_band * src->linesize[0]) + left_band;
+ dst->data[1] = src->data[1] + ((top_band >> y_shift) * src->linesize[1]) + (left_band >> x_shift);
+ dst->data[2] = src->data[2] + ((top_band >> y_shift) * src->linesize[2]) + (left_band >> x_shift);
- size = avpicture_get_size(pix_fmt, width, height);
- if (size < 0)
- goto fail;
- ptr = av_malloc(size);
- if (!ptr)
- goto fail;
- avpicture_fill(picture, ptr, pix_fmt, width, height);
+ dst->linesize[0] = src->linesize[0];
+ dst->linesize[1] = src->linesize[1];
+ dst->linesize[2] = src->linesize[2];
return 0;
- fail:
- memset(picture, 0, sizeof(AVPicture));
- return -1;
}
-static void avpicture_free(AVPicture *picture)
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
+ enum AVPixelFormat pix_fmt, int padtop, int padbottom, int padleft, int padright,
+ int *color)
{
- av_free(picture->data[0]);
-}
-
-/* XXX: always use linesize. Return -1 if not supported */
-int img_convert(AVPicture *dst, int dst_pix_fmt,
- AVPicture *src, int src_pix_fmt,
- int src_width, int src_height)
-{
- int i, ret, dst_width, dst_height, int_pix_fmt;
- PixFmtInfo *src_pix, *dst_pix;
- ConvertEntry *ce;
- AVPicture tmp1, *tmp = &tmp1;
-
- if (src_pix_fmt < 0 || src_pix_fmt >= PIX_FMT_NB ||
- dst_pix_fmt < 0 || dst_pix_fmt >= PIX_FMT_NB)
- return -1;
- if (src_width <= 0 || src_height <= 0)
- return 0;
-
- dst_width = src_width;
- dst_height = src_height;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+ uint8_t *optr;
+ int y_shift;
+ int x_shift;
+ int yheight;
+ int i, y;
+
+ if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB ||
+ !is_yuv_planar(desc)) return -1;
+
+ for (i = 0; i < 3; i++) {
+ x_shift = i ? desc->log2_chroma_w : 0;
+ y_shift = i ? desc->log2_chroma_h : 0;
+
+ if (padtop || padleft) {
+ memset(dst->data[i], color[i],
+ dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift));
+ }
- dst_pix = &pix_fmt_info[dst_pix_fmt];
- src_pix = &pix_fmt_info[src_pix_fmt];
- if (src_pix_fmt == dst_pix_fmt) {
- /* XXX: incorrect */
- /* same format: just copy */
- for(i = 0; i < dst_pix->nb_components; i++) {
- int w, h;
- w = dst_width;
- h = dst_height;
- if (dst_pix->is_yuv && (i == 1 || i == 2)) {
- w >>= dst_pix->x_chroma_shift;
- h >>= dst_pix->y_chroma_shift;
+ if (padleft || padright) {
+ optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
+ (dst->linesize[i] - (padright >> x_shift));
+ yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
+ for (y = 0; y < yheight; y++) {
+ memset(optr, color[i], (padleft + padright) >> x_shift);
+ optr += dst->linesize[i];
}
- img_copy(dst->data[i], dst->linesize[i],
- src->data[i], src->linesize[i],
- w, h);
}
- return 0;
- }
-
- ce = &convert_table[src_pix_fmt][dst_pix_fmt];
- if (ce->convert) {
- /* specific convertion routine */
- ce->convert(dst, src, dst_width, dst_height);
- return 0;
- }
- /* gray to YUV */
- if (dst_pix->is_yuv && src_pix_fmt == PIX_FMT_GRAY8) {
- int w, h, y;
- uint8_t *d;
-
- img_copy(dst->data[0], dst->linesize[0],
- src->data[0], src->linesize[0],
- dst_width, dst_height);
- /* fill U and V with 128 */
- w = dst_width;
- h = dst_height;
- w >>= dst_pix->x_chroma_shift;
- h >>= dst_pix->y_chroma_shift;
- for(i = 1; i <= 2; i++) {
- d = dst->data[i];
- for(y = 0; y< h; y++) {
- memset(d, 128, w);
- d += dst->linesize[i];
+ if (src) { /* first line */
+ uint8_t *iptr = src->data[i];
+ optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
+ (padleft >> x_shift);
+ memcpy(optr, iptr, (width - padleft - padright) >> x_shift);
+ iptr += src->linesize[i];
+ optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
+ (dst->linesize[i] - (padright >> x_shift));
+ yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
+ for (y = 0; y < yheight; y++) {
+ memset(optr, color[i], (padleft + padright) >> x_shift);
+ memcpy(optr + ((padleft + padright) >> x_shift), iptr,
+ (width - padleft - padright) >> x_shift);
+ iptr += src->linesize[i];
+ optr += dst->linesize[i];
}
}
- return 0;
- }
-
- /* YUV to gray */
- if (src_pix->is_yuv && dst_pix_fmt == PIX_FMT_GRAY8) {
- img_copy(dst->data[0], dst->linesize[0],
- src->data[0], src->linesize[0],
- dst_width, dst_height);
- return 0;
- }
- /* YUV to YUV */
- if (dst_pix->is_yuv && src_pix->is_yuv) {
- int x_shift, y_shift, w, h;
- void (*resize_func)(uint8_t *dst, int dst_wrap,
- uint8_t *src, int src_wrap,
- int width, int height);
-
- /* compute chroma size of the smallest dimensions */
- w = dst_width;
- h = dst_height;
- if (dst_pix->x_chroma_shift >= src_pix->x_chroma_shift)
- w >>= dst_pix->x_chroma_shift;
- else
- w >>= src_pix->x_chroma_shift;
- if (dst_pix->y_chroma_shift >= src_pix->y_chroma_shift)
- h >>= dst_pix->y_chroma_shift;
- else
- h >>= src_pix->y_chroma_shift;
-
- x_shift = (dst_pix->x_chroma_shift - src_pix->x_chroma_shift);
- y_shift = (dst_pix->y_chroma_shift - src_pix->y_chroma_shift);
- if (x_shift == 0 && y_shift == 0) {
- resize_func = img_copy; /* should never happen */
- } else if (x_shift == 0 && y_shift == 1) {
- resize_func = shrink2;
- } else if (x_shift == 1 && y_shift == 1) {
- resize_func = shrink22;
- } else if (x_shift == -1 && y_shift == -1) {
- resize_func = grow22;
- } else if (x_shift == -1 && y_shift == 1) {
- resize_func = conv411;
- } else {
- /* currently not handled */
- return -1;
+ if (padbottom || padright) {
+ optr = dst->data[i] + dst->linesize[i] *
+ ((height - padbottom) >> y_shift) - (padright >> x_shift);
+ memset(optr, color[i],dst->linesize[i] *
+ (padbottom >> y_shift) + (padright >> x_shift));
}
-
- img_copy(dst->data[0], dst->linesize[0],
- src->data[0], src->linesize[0],
- dst_width, dst_height);
-
- for(i = 1;i <= 2; i++)
- resize_func(dst->data[i], dst->linesize[i],
- src->data[i], src->linesize[i],
- dst_width>>dst_pix->x_chroma_shift, dst_height>>dst_pix->y_chroma_shift);
- return 0;
- }
-
- /* try to use an intermediate format */
- if (src_pix_fmt == PIX_FMT_MONOWHITE ||
- src_pix_fmt == PIX_FMT_MONOBLACK ||
- dst_pix_fmt == PIX_FMT_MONOWHITE ||
- dst_pix_fmt == PIX_FMT_MONOBLACK) {
- int_pix_fmt = PIX_FMT_GRAY8;
- } else {
- int_pix_fmt = PIX_FMT_RGB24;
}
- if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0)
- return -1;
- ret = -1;
- if (img_convert(tmp, int_pix_fmt,
- src, src_pix_fmt, src_width, src_height) < 0)
- goto fail1;
- if (img_convert(dst, dst_pix_fmt,
- tmp, int_pix_fmt, dst_width, dst_height) < 0)
- goto fail1;
- ret = 0;
- fail1:
- avpicture_free(tmp);
- return ret;
+ return 0;
}
-
-#ifdef HAVE_MMX
-#define DEINT_INPLACE_LINE_LUM \
- movd_m2r(lum_m4[0],mm0);\
- movd_m2r(lum_m3[0],mm1);\
- movd_m2r(lum_m2[0],mm2);\
- movd_m2r(lum_m1[0],mm3);\
- movd_m2r(lum[0],mm4);\
- punpcklbw_r2r(mm7,mm0);\
- movd_r2m(mm2,lum_m4[0]);\
- punpcklbw_r2r(mm7,mm1);\
- punpcklbw_r2r(mm7,mm2);\
- punpcklbw_r2r(mm7,mm3);\
- punpcklbw_r2r(mm7,mm4);\
- paddw_r2r(mm3,mm1);\
- psllw_i2r(1,mm2);\
- paddw_r2r(mm4,mm0);\
- psllw_i2r(2,mm1);\
- paddw_r2r(mm6,mm2);\
- paddw_r2r(mm2,mm1);\
- psubusw_r2r(mm0,mm1);\
- psrlw_i2r(3,mm1);\
- packuswb_r2r(mm7,mm1);\
- movd_r2m(mm1,lum_m2[0]);
-
-#define DEINT_LINE_LUM \
- movd_m2r(lum_m4[0],mm0);\
- movd_m2r(lum_m3[0],mm1);\
- movd_m2r(lum_m2[0],mm2);\
- movd_m2r(lum_m1[0],mm3);\
- movd_m2r(lum[0],mm4);\
- punpcklbw_r2r(mm7,mm0);\
- punpcklbw_r2r(mm7,mm1);\
- punpcklbw_r2r(mm7,mm2);\
- punpcklbw_r2r(mm7,mm3);\
- punpcklbw_r2r(mm7,mm4);\
- paddw_r2r(mm3,mm1);\
- psllw_i2r(1,mm2);\
- paddw_r2r(mm4,mm0);\
- psllw_i2r(2,mm1);\
- paddw_r2r(mm6,mm2);\
- paddw_r2r(mm2,mm1);\
- psubusw_r2r(mm0,mm1);\
- psrlw_i2r(3,mm1);\
- packuswb_r2r(mm7,mm1);\
- movd_r2m(mm1,dst[0]);
-#endif
-
+#if !HAVE_MMX_EXTERNAL
/* filter parameters: [-1 4 2 4 -1] // 8 */
-static void deinterlace_line(uint8_t *dst, uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum,
- int size)
+static void deinterlace_line_c(uint8_t *dst,
+ const uint8_t *lum_m4, const uint8_t *lum_m3,
+ const uint8_t *lum_m2, const uint8_t *lum_m1,
+ const uint8_t *lum,
+ int size)
{
-#ifndef HAVE_MMX
- uint8_t *cm = cropTbl + MAX_NEG_CROP;
+ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int sum;
for(;size > 0;size--) {
lum++;
dst++;
}
-#else
-
- {
- mmx_t rounder;
- rounder.uw[0]=4;
- rounder.uw[1]=4;
- rounder.uw[2]=4;
- rounder.uw[3]=4;
- pxor_r2r(mm7,mm7);
- movq_m2r(rounder,mm6);
- }
- for (;size > 3; size-=4) {
- DEINT_LINE_LUM
- lum_m4+=4;
- lum_m3+=4;
- lum_m2+=4;
- lum_m1+=4;
- lum+=4;
- dst+=4;
- }
-#endif
}
-static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum,
- int size)
+
+static void deinterlace_line_inplace_c(uint8_t *lum_m4, uint8_t *lum_m3,
+ uint8_t *lum_m2, uint8_t *lum_m1,
+ uint8_t *lum, int size)
{
-#ifndef HAVE_MMX
- uint8_t *cm = cropTbl + MAX_NEG_CROP;
+ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int sum;
for(;size > 0;size--) {
lum_m1++;
lum++;
}
-#else
-
- {
- mmx_t rounder;
- rounder.uw[0]=4;
- rounder.uw[1]=4;
- rounder.uw[2]=4;
- rounder.uw[3]=4;
- pxor_r2r(mm7,mm7);
- movq_m2r(rounder,mm6);
- }
- for (;size > 3; size-=4) {
- DEINT_INPLACE_LINE_LUM
- lum_m4+=4;
- lum_m3+=4;
- lum_m2+=4;
- lum_m1+=4;
- lum+=4;
- }
-#endif
}
+#endif /* !HAVE_MMX_EXTERNAL */
/* deinterlacing : 2 temporal taps, 3 spatial taps linear filter. The
top field is copied as is, but the bottom field is deinterlaced
against the top field. */
static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
- uint8_t *src1, int src_wrap,
+ const uint8_t *src1, int src_wrap,
int width, int height)
{
- uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2;
+ const uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2;
int y;
src_m2 = src1;
}
static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
- int width, int height)
+ int width, int height)
{
uint8_t *src_m1, *src_0, *src_p1, *src_p2;
int y;
uint8_t *buf;
- buf = (uint8_t*)av_malloc(width);
+ buf = av_malloc(width);
src_m1 = src1;
memcpy(buf,src_m1,width);
av_free(buf);
}
-
-/* deinterlace - if not supported return -1 */
-int avpicture_deinterlace(AVPicture *dst, AVPicture *src,
- int pix_fmt, int width, int height)
+int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
+ enum AVPixelFormat pix_fmt, int width, int height)
{
int i;
- if (pix_fmt != PIX_FMT_YUV420P &&
- pix_fmt != PIX_FMT_YUV422P &&
- pix_fmt != PIX_FMT_YUV444P)
+ if (pix_fmt != AV_PIX_FMT_YUV420P &&
+ pix_fmt != AV_PIX_FMT_YUVJ420P &&
+ pix_fmt != AV_PIX_FMT_YUV422P &&
+ pix_fmt != AV_PIX_FMT_YUVJ422P &&
+ pix_fmt != AV_PIX_FMT_YUV444P &&
+ pix_fmt != AV_PIX_FMT_YUV411P &&
+ pix_fmt != AV_PIX_FMT_GRAY8)
return -1;
if ((width & 3) != 0 || (height & 3) != 0)
return -1;
for(i=0;i<3;i++) {
if (i == 1) {
switch(pix_fmt) {
- case PIX_FMT_YUV420P:
+ case AV_PIX_FMT_YUVJ420P:
+ case AV_PIX_FMT_YUV420P:
width >>= 1;
height >>= 1;
break;
- case PIX_FMT_YUV422P:
+ case AV_PIX_FMT_YUV422P:
+ case AV_PIX_FMT_YUVJ422P:
width >>= 1;
break;
+ case AV_PIX_FMT_YUV411P:
+ width >>= 2;
+ break;
default:
break;
}
+ if (pix_fmt == AV_PIX_FMT_GRAY8) {
+ break;
+ }
}
if (src == dst) {
- deinterlace_bottom_field_inplace(src->data[i], src->linesize[i],
+ deinterlace_bottom_field_inplace(dst->data[i], dst->linesize[i],
width, height);
} else {
deinterlace_bottom_field(dst->data[i],dst->linesize[i],
width, height);
}
}
-#ifdef HAVE_MMX
- emms();
-#endif
+ emms_c();
return 0;
}
-
-#undef FIX