diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-11-27 00:20:28 +0300 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-11-27 00:20:28 +0300 |
commit | a7c6e766387e8b3922bc710267c41163017bd316 (patch) | |
tree | 71dd9723b94b1c4686713e831e4e8daba59a4edf /libavcodec/motionpixels.c | |
parent | 7c7d3abf3c64c84b2e096b0e74da4fa9a758d53d (diff) |
Add support for hardcoding the motionpixels rgb to yuv table.
Originally committed as revision 20627 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motionpixels.c')
-rw-r--r-- | libavcodec/motionpixels.c | 56 |
1 files changed, 2 insertions, 54 deletions
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index a0f0d1a455..ac9c6ecf81 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -25,9 +25,7 @@ #define MAX_HUFF_CODES 16 -typedef struct YuvPixel { - int8_t y, v, u; -} YuvPixel; +#include "motionpixels_tablegen.h" typedef struct HuffCode { int code; @@ -51,61 +49,11 @@ typedef struct MotionPixelsContext { int bswapbuf_size; } MotionPixelsContext; -static YuvPixel mp_rgb_yuv_table[1 << 15]; - -static int mp_yuv_to_rgb(int y, int v, int u, int clip_rgb) { - static const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; - int r, g, b; - - r = (1000 * y + 701 * v) / 1000; - g = (1000 * y - 357 * v - 172 * u) / 1000; - b = (1000 * y + 886 * u) / 1000; - if (clip_rgb) - return ((cm[r * 8] & 0xF8) << 7) | ((cm[g * 8] & 0xF8) << 2) | (cm[b * 8] >> 3); - if ((unsigned)r < 32 && (unsigned)g < 32 && (unsigned)b < 32) - return (r << 10) | (g << 5) | b; - return 1 << 15; -} - -static void mp_set_zero_yuv(YuvPixel *p) -{ - int i, j; - - for (i = 0; i < 31; ++i) { - for (j = 31; j > i; --j) - if (!(p[j].u | p[j].v | p[j].y)) - p[j] = p[j - 1]; - for (j = 0; j < 31 - i; ++j) - if (!(p[j].u | p[j].v | p[j].y)) - p[j] = p[j + 1]; - } -} - -static void mp_build_rgb_yuv_table(YuvPixel *p) -{ - int y, v, u, i; - - for (y = 0; y <= 31; ++y) - for (v = -31; v <= 31; ++v) - for (u = -31; u <= 31; ++u) { - i = mp_yuv_to_rgb(y, v, u, 0); - if (i < (1 << 15) && !(p[i].u | p[i].v | p[i].y)) { - p[i].y = y; - p[i].v = v; - p[i].u = u; - } - } - for (i = 0; i < 1024; ++i) - mp_set_zero_yuv(p + i * 32); -} - static av_cold int mp_decode_init(AVCodecContext *avctx) { MotionPixelsContext *mp = avctx->priv_data; - if (!mp_rgb_yuv_table[0].u) { - mp_build_rgb_yuv_table(mp_rgb_yuv_table); - } + motionpixels_tableinit(); mp->avctx = avctx; dsputil_init(&mp->dsp, avctx); mp->changes_map = av_mallocz(avctx->width * avctx->height); |