Indeo Video Interactive 4 and 5 common code and DSP functions.

Reviewed and corrected by myself because there were no other volunteers in the
last weeks.

Originally committed as revision 21531 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 1895 insertions, 0 deletions

diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
new file mode 100644
index 0000000000..46266b15d4
--- /dev/null
+++ b/libavcodec/ivi_common.c
@@ -0,0 +1,940 @@
+/*
+ * common functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
+ *
+ * Copyright (c) 2009 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/ivi_common.c
+ * This file contains functions and data shared by both Indeo4 and
+ * Indeo5 decoders.
+ */
+
+#define ALT_BITSTREAM_READER_LE
+#include "avcodec.h"
+#include "get_bits.h"
+#include "ivi_common.h"
+#include "libavutil/common.h"
+#include "ivi_dsp.h"
+
+/**
+ *  Reverses "nbits" bits of the value "val" and returns the result
+ *  in the least significant bits.
+ */
+static uint16_t inv_bits(uint16_t val, int nbits)
+{
+    uint16_t res;
+
+    if (nbits <= 8) {
+        res = av_reverse[val] >> (8-nbits);
+    } else
+        res = ((av_reverse[val & 0xFF] << 8) + (av_reverse[val >> 8])) >> (16-nbits);
+
+    return res;
+}
+
+int ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag)
+{
+    int         pos, i, j, codes_per_row, prefix, not_last_row;
+    uint16_t    codewords[256]; /* FIXME: move this temporal storage out? */
+    uint8_t     bits[256];
+
+    pos = 0; /* current position = 0 */
+
+    for (i = 0; i < cb->num_rows; i++) {
+        codes_per_row = 1 << cb->xbits[i];
+        not_last_row  = (i != cb->num_rows - 1);
+        prefix        = ((1 << i) - 1) << (cb->xbits[i] + not_last_row);
+
+        for (j = 0; j < codes_per_row; j++) {
+            if (pos >= 256) /* Some Indeo5 codebooks can have more than 256 */
+                break;      /* elements, but only 256 codes are allowed! */
+
+            bits[pos] = i + cb->xbits[i] + not_last_row;
+            if (bits[pos] > IVI_VLC_BITS)
+                return -1; /* invalid descriptor */
+
+            codewords[pos] = inv_bits((prefix | j), bits[pos]);
+            if (!bits[pos])
+                bits[pos] = 1;
+
+            pos++;
+        }//for j
+    }//for i
+
+    /* number of codewords = pos */
+    return init_vlc(vlc, IVI_VLC_BITS, pos, bits, 1, 1, codewords, 2, 2,
+                    (flag & 1) | INIT_VLC_LE);
+}
+
+int ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc)
+{
+    int tab_sel, i;
+
+    tab_sel = get_bits(gb, 3);
+    if (tab_sel == 7) {
+        /* custom huffman table (explicitly encoded) */
+        desc->num_rows = get_bits(gb, 4);
+
+        for (i = 0; i < desc->num_rows; i++)
+            desc->xbits[i] = get_bits(gb, 4);
+    }
+
+    return tab_sel;
+}
+
+int ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2)
+{
+    return    desc1->num_rows != desc2->num_rows
+           || memcmp(desc1->xbits, desc2->xbits, desc1->num_rows);
+}
+
+void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src)
+{
+    dst->num_rows = src->num_rows;
+    memcpy(dst->xbits, src->xbits, src->num_rows);
+}
+
+int av_cold ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg)
+{
+    int         p, b;
+    uint32_t    b_width, b_height, align_fac, width_aligned, height_aligned, buf_size;
+    IVIBandDesc *band;
+
+    ff_ivi_free_buffers(planes);
+
+    /* fill in the descriptor of the luminance plane */
+    planes[0].width     = cfg->pic_width;
+    planes[0].height    = cfg->pic_height;
+    planes[0].num_bands = cfg->luma_bands;
+
+    /* fill in the descriptors of the chrominance planes */
+    planes[1].width     = planes[2].width     = (cfg->pic_width  + 3) >> 2;
+    planes[1].height    = planes[2].height    = (cfg->pic_height + 3) >> 2;
+    planes[1].num_bands = planes[2].num_bands = cfg->chroma_bands;
+
+    for (p = 0; p < 3; p++) {
+        planes[p].bands = av_mallocz(planes[p].num_bands * sizeof(IVIBandDesc));
+        if (!planes[p].bands)
+            return AVERROR(ENOMEM);
+
+        /* select band dimensions: if there is only one band then it
+         *  has the full size, if there are several bands each of them
+         *  has only half size */
+        b_width  = planes[p].num_bands == 1 ? planes[p].width  : (planes[p].width  + 1) >> 1;
+        b_height = planes[p].num_bands == 1 ? planes[p].height : (planes[p].height + 1) >> 1;
+
+        /* luma   band buffers will be aligned on 16x16 (max macroblock size) */
+        /* chroma band buffers will be aligned on   8x8 (max macroblock size) */
+        align_fac       = p ? 8 : 16;
+        width_aligned   = FFALIGN(b_width , align_fac);
+        height_aligned  = FFALIGN(b_height, align_fac);
+        buf_size        = width_aligned * height_aligned * sizeof(int16_t);
+
+        for (b = 0; b < planes[p].num_bands; b++) {
+            band = &planes[p].bands[b]; /* select appropriate plane/band */
+            band->plane    = p;
+            band->band_num = b;
+            band->width    = b_width;
+            band->height   = b_height;
+            band->pitch    = width_aligned;
+            band->bufs[0]  = av_malloc(buf_size);
+            band->bufs[1]  = av_malloc(buf_size);
+            if (!band->bufs[0] || !band->bufs[1])
+                return AVERROR(ENOMEM);
+
+            /* allocate the 3rd band buffer for scalability mode */
+            if (cfg->luma_bands > 1) {
+                band->bufs[2] = av_malloc(buf_size);
+                if (!band->bufs[2])
+                    return AVERROR(ENOMEM);
+            }
+
+            planes[p].bands[0].huff_desc.num_rows = 0; /* reset custom vlc */
+        }
+    }
+
+    return 0;
+}
+
+void av_cold ff_ivi_free_buffers(IVIPlaneDesc *planes)
+{
+    int p, b, t;
+
+    for (p = 0; p < 3; p++) {
+        for (b = 0; b < planes[p].num_bands; b++) {
+            av_freep(&planes[p].bands[b].bufs[0]);
+            av_freep(&planes[p].bands[b].bufs[1]);
+            av_freep(&planes[p].bands[b].bufs[2]);
+
+            for (t = 0; t < planes[p].bands[b].num_tiles; t++)
+                av_freep(&planes[p].bands[b].tiles[t].mbs);
+            av_freep(&planes[p].bands[b].tiles);
+        }
+        av_freep(&planes[p].bands);
+    }
+}
+
+int av_cold ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height)
+{
+    int         p, b, x, y, x_tiles, y_tiles, t_width, t_height;
+    IVIBandDesc *band;
+    IVITile     *tile, *ref_tile;
+
+    for (p = 0; p < 3; p++) {
+        t_width  = !p ? tile_width  : (tile_width  + 3) >> 2;
+        t_height = !p ? tile_height : (tile_height + 3) >> 2;
+
+        for (b = 0; b < planes[p].num_bands; b++) {
+            band = &planes[p].bands[b];
+            x_tiles = IVI_NUM_TILES(band->width, t_width);
+            y_tiles = IVI_NUM_TILES(band->height, t_height);
+            band->num_tiles = x_tiles * y_tiles;
+
+            av_freep(&band->tiles);
+            band->tiles = av_mallocz(band->num_tiles * sizeof(IVITile));
+            if (!band->tiles)
+                return AVERROR(ENOMEM);
+
+            tile = band->tiles;
+
+            /* use the first luma band as reference for motion vectors
+             * and quant */
+            ref_tile = planes[0].bands[0].tiles;
+
+            for (y = 0; y < band->height; y += t_height) {
+                for (x = 0; x < band->width; x += t_width) {
+                    tile->xpos     = x;
+                    tile->ypos     = y;
+                    tile->width    = FFMIN(band->width - x,  t_width);
+                    tile->height   = FFMIN(band->height - y, t_height);
+                    tile->is_empty = tile->data_size = 0;
+                    /* calculate number of macroblocks */
+                    tile->num_MBs  = IVI_MBs_PER_TILE(tile->width, tile->height,
+                                                      band->mb_size);
+
+                    av_freep(&tile->mbs);
+                    tile->mbs = av_malloc(tile->num_MBs * sizeof(IVIMbInfo));
+                    if (!tile->mbs)
+                        return AVERROR(ENOMEM);
+
+                    tile->ref_mbs = 0;
+                    if (p || b) {
+                        tile->ref_mbs = ref_tile->mbs;
+                        ref_tile++;
+                    }
+
+                    tile++;
+                }
+            }
+
+        }// for b
+    }// for p
+
+    return 0;
+}
+
+int ff_ivi_dec_tile_data_size(GetBitContext *gb)
+{
+    int    len;
+
+    len = 0;
+    if (get_bits1(gb)) {
+        len = get_bits(gb, 8);
+        if (len == 255)
+            len = get_bits_long(gb, 24);
+    }
+
+    /* align the bitstream reader on the byte boundary */
+    align_get_bits(gb);
+
+    return len;
+}
+
+int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile)
+{
+    int         mbn, blk, num_blocks, num_coeffs, blk_size, scan_pos, run, val,
+                pos, is_intra, mc_type, mv_x, mv_y, col_mask;
+    uint8_t     col_flags[8];
+    int32_t     prev_dc, trvec[64];
+    uint32_t    cbp, sym, lo, hi, quant, buf_offs, q;
+    IVIMbInfo   *mb;
+    RVMapDesc   *rvmap = band->rv_map;
+    void (*mc_with_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+    void (*mc_no_delta_func)  (int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+    const uint8_t   *base_tab, *scale_tab;
+
+    prev_dc = 0; /* init intra prediction for the DC coefficient */
+
+    blk_size   = band->blk_size;
+    col_mask   = blk_size - 1; /* column mask for tracking non-zero coeffs */
+    num_blocks = (band->mb_size != blk_size) ? 4 : 1; /* number of blocks per mb */
+    num_coeffs = blk_size * blk_size;
+    if (blk_size == 8) {
+        mc_with_delta_func = ff_ivi_mc_8x8_delta;
+        mc_no_delta_func   = ff_ivi_mc_8x8_no_delta;
+    } else {
+        mc_with_delta_func = ff_ivi_mc_4x4_delta;
+        mc_no_delta_func   = ff_ivi_mc_4x4_no_delta;
+    }
+
+    for (mbn = 0, mb = tile->mbs; mbn < tile->num_MBs; mb++, mbn++) {
+        is_intra = !mb->type;
+        cbp      = mb->cbp;
+        buf_offs = mb->buf_offs;
+
+        quant = av_clip(band->glob_quant + mb->q_delta, 0, 23);
+
+        base_tab  = is_intra ? band->intra_base  : band->inter_base;
+        scale_tab = is_intra ? band->intra_scale : band->inter_scale;
+
+        if (!is_intra) {
+            mv_x = mb->mv_x;
+            mv_y = mb->mv_y;
+            if (!band->is_halfpel) {
+                mc_type = 0; /* we have only fullpel vectors */
+            } else {
+                mc_type = ((mv_y & 1) << 1) | (mv_x & 1);
+                mv_x >>= 1;
+                mv_y >>= 1; /* convert halfpel vectors into fullpel ones */
+            }
+        }
+
+        for (blk = 0; blk < num_blocks; blk++) {
+            /* adjust block position in the buffer according to its number */
+            if (blk & 1) {
+                buf_offs += blk_size;
+            } else if (blk == 2) {
+                buf_offs -= blk_size;
+                buf_offs += blk_size * band->pitch;
+            }
+
+            if (cbp & 1) { /* block coded ? */
+                scan_pos = -1;
+                memset(trvec, 0, num_coeffs*sizeof(trvec[0])); /* zero transform vector */
+                memset(col_flags, 0, sizeof(col_flags));      /* zero column flags */
+
+                while (scan_pos <= num_coeffs) {
+                    sym = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
+                    if (sym == rvmap->eob_sym)
+                        break; /* End of block */
+
+                    if (sym == rvmap->esc_sym) { /* Escape - run/val explicitly coded using 3 vlc codes */
+                        run = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1) + 1;
+                        lo  = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
+                        hi  = get_vlc2(gb, band->blk_vlc->table, IVI_VLC_BITS, 1);
+                        val = IVI_TOSIGNED((hi << 6) | lo); /* merge them and convert into signed val */
+                    } else {
+                        run = rvmap->runtab[sym];
+                        val = rvmap->valtab[sym];
+                    }
+
+                    /* de-zigzag and dequantize */
+                    scan_pos += run;
+                    if (scan_pos >= num_coeffs)
+                        break;
+                    pos = band->scan[scan_pos];
+
+                    if (IVI_DEBUG && !val)
+                        av_log(NULL, AV_LOG_ERROR, "Val = 0 encountered!\n");
+
+                    q = (base_tab[pos] * scale_tab[quant]) >> 8;
+                    if (q > 1)
+                        val = val * q + FFSIGN(val) * ((q >> 1) - (q & 1));
+                    trvec[pos] = val;
+                    col_flags[pos & col_mask] |= val; /* track columns containing non-zero coeffs */
+                }// while
+
+                if (scan_pos >= num_coeffs && sym != rvmap->eob_sym)
+                    return -1; /* corrupt block data */
+
+                /* undoing DC coeff prediction for intra-blocks */
+                if (is_intra && band->is_2d_trans) {
+                    prev_dc      += trvec[0];
+                    trvec[0]      = prev_dc;
+                    col_flags[0] |= !!prev_dc;
+                }
+
+                /* apply inverse transform */
+                band->inv_transform(trvec, band->buf + buf_offs,
+                                    band->pitch, col_flags);
+
+                /* apply motion compensation */
+                if (!is_intra)
+                    mc_with_delta_func(band->buf + buf_offs,
+                                       band->ref_buf + buf_offs + mv_y * band->pitch + mv_x,
+                                       band->pitch, mc_type);
+            } else {
+                /* block not coded */
+                /* for intra blocks apply the dc slant transform */
+                /* for inter - perform the motion compensation without delta */
+                if (is_intra && band->dc_transform) {
+                    band->dc_transform(&prev_dc, band->buf + buf_offs,
+                                       band->pitch, blk_size);
+                } else
+                    mc_no_delta_func(band->buf + buf_offs,
+                                     band->ref_buf + buf_offs + mv_y * band->pitch + mv_x,
+                                     band->pitch, mc_type);
+            }
+
+            cbp >>= 1;
+        }// for blk
+    }// for mbn
+
+    align_get_bits(gb);
+
+    return 0;
+}
+
+void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
+                               IVITile *tile, int32_t mv_scale)
+{
+    int             x, y, need_mc, mbn, blk, num_blocks, mv_x, mv_y, mc_type;
+    int             offs, mb_offset, row_offset;
+    IVIMbInfo       *mb, *ref_mb;
+    const int16_t   *src;
+    int16_t         *dst;
+    void (*mc_no_delta_func)(int16_t *buf, const int16_t *ref_buf, uint32_t pitch,
+                             int mc_type);
+
+    offs       = tile->ypos * band->pitch + tile->xpos;
+    mb         = tile->mbs;
+    ref_mb     = tile->ref_mbs;
+    row_offset = band->mb_size * band->pitch;
+    need_mc    = 0; /* reset the mc tracking flag */
+
+    for (y = tile->ypos; y < (tile->ypos + tile->height); y += band->mb_size) {
+        mb_offset = offs;
+
+        for (x = tile->xpos; x < (tile->xpos + tile->width); x += band->mb_size) {
+            mb->xpos     = x;
+            mb->ypos     = y;
+            mb->buf_offs = mb_offset;
+
+            mb->type = 1; /* set the macroblocks type = INTER */
+            mb->cbp  = 0; /* all blocks are empty */
+
+            if (!band->qdelta_present && !band->plane && !band->band_num) {
+                mb->q_delta = band->glob_quant;
+                mb->mv_x    = 0;
+                mb->mv_y    = 0;
+            }
+
+            if (band->inherit_qdelta && ref_mb)
+                mb->q_delta = ref_mb->q_delta;
+
+            if (band->inherit_mv) {
+                /* motion vector inheritance */
+                if (mv_scale) {
+                    mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
+                    mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale);
+                } else {
+                    mb->mv_x = ref_mb->mv_x;
+                    mb->mv_y = ref_mb->mv_y;
+                }
+                need_mc |= mb->mv_x || mb->mv_y; /* tracking non-zero motion vectors */
+            }
+
+            mb++;
+            if (ref_mb)
+                ref_mb++;
+            mb_offset += band->mb_size;
+        } // for x
+        offs += row_offset;
+    } // for y
+
+    if (band->inherit_mv && need_mc) { /* apply motion compensation if there is at least one non-zero motion vector */
+        num_blocks = (band->mb_size != band->blk_size) ? 4 : 1; /* number of blocks per mb */
+        mc_no_delta_func = (band->blk_size == 8) ? ff_ivi_mc_8x8_no_delta
+                                                 : ff_ivi_mc_4x4_no_delta;
+
+        for (mbn = 0, mb = tile->mbs; mbn < tile->num_MBs; mb++, mbn++) {
+            mv_x = mb->mv_x;
+            mv_y = mb->mv_y;
+            if (!band->is_halfpel) {
+                mc_type = 0; /* we have only fullpel vectors */
+            } else {
+                mc_type = ((mv_y & 1) << 1) | (mv_x & 1);
+                mv_x >>= 1;
+                mv_y >>= 1; /* convert halfpel vectors into fullpel ones */
+            }
+
+            for (blk = 0; blk < num_blocks; blk++) {
+                /* adjust block position in the buffer according with its number */
+                offs = mb->buf_offs + band->blk_size * ((blk & 1) + !!(blk & 2) * band->pitch);
+                mc_no_delta_func(band->buf + offs,
+                                 band->ref_buf + offs + mv_y * band->pitch + mv_x,
+                                 band->pitch, mc_type);
+            }
+        }
+    } else {
+        /* copy data from the reference tile into the current one */
+        src = band->ref_buf + tile->ypos * band->pitch + tile->xpos;
+        dst = band->buf     + tile->ypos * band->pitch + tile->xpos;
+        for (y = 0; y < tile->height; y++) {
+            memcpy(dst, src, tile->width*sizeof(band->buf[0]));
+            src += band->pitch;
+            dst += band->pitch;
+        }
+    }
+}
+
+
+#if IVI_DEBUG
+uint16_t ivi_calc_band_checksum (IVIBandDesc *band)
+{
+    int         x, y;
+    int16_t     *src, checksum;
+
+    src = band->buf;
+    checksum = 0;
+
+    for (y = 0; y < band->height; src += band->pitch, y++)
+        for (x = 0; x < band->width; x++)
+            checksum += src[x];
+
+    return checksum;
+}
+
+int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch)
+{
+    int         x, y, result;
+    uint8_t     t1, t2;
+    int16_t    *src;
+
+    src = band->buf;
+    result = 0;
+
+    for (y = 0; y < band->height; src += band->pitch, y++) {
+        for (x = 0; x < band->width; x++) {
+            t1 = av_clip(src[x] + 128, 0, 255);
+            t2 = ref[x];
+            if (t1 != t2) {
+                av_log(NULL, AV_LOG_ERROR, "Data mismatch: row %d, column %d\n",
+                       y / band->blk_size, x / band->blk_size);
+                result = -1;
+            }
+        }
+        ref += pitch;
+    }
+
+    return result;
+}
+#endif
+
+void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch)
+{
+    int             x, y;
+    const int16_t   *src  = plane->bands[0].buf;
+    uint32_t        pitch = plane->bands[0].pitch;
+
+    for (y = 0; y < plane->height; y++) {
+        for (x = 0; x < plane->width; x++)
+            dst[x] = av_clip_uint8(src[x] + 128);
+        src += pitch;
+        dst += dst_pitch;
+    }
+}
+
+
+/**
+ * These are 2x8 predefined Huffman codebooks for coding macroblock/block
+ * signals. They are specified using "huffman descriptors" in order to
+ * avoid huge static tables. The decoding tables will be generated at
+ * startup from these descriptors.
+ */
+const IVIHuffDesc ff_ivi_mb_huff_desc[8] = {
+    {8,  {0, 4, 5, 4, 4, 4, 6, 6}},
+    {12, {0, 2, 2, 3, 3, 3, 3, 5, 3, 2, 2, 2}},
+    {12, {0, 2, 3, 4, 3, 3, 3, 3, 4, 3, 2, 2}},
+    {12, {0, 3, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2}},
+    {13, {0, 4, 4, 3, 3, 3, 3, 2, 3, 3, 2, 1, 1}},
+    {9,  {0, 4, 4, 4, 4, 3, 3, 3, 2}},
+    {10, {0, 4, 4, 4, 4, 3, 3, 2, 2, 2}},
+    {12, {0, 4, 4, 4, 3, 3, 2, 3, 2, 2, 2, 2}}
+};
+
+const IVIHuffDesc ff_ivi_blk_huff_desc[8] = {
+    {10, {1, 2, 3, 4, 4, 7, 5, 5, 4, 1}},
+    {11, {2, 3, 4, 4, 4, 7, 5, 4, 3, 3, 2}},
+    {12, {2, 4, 5, 5, 5, 5, 6, 4, 4, 3, 1, 1}},
+    {13, {3, 3, 4, 4, 5, 6, 6, 4, 4, 3, 2, 1, 1}},
+    {11, {3, 4, 4, 5, 5, 5, 6, 5, 4, 2, 2}},
+    {13, {3, 4, 5, 5, 5, 5, 6, 4, 3, 3, 2, 1, 1}},
+    {13, {3, 4, 5, 5, 5, 6, 5, 4, 3, 3, 2, 1, 1}},
+    {9,  {3, 4, 4, 5, 5, 5, 6, 5, 5}}
+};
+
+
+/**
+ *  Run-value (RLE) tables.
+ */
+const RVMapDesc ff_ivi_rvmap_tabs[9] = {
+{   /* MapTab0 */
+    5, /* eob_sym */
+    2, /* esc_sym */
+    /* run table */
+    {1,  1,  0,  1,  1,  0,  1,  1,  2,  2,  1,  1,  1,  1,  3,  3,
+     1,  1,  2,  2,  1,  1,  4,  4,  1,  1,  1,  1,  2,  2,  5,  5,
+     1,  1,  3,  3,  1,  1,  6,  6,  1,  2,  1,  2,  7,  7,  1,  1,
+     8,  8,  1,  1,  4,  2,  1,  4,  2,  1,  3,  3,  1,  1,  1,  9,
+     9,  1,  2,  1,  2,  1,  5,  5,  1,  1, 10, 10,  1,  1,  3,  3,
+     2,  2,  1,  1, 11, 11,  6,  4,  4,  1,  6,  1,  2,  1,  2, 12,
+     8,  1, 12,  7,  8,  7,  1, 16,  1, 16,  1,  3,  3, 13,  1, 13,
+     2,  2,  1, 15,  1,  5, 14, 15,  1,  5, 14,  1, 17,  8, 17,  8,
+     1,  4,  4,  2,  2,  1, 25, 25, 24, 24,  1,  3,  1,  3,  1,  8,
+     6,  7,  6,  1, 18,  8, 18,  1,  7, 23,  2,  2, 23,  1,  1, 21,
+    22,  9,  9, 22, 19,  1, 21,  5, 19,  5,  1, 33, 20, 33, 20,  8,
+     4,  4,  1, 32,  2,  2,  8,  3, 32, 26,  3,  1,  7,  7, 26,  6,
+     1,  6,  1,  1, 16,  1, 10,  1, 10,  2, 16, 29, 28,  2, 29, 28,
+     1, 27,  5,  8,  5, 27,  1,  8,  3,  7,  3, 31, 41, 31,  1, 41,
+     6,  1,  6,  7,  4,  4,  1,  1,  2,  1,  2, 11, 34, 30, 11,  1,
+    30, 15, 15, 34, 36, 40, 36, 40, 35, 35, 37, 37, 39, 39, 38, 38},
+
+    /* value table */
+    { 1,  -1,   0,   2,  -2,   0,   3,  -3,   1,  -1,   4,  -4,   5,  -5,   1,  -1,
+      6,  -6,   2,  -2,   7,  -7,   1,  -1,   8,  -8,   9,  -9,   3,  -3,   1,  -1,
+     10, -10,   2,  -2,  11, -11,   1,  -1,  12,   4, -12,  -4,   1,  -1,  13, -13,
+      1,  -1,  14, -14,   2,   5,  15,  -2,  -5, -15,  -3,   3,  16, -16,  17,   1,
+     -1, -17,   6,  18,  -6, -18,   2,  -2,  19, -19,   1,  -1,  20, -20,   4,  -4,
+      7,  -7,  21, -21,   1,  -1,   2,   3,  -3,  22,  -2, -22,   8,  23,  -8,   1,
+      2, -23,  -1,   2,  -2,  -2,  24,   1, -24,  -1,  25,   5,  -5,   1, -25,  -1,
+      9,  -9,  26,   1, -26,   3,   1,  -1,  27,  -3,  -1, -27,   1,   3,  -1,  -3,
+     28,  -4,   4,  10, -10, -28,   1,  -1,   1,  -1,  29,   6, -29,  -6,  30,  -4,
+      3,   3,  -3, -30,   1,   4,  -1,  31,  -3,   1,  11, -11,  -1, -31,  32,  -1,
+     -1,   2,  -2,   1,   1, -32,   1,   4,  -1,  -4,  33,  -1,   1,   1,  -1,   5,
+      5,  -5, -33,  -1, -12,  12,  -5,  -7,   1,   1,   7,  34,   4,  -4,  -1,   4,
+    -34,  -4,  35,  36,  -2, -35,  -2, -36,   2,  13,   2,  -1,   1, -13,   1,  -1,
+     37,   1,  -5,   6,   5,  -1,  38,  -6,  -8,   5,   8,  -1,   1,   1, -37,  -1,
+      5,  39,  -5,  -5,   6,  -6, -38, -39, -14,  40,  14,   2,   1,   1,  -2, -40,
+     -1,  -2,   2,  -1,  -1,  -1,   1,   1,   1,  -1,   1,  -1,   1,  -1,   1,  -1}
+},{
+    /* MapTab1 */
+    0,  /* eob_sym */
+    38, /* esc_sym */
+    /* run table */
+    {0,  1,  1,  2,  2,  3,  3,  4,  4,  5,  5,  6,  8,  6,  8,  7,
+     7,  9,  9, 10, 10, 11, 11,  1, 12,  1, 12, 13, 13, 16, 14, 16,
+    14, 15, 15, 17, 17, 18,  0, 18, 19, 20, 21, 19, 22, 21, 20, 22,
+    25, 24,  2, 25, 24, 23, 23,  2, 26, 28, 26, 28, 29, 27, 29, 27,
+    33, 33,  1, 32,  1,  3, 32, 30, 36,  3, 36, 30, 31, 31, 35, 34,
+    37, 41, 34, 35, 37,  4, 41,  4, 49,  8,  8, 49, 40, 38,  5, 38,
+    40, 39,  5, 39, 42, 43, 42,  7, 57,  6, 43, 44,  6, 50,  7, 44,
+    57, 48, 50, 48, 45, 45, 46, 47, 51, 46, 47, 58,  1, 51, 58,  1,
+    52, 59, 53,  9, 52, 55, 55, 59, 53, 56, 54, 56, 54,  9, 64, 64,
+    60, 63, 60, 63, 61, 62, 61, 62,  2, 10,  2, 10, 11,  1, 11, 13,
+    12,  1, 12, 13, 16, 16,  8,  8, 14,  3,  3, 15, 14, 15,  4,  4,
+     1, 17, 17,  5,  1,  7,  7,  5,  6,  1,  2,  2,  6, 22,  1, 25,
+    21, 22,  8, 24,  1, 21, 25, 24,  8, 18, 18, 23,  9, 20, 23, 33,
+    29, 33, 20,  1, 19,  1, 29, 36,  9, 36, 19, 41, 28, 57, 32,  3,
+    28,  3,  1, 27, 49, 49,  1, 32, 26, 26,  2,  4,  4,  7, 57, 41,
+     2,  7, 10,  5, 37, 16, 10, 27,  8,  8, 13, 16, 37, 13,  1,  5},
+
+    /* value table */
+    {0,   1,  -1,   1,  -1,   1,  -1,   1,  -1,   1,  -1,   1,   1,  -1,  -1,   1,
+    -1,   1,  -1,   1,  -1,   1,  -1,   2,   1,  -2,  -1,   1,  -1,   1,   1,  -1,
+    -1,   1,  -1,   1,  -1,   1,   0,  -1,   1,   1,   1,  -1,   1,  -1,  -1,  -1,
+     1,   1,   2,  -1,  -1,   1,  -1,  -2,   1,   1,  -1,  -1,   1,   1,  -1,  -1,
+     1,  -1,   3,   1,  -3,   2,  -1,   1,   1,  -2,  -1,  -1,  -1,   1,   1,   1,
+     1,   1,  -1,  -1,  -1,   2,  -1,  -2,   1,   2,  -2,  -1,   1,   1,   2,  -1,
+    -1,   1,  -2,  -1,   1,   1,  -1,   2,   1,   2,  -1,   1,  -2,  -1,  -2,  -1,
+    -1,   1,   1,  -1,   1,  -1,   1,   1,   1,  -1,  -1,   1,   4,  -1,  -1,  -4,
+     1,   1,   1,   2,  -1,  -1,   1,  -1,  -1,   1,  -1,  -1,   1,  -2,   1,  -1,
+     1,   1,  -1,  -1,   1,   1,  -1,  -1,   3,   2,  -3,  -2,   2,   5,  -2,   2,
+     2,  -5,  -2,  -2,  -2,   2,  -3,   3,   2,   3,  -3,   2,  -2,  -2,   3,  -3,
+     6,   2,  -2,   3,  -6,   3,  -3,  -3,   3,   7,  -4,   4,  -3,   2,  -7,   2,
+     2,  -2,  -4,   2,   8,  -2,  -2,  -2,   4,   2,  -2,   2,   3,   2,  -2,  -2,
+     2,   2,  -2,  -8,  -2,   9,  -2,   2,  -3,  -2,   2,  -2,   2,   2,   2,   4,
+    -2,  -4,  10,   2,   2,  -2,  -9,  -2,   2,  -2,   5,   4,  -4,   4,  -2,   2,
+    -5,  -4,  -3,   4,   2,  -3,   3,  -2,  -5,   5,   3,   3,  -2,  -3, -10,  -4}
+},{
+    /* MapTab2 */
+    2,  /* eob_sym */
+    11, /* esc_sym */
+    /* run table */
+    {1,  1,  0,  2,  2,  1,  1,  3,  3,  4,  4,  0,  1,  1,  5,  5,
+     2,  2,  6,  6,  7,  7,  1,  8,  1,  8,  3,  3,  9,  9,  1,  2,
+     2,  1,  4, 10,  4, 10, 11, 11,  1,  5, 12, 12,  1,  5, 13, 13,
+     3,  3,  6,  6,  2,  2, 14, 14, 16, 16, 15,  7, 15,  8,  8,  7,
+     1,  1, 17, 17,  4,  4,  1,  1, 18, 18,  2,  2,  5,  5, 25,  3,
+     9,  3, 25,  9, 19, 24, 19, 24,  1, 21, 20,  1, 21, 22, 20, 22,
+    23, 23,  8,  6, 33,  6,  8, 33,  7,  7, 26, 26,  1, 32,  1, 32,
+    28,  4, 28, 10, 29, 27, 27, 10, 41,  4, 29,  2,  2, 41, 36, 31,
+    49, 31, 34, 30, 34, 36, 30, 35,  1, 49, 11,  5, 35, 11,  1,  3,
+     3,  5, 37, 37,  8, 40,  8, 40, 12, 12, 42, 42,  1, 38, 16, 57,
+     1,  6, 16, 39, 38,  6,  7,  7, 13, 13, 39, 43,  2, 43, 57,  2,
+    50,  9, 44,  9, 50,  4, 15, 48, 44,  4,  1, 15, 48, 14, 14,  1,
+    45, 45,  8,  3,  5,  8, 51, 47,  3, 46, 46, 47,  5, 51,  1, 17,
+    17, 58,  1, 58,  2, 52, 52,  2, 53,  7, 59,  6,  6, 56, 53, 55,
+     7, 55,  1, 54, 59, 56, 54, 10,  1, 10,  4, 60,  1, 60,  8,  4,
+     8, 64, 64, 61,  1, 63,  3, 63, 62, 61,  5, 11,  5,  3, 11, 62},
+
+    /* value table */
+    { 1,  -1,   0,   1,  -1,   2,  -2,   1,  -1,   1,  -1,   0,   3,  -3,   1,  -1,
+      2,  -2,   1,  -1,   1,  -1,   4,   1,  -4,  -1,   2,  -2,   1,  -1,   5,   3,
+     -3,  -5,   2,   1,  -2,  -1,   1,  -1,   6,   2,   1,  -1,  -6,  -2,   1,  -1,
+      3,  -3,   2,  -2,   4,  -4,   1,  -1,   1,  -1,   1,   2,  -1,   2,  -2,  -2,
+      7,  -7,   1,  -1,   3,  -3,   8,  -8,   1,  -1,   5,  -5,   3,  -3,   1,   4,
+      2,  -4,  -1,  -2,   1,   1,  -1,  -1,   9,   1,   1,  -9,  -1,   1,  -1,  -1,
+      1,  -1,   3,  -3,   1,   3,  -3,  -1,   3,  -3,   1,  -1,  10,   1, -10,  -1,
+      1,   4,  -1,   2,   1,  -1,   1,  -2,   1,  -4,  -1,   6,  -6,  -1,   1,   1,
+      1,  -1,   1,   1,  -1,  -1,  -1,   1,  11,  -1,  -2,   4,  -1,   2, -11,   5,
+     -5,  -4,  -1,   1,   4,   1,  -4,  -1,  -2,   2,   1,  -1,  12,   1,  -2,   1,
+    -12,   4,   2,   1,  -1,  -4,   4,  -4,   2,  -2,  -1,   1,   7,  -1,  -1,  -7,
+     -1,  -3,   1,   3,   1,   5,   2,   1,  -1,  -5,  13,  -2,  -1,   2,  -2, -13,
+      1,  -1,   5,   6,   5,  -5,   1,   1,  -6,   1,  -1,  -1,  -5,  -1,  14,   2,
+     -2,   1, -14,  -1,   8,   1,  -1,  -8,   1,   5,   1,   5,  -5,   1,  -1,   1,
+     -5,  -1,  15,   1,  -1,  -1,  -1,   3, -15,  -3,   6,   1,  16,  -1,   6,  -6,
+     -6,   1,  -1,   1, -16,   1,   7,  -1,   1,  -1,  -6,  -3,   6,  -7,   3,  -1}
+},{
+    /* MapTab3 */
+    0,  /* eob_sym */
+    35, /* esc_sym */
+    /* run table */
+    {0,  1,  1,  2,  2,  3,  3,  4,  4,  1,  1,  5,  5,  6,  6,  7,
+     7,  8,  8,  9,  9,  2,  2, 10, 10,  1,  1, 11, 11, 12, 12,  3,
+     3, 13, 13,  0, 14, 14, 16, 15, 16, 15,  4,  4, 17,  1, 17,  1,
+     5,  5, 18, 18,  2,  2,  6,  6,  8, 19,  7,  8,  7, 19, 20, 20,
+    21, 21, 22, 24, 22, 24, 23, 23,  1,  1, 25, 25,  3,  3, 26, 26,
+     9,  9, 27, 27, 28, 28, 33, 29,  4, 33, 29,  1,  4,  1, 32, 32,
+     2,  2, 31, 10, 30, 10, 30, 31, 34, 34,  5,  5, 36, 36, 35, 41,
+    35, 11, 41, 11, 37,  1,  8,  8, 37,  6,  1,  6, 40,  7,  7, 40,
+    12, 38, 12, 39, 39, 38, 49, 13, 49, 13,  3, 42,  3, 42, 16, 16,
+    43, 43, 14, 14,  1,  1, 44, 15, 44, 15,  2,  2, 57, 48, 50, 48,
+    57, 50,  4, 45, 45,  4, 46, 47, 47, 46,  1, 51,  1, 17, 17, 51,
+     8,  9,  9,  5, 58,  8, 58,  5, 52, 52, 55, 56, 53, 56, 55, 59,
+    59, 53, 54,  1,  6, 54,  7,  7,  6,  1,  2,  3,  2,  3, 64, 60,
+    60, 10, 10, 64, 61, 62, 61, 63,  1, 63, 62,  1, 18, 24, 18,  4,
+    25,  4,  8, 21, 21,  1, 24, 22, 25, 22,  8, 11, 19, 11, 23,  1,
+    20, 23, 19, 20,  5, 12,  5,  1, 16,  2, 12, 13,  2, 13,  1, 16},
+
+    /* value table */
+    { 0,   1,  -1,   1,  -1,   1,  -1,   1,  -1,   2,  -2,   1,  -1,   1,  -1,   1,
+     -1,   1,  -1,   1,  -1,   2,  -2,   1,  -1,   3,  -3,   1,  -1,   1,  -1,   2,
+     -2,   1,  -1,   0,   1,  -1,   1,   1,  -1,  -1,   2,  -2,   1,   4,  -1,  -4,
+      2,  -2,   1,  -1,  -3,   3,   2,  -2,   2,   1,   2,  -2,  -2,  -1,   1,  -1,
+      1,  -1,   1,   1,  -1,  -1,   1,  -1,   5,  -5,   1,  -1,   3,  -3,   1,  -1,
+      2,  -2,   1,  -1,   1,  -1,   1,   1,   3,  -1,  -1,   6,  -3,  -6,  -1,   1,
+      4,  -4,   1,   2,   1,  -2,  -1,  -1,   1,  -1,   3,  -3,   1,  -1,   1,   1,
+     -1,   2,  -1,  -2,   1,   7,  -3,   3,  -1,   3,  -7,  -3,   1,  -3,   3,  -1,
+      2,   1,  -2,   1,  -1,  -1,   1,   2,  -1,  -2,  -4,  -1,   4,   1,   2,  -2,
+      1,  -1,  -2,   2,   8,  -8,  -1,   2,   1,  -2,  -5,   5,   1,  -1,  -1,   1,
+     -1,   1,   4,  -1,   1,  -4,  -1,  -1,   1,   1,   9,   1,  -9,   2,  -2,  -1,
+     -4,   3,  -3,  -4,  -1,   4,   1,   4,   1,  -1,   1,  -1,   1,   1,  -1,   1,
+     -1,  -1,  -1,  10,   4,   1,   4,  -4,  -4, -10,   6,   5,  -6,  -5,   1,  -1,
+      1,   3,  -3,  -1,   1,  -1,  -1,  -1,  11,   1,   1, -11,  -2,  -2,   2,   5,
+     -2,  -5,  -5,   2,  -2,  12,   2,  -2,   2,   2,   5,  -3,  -2,   3,  -2, -12,
+     -2,   2,   2,   2,  -5,   3,   5,  13,  -3,   7,  -3,  -3,  -7,   3, -13,   3}
+},{
+    /* MapTab4 */
+    0,  /* eob_sym */
+    34, /* esc_sym */
+    /* run table */
+    {0,  1,  1,  1,  2,  2,  1,  3,  3,  1,  1,  1,  4,  4,  1,  5,
+     2,  1,  5,  2,  1,  1,  6,  6,  1,  1,  1,  1,  1,  7,  3,  1,
+     2,  3,  0,  1,  2,  7,  1,  1,  1,  8,  1,  1,  8,  1,  1,  1,
+     9,  1,  9,  1,  2,  1,  1,  2,  1,  1, 10,  4,  1, 10,  1,  4,
+     1,  1,  1,  1,  1,  3,  1,  1,  1,  3,  2,  1,  5,  1,  1,  1,
+     2,  5,  1, 11,  1, 11,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+     2,  1,  6,  1,  6,  1,  1,  2,  1,  1,  1,  1,  1,  1,  1, 12,
+     3,  1, 12,  1,  1,  1,  2,  1,  1,  3,  1,  1,  1,  1,  1,  1,
+     4,  1,  1,  1,  2,  1,  1,  4,  1,  1,  1,  1,  1,  1,  2,  1,
+     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  1,  2,  1,  1,  5,
+     1,  1,  1,  1,  1,  7,  1,  7,  1,  1,  2,  3,  1,  1,  1,  1,
+     5,  1,  1,  1,  1,  1,  1,  2, 13,  1,  1,  1,  1,  1,  1,  1,
+     1,  1,  1,  1,  1,  1,  1,  1, 13,  2,  1,  1,  4,  1,  1,  1,
+     3,  1,  6,  1,  1,  1, 14,  1,  1,  1,  1,  1, 14,  6,  1,  1,
+     1,  1, 15,  2,  4,  1,  2,  3, 15,  1,  1,  1,  8,  1,  1,  8,
+     1,  1,  1,  1,  1,  1,  1,  1,  2,  1,  1,  1,  1,  1,  1,  1},
+
+    /* value table */
+    { 0,   1,  -1,   2,   1,  -1,  -2,   1,  -1,   3,  -3,   4,   1,  -1,  -4,   1,
+      2,   5,  -1,  -2,  -5,   6,   1,  -1,  -6,   7,  -7,   8,  -8,   1,   2,   9,
+      3,  -2,   0,  -9,  -3,  -1,  10, -10,  11,   1, -11,  12,  -1, -12,  13, -13,
+      1,  14,  -1, -14,   4,  15, -15,  -4,  16, -16,   1,   2,  17,  -1, -17,  -2,
+     18, -18,  19, -19,  20,   3, -20,  21, -21,  -3,   5,  22,   2, -22, -23,  23,
+     -5,  -2,  24,   1, -24,  -1,  25, -25,  26, -26, -27,  27,  28,  29, -28, -29,
+      6,  30,   2, -31,  -2, -30,  31,  -6, -32,  32,  33, -33,  34, -35, -34,   1,
+      4, -36,  -1,  35,  37,  36,   7, -37,  38,  -4, -38,  39,  41,  40, -40, -39,
+      3,  42, -43, -41,  -7, -42,  43,  -3,  44, -44,  45, -45,  46,  47,   8, -47,
+    -48, -46,  50, -50,  48,  49,  51, -49,  52, -52,   5, -51,  -8, -53,  53,   3,
+    -56,  56,  55,  54, -54,   2,  60,  -2, -55,  58,   9,  -5,  59,  57, -57, -63,
+     -3, -58, -60, -61,  61, -59, -62,  -9,   1,  64,  62,  69, -64,  63,  65, -67,
+    -68,  66, -65,  68, -66, -69,  67, -70,  -1,  10,  71, -71,   4,  73,  72,  70,
+      6, -76,  -3,  74, -78, -74,   1,  78,  80, -72, -75,  76,  -1,   3, -73,  79,
+     75,  77,   1,  11,  -4, -79, -10,  -6,  -1, -77, -83, -80,   2,  81, -84,  -2,
+     83, -81,  82, -82,  84, -87, -86,  85, -11, -85,  86, -89,  87, -88,  88,  89}
+},{
+    /* MapTab5 */
+    2,  /* eob_sym */
+    33, /* esc_sym */
+    /* run table */
+    {1,  1,  0,  2,  1,  2,  1,  3,  3,  1,  1,  4,  4,  2,  2,  1,
+     1,  5,  5,  6,  1,  6,  1,  7,  7,  3,  3,  2,  8,  2,  8,  1,
+     1,  0,  9,  9,  1,  1, 10,  4, 10,  4, 11, 11,  2,  1,  2,  1,
+    12, 12,  3,  3,  1,  1, 13,  5,  5, 13, 14,  1,  1, 14,  2,  2,
+     6,  6, 15,  1,  1, 15, 16,  4,  7, 16,  4,  7,  1,  1,  3,  3,
+     8,  8,  2,  2,  1,  1, 17, 17,  1,  1, 18, 18,  5,  5,  2,  2,
+     1,  1,  9, 19,  9, 19, 20,  3,  3, 20,  1, 10, 21,  1, 10,  4,
+     4, 21, 22,  6,  6, 22,  1,  1, 23, 24,  2,  2, 23, 24, 11,  1,
+     1, 11,  7, 25,  7,  1,  1, 25,  8,  8,  3, 26,  3,  1, 12,  2,
+     2, 26,  1, 12,  5,  5, 27,  4,  1,  4,  1, 27, 28,  1, 28, 13,
+     1, 13,  2, 29,  2,  1, 32,  6,  1, 30, 14, 29, 14,  6,  3, 31,
+     3,  1, 30,  1, 32, 31, 33,  9, 33,  1,  1,  7,  9,  7,  2,  2,
+     1,  1,  4, 36, 34,  4,  5, 10, 10,  5, 34,  1,  1, 35,  8,  8,
+    36,  3, 35,  1, 15,  3,  2,  1, 16, 15, 16,  2, 37,  1, 37,  1,
+     1,  1,  6,  6, 38,  1, 38, 11,  1, 39, 39, 40, 11,  2, 41,  4,
+    40,  1,  2,  4,  1,  1,  1, 41,  3,  1,  3,  1,  5,  7,  5,  7},
+
+    /* value table */
+    { 1,  -1,   0,   1,   2,  -1,  -2,   1,  -1,   3,  -3,   1,  -1,   2,  -2,   4,
+     -4,   1,  -1,   1,   5,  -1,  -5,   1,  -1,   2,  -2,   3,   1,  -3,  -1,   6,
+     -6,   0,   1,  -1,   7,  -7,   1,   2,  -1,  -2,   1,  -1,   4,   8,  -4,  -8,
+      1,  -1,   3,  -3,   9,  -9,   1,   2,  -2,  -1,   1,  10, -10,  -1,   5,  -5,
+      2,  -2,   1,  11, -11,  -1,   1,   3,   2,  -1,  -3,  -2,  12, -12,   4,  -4,
+      2,  -2,  -6,   6,  13, -13,   1,  -1,  14, -14,   1,  -1,   3,  -3,   7,  -7,
+     15, -15,   2,   1,  -2,  -1,   1,   5,  -5,  -1, -16,   2,   1,  16,  -2,   4,
+     -4,  -1,   1,   3,  -3,  -1,  17, -17,   1,   1,  -8,   8,  -1,  -1,   2,  18,
+    -18,  -2,   3,   1,  -3,  19, -19,  -1,   3,  -3,   6,   1,  -6,  20,   2,   9,
+     -9,  -1, -20,  -2,   4,  -4,   1,  -5,  21,   5, -21,  -1,   1, -22,  -1,   2,
+     22,  -2,  10,   1, -10,  23,   1,   4, -23,   1,   2,  -1,  -2,  -4,  -7,   1,
+      7, -24,  -1,  24,  -1,  -1,   1,   3,  -1, -25,  25,   4,  -3,  -4,  11, -11,
+     26, -26,   6,   1,   1,  -6,  -5,  -3,   3,   5,  -1, -27,  27,   1,   4,  -4,
+     -1,  -8,  -1,  28,   2,   8, -12, -28,  -2,  -2,   2,  12,  -1,  29,   1, -29,
+     30, -30,   5,  -5,   1, -31,  -1,   3,  31,  -1,   1,   1,  -3, -13,   1,  -7,
+     -1, -32,  13,   7,  32,  33, -33,  -1,  -9, -34,   9,  34,  -6,   5,   6,  -5}
+},{
+    /* MapTab6 */
+    2,  /* eob_sym */
+    13, /* esc_sym */
+    /* run table */
+    {1,  1,  0,  1,  1,  2,  2,  1,  1,  3,  3,  1,  1,  0,  2,  2,
+     4,  1,  4,  1,  1,  1,  5,  5,  1,  1,  6,  6,  2,  2,  1,  1,
+     3,  3,  7,  7,  1,  1,  8,  8,  1,  1,  2,  2,  1,  9,  1,  9,
+     4,  4, 10,  1,  1, 10,  1,  1, 11, 11,  3,  3,  1,  2,  1,  2,
+     1,  1, 12, 12,  5,  5,  1,  1, 13,  1,  1, 13,  2,  2,  1,  1,
+     6,  6,  1,  1,  4, 14,  4, 14,  3,  1,  3,  1,  1,  1, 15,  7,
+    15,  2,  2,  7,  1,  1,  1,  8,  1,  8, 16, 16,  1,  1,  1,  1,
+     2,  1,  1,  2,  1,  1,  3,  5,  5,  3,  4,  1,  1,  4,  1,  1,
+    17, 17,  9,  1,  1,  9,  2,  2,  1,  1, 10, 10,  1,  6,  1,  1,
+     6, 18,  1,  1, 18,  1,  1,  1,  2,  2,  3,  1,  3,  1,  1,  1,
+     4,  1, 19,  1, 19,  7,  1,  1, 20,  1,  4, 20,  1,  7, 11,  2,
+     1, 11, 21,  2,  8,  5,  1,  8,  1,  5, 21,  1,  1,  1, 22,  1,
+     1, 22,  1,  1,  3,  3,  1, 23,  2, 12, 24,  1,  1,  2,  1,  1,
+    12, 23,  1,  1, 24,  1,  1,  1,  4,  1,  1,  1,  2,  1,  6,  6,
+     4,  2,  1,  1,  1,  1,  1,  1,  1, 14, 13,  3,  1, 25,  9, 25,
+    14,  1,  9,  3, 13,  1,  1,  1,  1,  1, 10,  1,  1,  2, 10,  2},
+
+    /* value table */
+    {-20,  -1,   0,   2,  -2,   1,  -1,   3,  -3,   1,  -1,   4,  -4,   0,   2,  -2,
+       1,   5,  -1,  -5,   6,  -6,   1,  -1,   7,  -7,   1,  -1,   3,  -3,   8,  -8,
+       2,  -2,   1,  -1,   9,  -9,   1,  -1,  10, -10,   4,  -4,  11,   1, -11,  -1,
+       2,  -2,   1,  12, -12,  -1,  13, -13,   1,  -1,   3,  -3,  14,   5, -14,  -5,
+     -15,  15,  -1,   1,   2,  -2,  16, -16,   1,  17, -17,  -1,   6,  -6,  18, -18,
+       2,  -2, -19,  19,  -3,   1,   3,  -1,   4,  20,  -4,   1, -21,  21,   1,   2,
+      -1,  -7,   7,  -2,  22, -22,  23,   2, -23,  -2,   1,  -1, -24,  24, -25,  25,
+      -8, -26,  26,   8, -27,  27,   5,   3,  -3,  -5,  -4,  28, -28,   4,  29, -29,
+       1,  -1,  -2, -30,  30,   2,   9,  -9, -31,  31,   2,  -2, -32,   3,  32, -33,
+      -3,   1,  33, -34,  -1,  34, -35,  35, -10,  10,  -6,  36,   6, -36,  37, -37,
+      -5,  38,   1, -38,  -1,   3,  39, -39,  -1,  40,   5,   1, -40,  -3,   2, -11,
+     -41,  -2,   1,  11,  -3,  -4,  41,   3,  42,   4,  -1, -43, -42,  43,   1, -44,
+      45,  -1,  44, -45,  -7,   7, -46,   1, -12,   2,   1, -47,  46,  12,  47,  48,
+      -2,  -1, -48,  49,  -1, -50, -49,  50,  -6, -51,  51,  52, -13,  53,  -4,   4,
+       6,  13, -53, -52, -54,  55,  54, -55, -56,  -2,   2,  -8,  56,   1,  -3,  -1,
+       2,  58,   3,   8,  -2,  57, -58, -60, -59, -57,  -3,  60,  59, -14,   3,  14}
+},{
+    /* MapTab7 */
+    2,  /* eob_sym */
+    38, /* esc_sym */
+    /* run table */
+    {1,  1,  0,  2,  2,  1,  1,  3,  3,  4,  4,  5,  5,  1,  1,  6,
+     6,  2,  2,  7,  7,  8,  8,  1,  1,  3,  3,  9,  9, 10, 10,  1,
+     1,  2,  2,  4,  4, 11,  0, 11, 12, 12, 13, 13,  1,  1,  5,  5,
+    14, 14, 15, 16, 15, 16,  3,  3,  1,  6,  1,  6,  2,  2,  7,  7,
+     8,  8, 17, 17,  1,  1,  4,  4, 18, 18,  2,  2,  1, 19,  1, 20,
+    19, 20, 21, 21,  3,  3, 22, 22,  5,  5, 24,  1,  1, 23,  9, 23,
+    24,  9,  2,  2, 10,  1,  1, 10,  6,  6, 25,  4,  4, 25,  7,  7,
+    26,  8,  1,  8,  3,  1, 26,  3, 11, 11, 27, 27,  2, 28,  1,  2,
+    28,  1, 12, 12,  5,  5, 29, 13, 13, 29, 32,  1,  1, 33, 31, 30,
+    32,  4, 30, 33,  4, 31,  3, 14,  1,  1,  3, 34, 34,  2,  2, 14,
+     6,  6, 35, 36, 35, 36,  1, 15,  1, 16, 16, 15,  7,  9,  7,  9,
+    37,  8,  8, 37,  1,  1, 39,  2, 38, 39,  2, 40,  5, 38, 40,  5,
+     3,  3,  4,  4, 10, 10,  1,  1,  1,  1, 41,  2, 41,  2,  6,  6,
+     1,  1, 11, 42, 11, 43,  3, 42,  3, 17,  4, 43,  1, 17,  7,  1,
+     8, 44,  4,  7, 44,  5,  8,  2,  5,  1,  2, 48, 45,  1, 12, 45,
+    12, 48, 13, 13,  1,  9,  9, 46,  1, 46, 47, 47, 49, 18, 18, 49},
+
+    /* value table */
+    { 1,  -1,   0,   1,  -1,   2,  -2,   1,  -1,   1,  -1,   1,  -1,   3,  -3,   1,
+     -1,  -2,   2,   1,  -1,   1,  -1,   4,  -4,  -2,   2,   1,  -1,   1,  -1,   5,
+     -5,  -3,   3,   2,  -2,   1,   0,  -1,   1,  -1,   1,  -1,   6,  -6,   2,  -2,
+      1,  -1,   1,   1,  -1,  -1,  -3,   3,   7,   2,  -7,  -2,  -4,   4,   2,  -2,
+      2,  -2,   1,  -1,   8,  -8,   3,  -3,   1,  -1,  -5,   5,   9,   1,  -9,   1,
+     -1,  -1,   1,  -1,  -4,   4,   1,  -1,   3,  -3,   1, -10,  10,   1,   2,  -1,
+     -1,  -2,   6,  -6,   2,  11, -11,  -2,   3,  -3,   1,  -4,   4,  -1,   3,  -3,
+      1,   3,  12,  -3,  -5, -12,  -1,   5,   2,  -2,   1,  -1,  -7,   1,  13,   7,
+     -1, -13,   2,  -2,   4,  -4,   1,   2,  -2,  -1,   1,  14, -14,   1,   1,   1,
+     -1,  -5,  -1,  -1,   5,  -1,  -6,   2, -15,  15,   6,   1,  -1,  -8,   8,  -2,
+     -4,   4,   1,   1,  -1,  -1,  16,   2, -16,  -2,   2,  -2,   4,   3,  -4,  -3,
+     -1,  -4,   4,   1, -17,  17,  -1,  -9,   1,   1,   9,   1,  -5,  -1,  -1,   5,
+     -7,   7,   6,  -6,   3,  -3,  18, -18,  19, -19,   1, -10,  -1,  10,  -5,   5,
+     20, -20,  -3,   1,   3,   1,   8,  -1,  -8,   2,   7,  -1, -21,  -2,   5,  21,
+      5,  -1,  -7,  -5,   1,  -6,  -5, -11,   6,  22,  11,   1,   1, -22,  -3,  -1,
+      3,  -1,   3,  -3, -23,   4,  -4,   1,  23,  -1,   1,  -1,   1,  -2,   2,  -1}
+},{
+    /* MapTab8 */
+    4,  /* eob_sym */
+    11, /* esc_sym */
+    /* run table */
+    {1,  1,  1,  1,  0,  2,  2,  1,  1,  3,  3,  0,  1,  1,  2,  2,
+     4,  4,  1,  1,  5,  5,  1,  1,  2,  2,  3,  3,  6,  6,  1,  1,
+     7,  7,  8,  1,  8,  2,  2,  1,  4,  4,  1,  3,  1,  3,  9,  9,
+     2,  2,  1,  5,  1,  5, 10, 10,  1,  1, 11, 11,  3,  6,  3,  4,
+     4,  6,  2,  2,  1, 12,  1, 12,  7, 13,  7, 13,  1,  1,  8,  8,
+     2,  2, 14, 14, 16, 15, 16,  5,  5,  1,  3, 15,  1,  3,  4,  4,
+     1,  1, 17, 17,  2,  2,  6,  6,  1, 18,  1, 18, 22, 21, 22, 21,
+    25, 24, 25, 19,  9, 20,  9, 23, 19, 24, 20,  3, 23,  7,  3,  1,
+     1,  7, 28, 26, 29,  5, 28, 26,  5,  8, 29,  4,  8, 27,  2,  2,
+     4, 27,  1,  1, 10, 36, 10, 33, 33, 36, 30,  1, 32, 32,  1, 30,
+     6, 31, 31, 35,  3,  6, 11, 11,  3,  2, 35,  2, 34,  1, 34,  1,
+    37, 37, 12,  7, 12,  5, 41,  5,  4,  7,  1,  8, 13,  4,  1, 41,
+    13, 38,  8, 38,  9,  1, 40, 40,  9,  1, 39,  2,  2, 49, 39, 42,
+     3,  3, 14, 16, 49, 14, 16, 42, 43, 43,  6,  6, 15,  1,  1, 15,
+    44, 44,  1,  1, 50, 48,  4,  5,  4,  7,  5,  2, 10, 10, 48,  7,
+    50, 45,  2,  1, 45,  8,  8,  1, 46, 46,  3, 47, 47,  3,  1,  1},
+
+    /* value table */
+    { 1,  -1,   2,  -2,   0,   1,  -1,   3,  -3,   1,  -1,   0,   4,  -4,   2,  -2,
+      1,  -1,   5,  -5,   1,  -1,   6,  -6,   3,  -3,   2,  -2,   1,  -1,   7,  -7,
+      1,  -1,   1,   8,  -1,   4,  -4,  -8,   2,  -2,   9,   3,  -9,  -3,   1,  -1,
+      5,  -5,  10,   2, -10,  -2,   1,  -1,  11, -11,   1,  -1,  -4,   2,   4,   3,
+     -3,  -2,   6,  -6,  12,   1, -12,  -1,   2,   1,  -2,  -1,  13, -13,   2,  -2,
+      7,  -7,   1,  -1,   1,   1,  -1,   3,  -3,  14,   5,  -1, -14,  -5,   4,  -4,
+     15, -15,   1,  -1,   8,  -8,  -3,   3,  16,   1, -16,  -1,   1,   1,  -1,  -1,
+      1,   1,  -1,   1,   2,   1,  -2,   1,  -1,  -1,  -1,   6,  -1,   3,  -6,  17,
+    -17,  -3,   1,   1,   1,   4,  -1,  -1,  -4,   3,  -1,   5,  -3,  -1,  -9,   9,
+     -5,   1,  18, -18,   2,   1,  -2,   1,  -1,  -1,   1,  19,  -1,   1, -19,  -1,
+      4,   1,  -1,   1,   7,  -4,  -2,   2,  -7,  10,  -1, -10,   1,  20,  -1, -20,
+      1,  -1,   2,   4,  -2,   5,   1,  -5,   6,  -4,  21,   4,   2,  -6, -21,  -1,
+     -2,   1,  -4,  -1,  -3,  22,  -1,   1,   3, -22,  -1,  11, -11,   1,   1,   1,
+      8,  -8,   2,   2,  -1,  -2,  -2,  -1,   1,  -1,  -5,   5,   2,  23, -23,  -2,
+      1,  -1,  24, -24,  -1,  -1,   7,   6,  -7,   5,  -6,  12,  -3,   3,   1,  -5,
+      1,   1, -12,  25,  -1,  -5,   5, -25,  -1,   1,   9,   1,  -1,  -9,  26, -26}
+}
+};
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h
new file mode 100644
index 0000000000..72c5c7a889
--- /dev/null
+++ b/libavcodec/ivi_common.h
@@ -0,0 +1,319 @@
+/*
+ * common functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
+ *
+ * Copyright (c) 2009 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/ivi_common.h
+ * This file contains structures and macros shared by both Indeo4 and
+ * Indeo5 decoders.
+ */
+
+#ifndef AVCODEC_IVI_COMMON_H
+#define AVCODEC_IVI_COMMON_H
+
+#include "avcodec.h"
+#include "get_bits.h"
+#include <stdint.h>
+
+#define IVI_DEBUG 0
+
+#define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes
+
+/**
+ *  huffman codebook descriptor
+ */
+typedef struct {
+    int32_t     num_rows;
+    uint8_t     xbits[16];
+} IVIHuffDesc;
+
+extern const IVIHuffDesc ff_ivi_mb_huff_desc[8];  ///< static macroblock huffman tables
+extern const IVIHuffDesc ff_ivi_blk_huff_desc[8]; ///< static block huffman tables
+
+
+/**
+ *  run-value (RLE) table descriptor
+ */
+typedef struct {
+    uint8_t     eob_sym; ///< end of block symbol
+    uint8_t     esc_sym; ///< escape symbol
+    uint8_t     runtab[256];
+    int8_t      valtab[256];
+} RVMapDesc;
+
+extern const RVMapDesc ff_ivi_rvmap_tabs[9];
+
+
+/**
+ *  information for Indeo macroblock (16x16, 8x8 or 4x4)
+ */
+typedef struct {
+    int16_t     xpos;
+    int16_t     ypos;
+    uint32_t    buf_offs; ///< address in the output buffer for this mb
+    uint8_t     type;     ///< macroblock type: 0 - INTRA, 1 - INTER
+    uint8_t     cbp;      ///< coded block pattern
+    uint8_t     q_delta;  ///< quant delta
+    int8_t      mv_x;     ///< motion vector (x component)
+    int8_t      mv_y;     ///< motion vector (y component)
+} IVIMbInfo;
+
+
+/**
+ *  information for Indeo tile
+ */
+typedef struct {
+    int         xpos;
+    int         ypos;
+    int         width;
+    int         height;
+    int         is_empty;  ///< = 1 if this tile doesn't contain any data
+    int         data_size; ///< size of the data in bytes
+    int         num_MBs;   ///< number of macroblocks in this tile
+    IVIMbInfo   *mbs;      ///< array of macroblock descriptors
+    IVIMbInfo   *ref_mbs;  ///< ptr to the macroblock descriptors of the reference tile
+} IVITile;
+
+
+/**
+ *  information for Indeo wavelet band
+ */
+typedef struct {
+    int             plane;          ///< plane number this band belongs to
+    int             band_num;       ///< band number
+    int             width;
+    int             height;
+    const uint8_t   *data_ptr;      ///< ptr to the first byte of the band data
+    int             data_size;      ///< size of the band data
+    int16_t         *buf;           ///< pointer to the output buffer for this band
+    int16_t         *ref_buf;       ///< pointer to the reference frame buffer (for motion compensation)
+    int16_t         *bufs[3];       ///< array of pointers to the band buffers
+    int             pitch;          ///< pitch associated with the buffers above
+    int             is_empty;       ///< = 1 if this band doesn't contain any data
+    int             mb_size;        ///< macroblock size
+    int             blk_size;       ///< block size
+    int             is_halfpel;     ///< precision of the motion compensation: 0 - fullpel, 1 - halfpel
+    int             inherit_mv;     ///< tells if motion vector is inherited from reference macroblock
+    int             inherit_qdelta; ///< tells if quantiser delta is inherited from reference macroblock
+    int             qdelta_present; ///< tells if Qdelta signal is present in the bitstream (Indeo5 only)
+    int             quant_mat;      ///< dequant matrix index
+    int             glob_quant;     ///< quant base for this band
+    const uint8_t   *scan;          ///< ptr to the scan pattern
+
+    int             huff_sel;       ///< huffman table for this band
+    IVIHuffDesc     huff_desc;      ///< table descriptor associated with the selector above
+    VLC             *blk_vlc;       ///< ptr to the vlc table for decoding block data
+    VLC             blk_vlc_cust;   ///< custom block vlc table
+
+    uint16_t        *dequant_intra; ///< ptr to dequant tables for intra blocks
+    uint16_t        *dequant_inter; ///< ptr dequant tables for inter blocks
+    int             num_corr;       ///< number of correction entries
+    uint8_t         corr[61*2];     ///< rvmap correction pairs
+    int             rvmap_sel;      ///< rvmap table selector
+    RVMapDesc       *rv_map;        ///< ptr to the RLE table for this band
+    int             num_tiles;      ///< number of tiles in this band
+    IVITile         *tiles;         ///< array of tile descriptors
+    void (*inv_transform)(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags); ///< inverse transform function pointer
+    void (*dc_transform) (const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);   ///< dc transform function pointer, it may be NULL
+    int             is_2d_trans;    ///< 1 indicates that the two-dimensional inverse transform is used
+    int32_t         checksum;       ///< for debug purposes
+    int             checksum_present;
+    int             bufsize;        ///< band buffer size in bytes
+    const uint8_t   *intra_base;    ///< quantization matrix for intra blocks
+    const uint8_t   *inter_base;    ///< quantization matrix for inter blocks
+    const uint8_t   *intra_scale;   ///< quantization coefficient for intra blocks
+    const uint8_t   *inter_scale;   ///< quantization coefficient for inter blocks
+} IVIBandDesc;
+
+
+/**
+ *  color plane (luma or chroma) information
+ */
+typedef struct {
+    uint16_t    width;
+    uint16_t    height;
+    uint8_t     num_bands;  ///< number of bands this plane subdivided into
+    IVIBandDesc *bands;     ///< array of band descriptors
+} IVIPlaneDesc;
+
+
+typedef struct {
+    uint16_t    pic_width;
+    uint16_t    pic_height;
+    uint16_t    chroma_width;
+    uint16_t    chroma_height;
+    uint16_t    tile_width;
+    uint16_t    tile_height;
+    uint8_t     luma_bands;
+    uint8_t     chroma_bands;
+} IVIPicConfig;
+
+/** compares some properties of two pictures */
+static inline int ivi_pic_config_cmp(IVIPicConfig *str1, IVIPicConfig *str2)
+{
+    return (str1->pic_width    != str2->pic_width    || str1->pic_height    != str2->pic_height    ||
+            str1->chroma_width != str2->chroma_width || str1->chroma_height != str2->chroma_height ||
+            str1->tile_width   != str2->tile_width   || str1->tile_height   != str2->tile_height   ||
+            str1->luma_bands   != str2->luma_bands   || str1->chroma_bands  != str2->chroma_bands);
+}
+
+/** calculate number of tiles in a stride */
+#define IVI_NUM_TILES(stride, tile_size) (((stride) + (tile_size) - 1) / (tile_size))
+
+/** calculate number of macroblocks in a tile */
+#define IVI_MBs_PER_TILE(tile_width, tile_height, mb_size) \
+    ((((tile_width) + (mb_size) - 1) / (mb_size)) * (((tile_height) + (mb_size) - 1) / (mb_size)))
+
+/** convert unsigned values into signed ones (the sign is in the LSB) */
+/* TODO: find a way to calculate this without the conditional using bit magic */
+#define IVI_TOSIGNED(val) (-(((val) >> 1) ^ -((val) & 1)))
+
+/** scales motion vector */
+static inline int ivi_scale_mv(int mv, int mv_scale)
+{
+    return (mv + (mv > 0) + (mv_scale - 1)) >> mv_scale;
+}
+
+/**
+ *  Generates a huffman codebook from the given descriptor
+ *  and converts it into the FFmpeg VLC table.
+ *
+ *  @param cb   [in]  pointer to codebook descriptor
+ *  @param vlc  [out] where to place the generated VLC table
+ *  @param flag [in]  flag: 1 - for static or 0 for dynamic tables
+ *  @return     result code: 0 - OK, -1 = error (invalid codebook descriptor)
+ */
+int  ff_ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag);
+
+/**
+ *  Decodes a huffman codebook descriptor from the bitstream.
+ *
+ *  @param gb   [in,out] the GetBit context
+ *  @param desc [out] ptr to descriptor to be filled with data
+ *  @return     selector indicating huffman table:
+ *              (0...6 - predefined, 7 - custom one supplied with the bitstream)
+ */
+int  ff_ivi_dec_huff_desc(GetBitContext *gb, IVIHuffDesc *desc);
+
+/**
+ *  Compares two huffman codebook descriptors.
+ *
+ *  @param desc1    [in] ptr to the 1st descriptor to compare
+ *  @param desc2    [in] ptr to the 2nd descriptor to compare
+ *  @return         comparison result: 0 - equal, 1 - not equal
+ */
+int  ff_ivi_huff_desc_cmp(const IVIHuffDesc *desc1, const IVIHuffDesc *desc2);
+
+/**
+ *  Copies huffman codebook descriptors.
+ *
+ *  @param dst  [out] ptr to the destination descriptor
+ *  @param src  [in]  ptr to the source descriptor
+ */
+void ff_ivi_huff_desc_copy(IVIHuffDesc *dst, const IVIHuffDesc *src);
+
+/**
+ *  Initializes planes (prepares descriptors, allocates buffers etc).
+ *
+ *  @param planes       [in,out] pointer to the array of the plane descriptors
+ *  @param cfg          [in] pointer to the ivi_pic_config structure describing picture layout
+ *  @return             result code: 0 - OK
+ */
+int  ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg);
+
+/**
+ *  Frees planes, bands and macroblocks buffers.
+ *
+ *  @param planes       [in] pointer to the array of the plane descriptors
+ */
+void ff_ivi_free_buffers(IVIPlaneDesc *planes);
+
+/**
+ *  Initializes tile and macroblock descriptors.
+ *
+ *  @param planes       [in,out] pointer to the array of the plane descriptors
+ *  @param tile_width   [in]     tile width
+ *  @param tile_height  [in]     tile height
+ *  @return             result code: 0 - OK
+ */
+int  ff_ivi_init_tiles(IVIPlaneDesc *planes, int tile_width, int tile_height);
+
+/**
+ *  Decodes size of the tile data.
+ *  The size is stored as a variable-length field having the following format:
+ *  if (tile_data_size < 255) than this field is only one byte long
+ *  if (tile_data_size >= 255) than this field four is byte long: 0xFF X1 X2 X3
+ *  where X1-X3 is size of the tile data
+ *
+ *  @param gb   [in,out] the GetBit context
+ *  @return     size of the tile data in bytes
+ */
+int  ff_ivi_dec_tile_data_size(GetBitContext *gb);
+
+/**
+ *  Decodes block data:
+ *  extracts huffman-coded transform coefficients from the bitstream,
+ *  dequantizes them, applies inverse transform and motion compensation
+ *  in order to reconstruct the picture.
+ *
+ *  @param gb   [in,out] the GetBit context
+ *  @param band [in]     pointer to the band descriptor
+ *  @param tile [in]     pointer to the tile descriptor
+ *  @return     result code: 0 - OK, -1 = error (corrupted blocks data)
+ */
+int  ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile);
+
+/**
+ *  Handles empty tiles by performing data copying and motion
+ *  compensation respectively.
+ *
+ *  @param avctx    [in] ptr to the AVCodecContext
+ *  @param band     [in] pointer to the band descriptor
+ *  @param tile     [in] pointer to the tile descriptor
+ *  @param mv_scale [in] scaling factor for motion vectors
+ */
+void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
+                               IVITile *tile, int32_t mv_scale);
+
+/**
+ *  Converts and outputs the current plane.
+ *  This conversion is done by adding back the bias value of 128
+ *  (subtracted in the encoder) and clipping the result.
+ *
+ *  @param plane        [in]  pointer to the descriptor of the plane being processed
+ *  @param dst          [out] pointer to the buffer receiving converted pixels
+ *  @param dst_pitch    [in]  pitch for moving to the next y line
+ */
+void ff_ivi_output_plane(IVIPlaneDesc *plane, uint8_t *dst, int dst_pitch);
+
+#if IVI_DEBUG
+/**
+ *  Calculates band checksum from band data.
+ */
+uint16_t ivi_calc_band_checksum (IVIBandDesc *band);
+
+/**
+ *  Verifies that band data lies in range.
+ */
+int ivi_check_band (IVIBandDesc *band, const uint8_t *ref, int pitch);
+#endif
+
+#endif /* AVCODEC_IVI_COMMON_H */
diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c
new file mode 100644
index 0000000000..a58fcc52da
--- /dev/null
+++ b/libavcodec/ivi_dsp.c
@@ -0,0 +1,466 @@
+/*
+ * DSP functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
+ *
+ * Copyright (c) 2009 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/ivi_dsp.c
+ * DSP functions (inverse transforms, motion compensation, wavelet recompostions)
+ * for Indeo Video Interactive codecs.
+ */
+
+#include "avcodec.h"
+#include "dsputil.h"
+#include "ivi_common.h"
+#include "ivi_dsp.h"
+
+void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
+                        const int dst_pitch, const int num_bands)
+{
+    int             x, y, indx;
+    int32_t         p0, p1, p2, p3, tmp0, tmp1, tmp2;
+    int32_t         b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4, b2_5, b2_6;
+    int32_t         b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9;
+    uint32_t        pitch, back_pitch;
+    const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr;
+
+    /* all bands should have the same pitch */
+    pitch = plane->bands[0].pitch;
+
+    /* pixels at the position "y-1" will be set to pixels at the "y" for the 1st iteration */
+    back_pitch = 0;
+
+    /* get pointers to the wavelet bands */
+    b0_ptr = plane->bands[0].buf;
+    b1_ptr = plane->bands[1].buf;
+    b2_ptr = plane->bands[2].buf;
+    b3_ptr = plane->bands[3].buf;
+
+    for (y = 0; y < plane->height; y += 2) {
+        /* load storage variables with values */
+        if (num_bands > 0) {
+            b0_1 = b0_ptr[0];
+            b0_2 = b0_ptr[pitch];
+        }
+
+        if (num_bands > 1) {
+            b1_1 = b1_ptr[back_pitch];
+            b1_2 = b1_ptr[0];
+            b1_3 = b1_1 - b1_2*6 + b1_ptr[pitch];
+        }
+
+        if (num_bands > 2) {
+            b2_2 = b2_ptr[0];     // b2[x,  y  ]
+            b2_3 = b2_2;          // b2[x+1,y  ] = b2[x,y]
+            b2_5 = b2_ptr[pitch]; // b2[x  ,y+1]
+            b2_6 = b2_5;          // b2[x+1,y+1] = b2[x,y+1]
+        }
+
+        if (num_bands > 3) {
+            b3_2 = b3_ptr[back_pitch]; // b3[x  ,y-1]
+            b3_3 = b3_2;               // b3[x+1,y-1] = b3[x  ,y-1]
+            b3_5 = b3_ptr[0];          // b3[x  ,y  ]
+            b3_6 = b3_5;               // b3[x+1,y  ] = b3[x  ,y  ]
+            b3_8 = b3_2 - b3_5*6 + b3_ptr[pitch];
+            b3_9 = b3_8;
+        }
+
+        for (x = 0, indx = 0; x < plane->width; x+=2, indx++) {
+            /* some values calculated in the previous iterations can */
+            /* be reused in the next ones, so do appropriate copying */
+            b2_1 = b2_2; // b2[x-1,y  ] = b2[x,  y  ]
+            b2_2 = b2_3; // b2[x  ,y  ] = b2[x+1,y  ]
+            b2_4 = b2_5; // b2[x-1,y+1] = b2[x  ,y+1]
+            b2_5 = b2_6; // b2[x  ,y+1] = b2[x+1,y+1]
+            b3_1 = b3_2; // b3[x-1,y-1] = b3[x  ,y-1]
+            b3_2 = b3_3; // b3[x  ,y-1] = b3[x+1,y-1]
+            b3_4 = b3_5; // b3[x-1,y  ] = b3[x  ,y  ]
+            b3_5 = b3_6; // b3[x  ,y  ] = b3[x+1,y  ]
+            b3_7 = b3_8; // vert_HPF(x-1)
+            b3_8 = b3_9; // vert_HPF(x  )
+
+            p0 = p1 = p2 = p3 = 0;
+
+            /* process the LL-band by applying LPF both vertically and horizontally */
+            if (num_bands > 0) {
+                tmp0 = b0_1;
+                tmp2 = b0_2;
+                b0_1 = b0_ptr[indx+1];
+                b0_2 = b0_ptr[pitch+indx+1];
+                tmp1 = tmp0 + b0_1;
+
+                p0 =  tmp0 << 4;
+                p1 =  tmp1 << 3;
+                p2 = (tmp0 + tmp2) << 3;
+                p3 = (tmp1 + tmp2 + b0_2) << 2;
+            }
+
+            /* process the HL-band by applying HPF vertically and LPF horizontally */
+            if (num_bands > 1) {
+                tmp0 = b1_2;
+                tmp1 = b1_1;
+                b1_2 = b1_ptr[indx+1];
+                b1_1 = b1_ptr[back_pitch+indx+1];
+
+                tmp2 = tmp1 - tmp0*6 + b1_3;
+                b1_3 = b1_1 - b1_2*6 + b1_ptr[pitch+indx+1];
+
+                p0 += (tmp0 + tmp1) << 3;
+                p1 += (tmp0 + tmp1 + b1_1 + b1_2) << 2;
+                p2 +=  tmp2 << 2;
+                p3 += (tmp2 + b1_3) << 1;
+            }
+
+            /* process the LH-band by applying LPF vertically and HPF horizontally */
+            if (num_bands > 2) {
+                b2_3 = b2_ptr[indx+1];
+                b2_6 = b2_ptr[pitch+indx+1];
+
+                tmp0 = b2_1 + b2_2;
+                tmp1 = b2_1 - b2_2*6 + b2_3;
+
+                p0 += tmp0 << 3;
+                p1 += tmp1 << 2;
+                p2 += (tmp0 + b2_4 + b2_5) << 2;
+                p3 += (tmp1 + b2_4 - b2_5*6 + b2_6) << 1;
+            }
+
+            /* process the HH-band by applying HPF both vertically and horizontally */
+            if (num_bands > 3) {
+                b3_6 = b3_ptr[indx+1];            // b3[x+1,y  ]
+                b3_3 = b3_ptr[back_pitch+indx+1]; // b3[x+1,y-1]
+
+                tmp0 = b3_1 + b3_4;
+                tmp1 = b3_2 + b3_5;
+                tmp2 = b3_3 + b3_6;
+
+                b3_9 = b3_3 - b3_6*6 + b3_ptr[pitch+indx+1];
+
+                p0 += (tmp0 + tmp1) << 2;
+                p1 += (tmp0 - tmp1*6 + tmp2) << 1;
+                p2 += (b3_7 + b3_8) << 1;
+                p3 +=  b3_7 - b3_8*6 + b3_9;
+            }
+
+            /* output four pixels */
+            dst[x]             = av_clip_uint8((p0 >> 6) + 128);
+            dst[x+1]           = av_clip_uint8((p1 >> 6) + 128);
+            dst[dst_pitch+x]   = av_clip_uint8((p2 >> 6) + 128);
+            dst[dst_pitch+x+1] = av_clip_uint8((p3 >> 6) + 128);
+        }// for x
+
+        dst += dst_pitch << 1;
+
+        back_pitch = -pitch;
+
+        b0_ptr += pitch;
+        b1_ptr += pitch;
+        b2_ptr += pitch;
+        b3_ptr += pitch;
+    }
+}
+
+/** butterfly operation for the inverse slant transform */
+#define IVI_SLANT_BFLY(s1, s2, o1, o2, t) \
+    t  = s1 - s2;\
+    o1 = s1 + s2;\
+    o2 = t;\
+
+/** This is a reflection a,b = 1/2, 5/4 for the inverse slant transform */
+#define IVI_IREFLECT(s1, s2, o1, o2, t) \
+    t  = ((s1 + s2*2 + 2) >> 2) + s1;\
+    o2 = ((s1*2 - s2 + 2) >> 2) - s2;\
+    o1 = t;\
+
+/** This is a reflection a,b = 1/2, 7/8 for the inverse slant transform */
+#define IVI_SLANT_PART4(s1, s2, o1, o2, t) \
+    t  = s2 + ((s1*4  - s2 + 4) >> 3);\
+    o2 = s1 + ((-s1 - s2*4 + 4) >> 3);\
+    o1 = t;\
+
+/** inverse slant8 transform */
+#define IVI_INV_SLANT8(s1, s4, s8, s5, s2, s6, s3, s7,\
+                       d1, d2, d3, d4, d5, d6, d7, d8,\
+                       t0, t1, t2, t3, t4, t5, t6, t7, t8) {\
+    IVI_SLANT_PART4(s4, s5, t4, t5, t0);\
+\
+    IVI_SLANT_BFLY(s1, t5, t1, t5, t0); IVI_SLANT_BFLY(s2, s6, t2, t6, t0);\
+    IVI_SLANT_BFLY(s7, s3, t7, t3, t0); IVI_SLANT_BFLY(t4, s8, t4, t8, t0);\
+\
+    IVI_SLANT_BFLY(t1, t2, t1, t2, t0); IVI_IREFLECT  (t4, t3, t4, t3, t0);\
+    IVI_SLANT_BFLY(t5, t6, t5, t6, t0); IVI_IREFLECT  (t8, t7, t8, t7, t0);\
+    IVI_SLANT_BFLY(t1, t4, t1, t4, t0); IVI_SLANT_BFLY(t2, t3, t2, t3, t0);\
+    IVI_SLANT_BFLY(t5, t8, t5, t8, t0); IVI_SLANT_BFLY(t6, t7, t6, t7, t0);\
+    d1 = COMPENSATE(t1);\
+    d2 = COMPENSATE(t2);\
+    d3 = COMPENSATE(t3);\
+    d4 = COMPENSATE(t4);\
+    d5 = COMPENSATE(t5);\
+    d6 = COMPENSATE(t6);\
+    d7 = COMPENSATE(t7);\
+    d8 = COMPENSATE(t8);}
+
+/** inverse slant4 transform */
+#define IVI_INV_SLANT4(s1, s4, s2, s3, d1, d2, d3, d4, t0, t1, t2, t3, t4) {\
+    IVI_SLANT_BFLY(s1, s2, t1, t2, t0); IVI_IREFLECT  (s4, s3, t4, t3, t0);\
+\
+    IVI_SLANT_BFLY(t1, t4, t1, t4, t0); IVI_SLANT_BFLY(t2, t3, t2, t3, t0);\
+    d1 = COMPENSATE(t1);\
+    d2 = COMPENSATE(t2);\
+    d3 = COMPENSATE(t3);\
+    d4 = COMPENSATE(t4);}
+
+void ff_ivi_inverse_slant_8x8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+    int     i;
+    const int32_t *src;
+    int32_t *dst;
+    int     tmp[64];
+    int     t0, t1, t2, t3, t4, t5, t6, t7, t8;
+
+#define COMPENSATE(x) (x)
+    src = in;
+    dst = tmp;
+    for (i = 0; i < 8; i++) {
+        if (flags[i]) {
+            IVI_INV_SLANT8(src[0], src[8], src[16], src[24], src[32], src[40], src[48], src[56],
+                           dst[0], dst[8], dst[16], dst[24], dst[32], dst[40], dst[48], dst[56],
+                           t0, t1, t2, t3, t4, t5, t6, t7, t8);
+        } else
+            dst[0] = dst[8] = dst[16] = dst[24] = dst[32] = dst[40] = dst[48] = dst[56] = 0;
+
+            src++;
+            dst++;
+    }
+#undef COMPENSATE
+
+#define COMPENSATE(x) ((x + 1)>>1)
+    src = tmp;
+    for (i = 0; i < 8; i++) {
+        if (!src[0] && !src[1] && !src[2] && !src[3] && !src[4] && !src[5] && !src[6] && !src[7]) {
+            memset(out, 0, 8*sizeof(out[0]));
+        } else {
+            IVI_INV_SLANT8(src[0], src[1], src[2], src[3], src[4], src[5], src[6], src[7],
+                           out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7],
+                           t0, t1, t2, t3, t4, t5, t6, t7, t8);
+        }
+        src += 8;
+        out += pitch;
+    }
+#undef COMPENSATE
+}
+
+void ff_ivi_inverse_slant_4x4(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+    int     i;
+    const int32_t *src;
+    int32_t *dst;
+    int     tmp[16];
+    int     t0, t1, t2, t3, t4;
+
+#define COMPENSATE(x) (x)
+    src = in;
+    dst = tmp;
+    for (i = 0; i < 4; i++) {
+        if (flags[i]) {
+            IVI_INV_SLANT4(src[0], src[4], src[8], src[12],
+                           dst[0], dst[4], dst[8], dst[12],
+                           t0, t1, t2, t3, t4);
+        } else
+            dst[0] = dst[4] = dst[8] = dst[12] = 0;
+
+            src++;
+            dst++;
+    }
+#undef COMPENSATE
+
+#define COMPENSATE(x) ((x + 1)>>1)
+    src = tmp;
+    for (i = 0; i < 4; i++) {
+        if (!src[0] && !src[1] && !src[2] && !src[3]) {
+            out[0] = out[1] = out[2] = out[3] = 0;
+        } else {
+            IVI_INV_SLANT4(src[0], src[1], src[2], src[3],
+                           out[0], out[1], out[2], out[3],
+                           t0, t1, t2, t3, t4);
+        }
+        src += 4;
+        out += pitch;
+    }
+#undef COMPENSATE
+}
+
+void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+{
+    int     x, y;
+    int16_t dc_coeff;
+
+    dc_coeff = (*in + 1) >> 1;
+
+    for (y = 0; y < blk_size; out += pitch, y++) {
+        for (x = 0; x < blk_size; x++)
+            out[x] = dc_coeff;
+    }
+}
+
+void ff_ivi_row_slant8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+    int     i;
+    int     t0, t1, t2, t3, t4, t5, t6, t7, t8;
+
+#define COMPENSATE(x) ((x + 1)>>1)
+    for (i = 0; i < 8; i++) {
+        if (!in[0] && !in[1] && !in[2] && !in[3] && !in[4] && !in[5] && !in[6] && !in[7]) {
+            memset(out, 0, 8*sizeof(out[0]));
+        } else {
+            IVI_INV_SLANT8( in[0],  in[1],  in[2],  in[3],  in[4],  in[5],  in[6],  in[7],
+                           out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7],
+                           t0, t1, t2, t3, t4, t5, t6, t7, t8);
+        }
+        in += 8;
+        out += pitch;
+    }
+#undef COMPENSATE
+}
+
+void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+{
+    int     x, y;
+    int16_t dc_coeff;
+
+    dc_coeff = (*in + 1) >> 1;
+
+    for (x = 0; x < blk_size; x++)
+        out[x] = dc_coeff;
+
+    out += pitch;
+
+    for (y = 1; y < blk_size; out += pitch, y++) {
+        for (x = 0; x < blk_size; x++)
+            out[x] = 0;
+    }
+}
+
+void ff_ivi_col_slant8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags)
+{
+    int     i, row2, row4, row8;
+    int     t0, t1, t2, t3, t4, t5, t6, t7, t8;
+
+    row2 = pitch << 1;
+    row4 = pitch << 2;
+    row8 = pitch << 3;
+
+#define COMPENSATE(x) ((x + 1)>>1)
+    for (i = 0; i < 8; i++) {
+        if (flags[i]) {
+            IVI_INV_SLANT8(in[0], in[8], in[16], in[24], in[32], in[40], in[48], in[56],
+                           out[0], out[pitch], out[row2], out[row2 + pitch], out[row4],
+                           out[row4 + pitch],  out[row4 + row2], out[row8 - pitch],
+                           t0, t1, t2, t3, t4, t5, t6, t7, t8);
+        } else {
+            out[0] = out[pitch] = out[row2] = out[row2 + pitch] = out[row4] =
+            out[row4 + pitch] =  out[row4 + row2] = out[row8 - pitch] = 0;
+        }
+
+        in++;
+        out++;
+    }
+#undef COMPENSATE
+}
+
+void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size)
+{
+    int     x, y;
+    int16_t dc_coeff;
+
+    dc_coeff = (*in + 1) >> 1;
+
+    for (y = 0; y < blk_size; out += pitch, y++) {
+        out[0] = dc_coeff;
+        for (x = 1; x < blk_size; x++)
+            out[x] = 0;
+    }
+}
+
+void ff_ivi_put_pixels_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
+                           const uint8_t *flags)
+{
+    int     x, y;
+
+    for (y = 0; y < 8; out += pitch, in += 8, y++)
+        for (x = 0; x < 8; x++)
+            out[x] = in[x];
+}
+
+void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
+                             int blk_size)
+{
+    int     y;
+
+    out[0] = in[0];
+    memset(out + 1, 0, 7*sizeof(out[0]));
+    out += pitch;
+
+    for (y = 1; y < 8; out += pitch, y++)
+        memset(out, 0, 8*sizeof(out[0]));
+}
+
+#define IVI_MC_TEMPLATE(size, suffix, OP) \
+void ff_ivi_mc_ ## size ##x## size ## suffix (int16_t *buf, const int16_t *ref_buf, \
+                                              uint32_t pitch, int mc_type) \
+{ \
+    int     i, j; \
+    const int16_t *wptr; \
+\
+    switch (mc_type) { \
+    case 0: /* fullpel (no interpolation) */ \
+        for (i = 0; i < size; i++, buf += pitch, ref_buf += pitch) { \
+            for (j = 0; j < size; j++) {\
+                OP(buf[j], ref_buf[j]); \
+            } \
+        } \
+        break; \
+    case 1: /* horizontal halfpel interpolation */ \
+        for (i = 0; i < size; i++, buf += pitch, ref_buf += pitch) \
+            for (j = 0; j < size; j++) \
+                OP(buf[j], (ref_buf[j] + ref_buf[j+1]) >> 1); \
+        break; \
+    case 2: /* vertical halfpel interpolation */ \
+        wptr = ref_buf + pitch; \
+        for (i = 0; i < size; i++, buf += pitch, wptr += pitch, ref_buf += pitch) \
+            for (j = 0; j < size; j++) \
+                OP(buf[j], (ref_buf[j] + wptr[j]) >> 1); \
+        break; \
+    case 3: /* vertical and horizontal halfpel interpolation */ \
+        wptr = ref_buf + pitch; \
+        for (i = 0; i < size; i++, buf += pitch, wptr += pitch, ref_buf += pitch) \
+            for (j = 0; j < size; j++) \
+                OP(buf[j], (ref_buf[j] + ref_buf[j+1] + wptr[j] + wptr[j+1]) >> 2); \
+        break; \
+    } \
+} \
+
+#define OP_PUT(a, b)  (a) = (b)
+#define OP_ADD(a, b)  (a) += (b)
+
+IVI_MC_TEMPLATE(8, _no_delta, OP_PUT);
+IVI_MC_TEMPLATE(8, _delta,    OP_ADD);
+IVI_MC_TEMPLATE(4, _no_delta, OP_PUT);
+IVI_MC_TEMPLATE(4, _delta,    OP_ADD);
diff --git a/libavcodec/ivi_dsp.h b/libavcodec/ivi_dsp.h
new file mode 100644
index 0000000000..43c0923ead
--- /dev/null
+++ b/libavcodec/ivi_dsp.h
@@ -0,0 +1,170 @@
+/*
+ * DSP functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
+ *
+ * Copyright (c) 2009 Maxim Poliakovski
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file libavcodec/ivi_dsp.h
+ * DSP functions (inverse transforms, motion compensations, wavelet recompostion)
+ * for Indeo Video Interactive codecs.
+ */
+
+#ifndef AVCODEC_IVI_DSP_H
+#define AVCODEC_IVI_DSP_H
+
+#include "avcodec.h"
+#include "ivi_common.h"
+
+/**
+ *  5/3 wavelet recomposition filter for Indeo5
+ *
+ *  @param plane        [in]  pointer to the descriptor of the plane being processed
+ *  @param dst          [out] pointer to the destination buffer
+ *  @param dst_pitch    [in]  pitch of the destination buffer
+ *  @param num_bands    [in]  number of wavelet bands to be processed
+ */
+void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
+                        const int dst_pitch, const int num_bands);
+
+/**
+ *  two-dimensional inverse slant 8x8 transform
+ *
+ *  @param  in      [in]  pointer to the vector of transform coefficients
+ *  @param  out     [out] pointer to the output buffer (frame)
+ *  @param  pitch   [in]  pitch to move to the next y line
+ *  @param  flags   [in]  pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_inverse_slant_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
+                              const uint8_t *flags);
+
+/**
+ *  two-dimensional inverse slant 4x4 transform
+ *
+ *  @param  in      [in]  pointer to the vector of transform coefficients
+ *  @param  out     [out] pointer to the output buffer (frame)
+ *  @param  pitch   [in]  pitch to move to the next y line
+ *  @param  flags   [in]  pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_inverse_slant_4x4(const int32_t *in, int16_t *out, uint32_t pitch,
+                              const uint8_t *flags);
+
+/**
+ *  DC-only two-dimensional inverse slant transform.
+ *  Performing the inverse slant transform in this case is equivalent to
+ *  spreading (DC_coeff + 1)/2 over the whole block.
+ *  It works much faster than performing the slant transform on a vector of zeroes.
+ *
+ *  @param  in          [in]  pointer to the dc coefficient
+ *  @param  out         [out] pointer to the output buffer (frame)
+ *  @param  pitch       [in]  pitch to move to the next y line
+ *  @param  blk_size    [in]  transform block size
+ */
+void ff_ivi_dc_slant_2d(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+
+/**
+ *  inverse 1D row slant transform
+ *
+ *  @param  in      [in]  pointer to the vector of transform coefficients
+ *  @param  out     [out] pointer to the output buffer (frame)
+ *  @param  pitch   [in]  pitch to move to the next y line
+ *  @param  flags   [in]  pointer to the array of column flags (unused here)
+ */
+void ff_ivi_row_slant8(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+
+/**
+ *  inverse 1D column slant transform
+ *
+ *  @param  in      [in]  pointer to the vector of transform coefficients
+ *  @param  out     [out] pointer to the output buffer (frame)
+ *  @param  pitch   [in]  pitch to move to the next y line
+ *  @param  flags   [in]  pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_col_slant8(const int32_t *in, int16_t *out, uint32_t pitch,
+                       const uint8_t *flags);
+
+/**
+ *  DC-only inverse row slant transform
+ */
+void ff_ivi_dc_row_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+
+/**
+ *  DC-only inverse column slant transform
+ */
+void ff_ivi_dc_col_slant(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+
+/**
+ *  Copies the pixels into the frame buffer.
+ */
+void ff_ivi_put_pixels_8x8(const int32_t *in, int16_t *out, uint32_t pitch, const uint8_t *flags);
+
+/**
+ *  Copies the DC coefficient into the first pixel of the block and
+ *  zeroes all others.
+ */
+void ff_ivi_put_dc_pixel_8x8(const int32_t *in, int16_t *out, uint32_t pitch, int blk_size);
+
+/**
+ *  8x8 block motion compensation with adding delta
+ *
+ *  @param  buf     [in,out] pointer to the block in the current frame buffer containing delta
+ *  @param  ref_buf [in]     pointer to the corresponding block in the reference frame
+ *  @param  pitch   [in]     pitch for moving to the next y line
+ *  @param  mc_type [in]     interpolation type
+ */
+void ff_ivi_mc_8x8_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+
+/**
+ *  4x4 block motion compensation with adding delta
+ *
+ *  @param  buf     [in,out] pointer to the block in the current frame buffer containing delta
+ *  @param  ref_buf [in]     pointer to the corresponding block in the reference frame
+ *  @param  pitch   [in]     pitch for moving to the next y line
+ *  @param  mc_type [in]     interpolation type
+ */
+void ff_ivi_mc_4x4_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+
+/**
+ *  motion compensation without adding delta
+ *
+ *  @param  buf     [in,out] pointer to the block in the current frame receiving the result
+ *  @param  ref_buf [in]     pointer to the corresponding block in the reference frame
+ *  @param  pitch   [in]     pitch for moving to the next y line
+ *  @param  mc_type [in]     interpolation type
+ */
+void ff_ivi_mc_8x8_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+
+/**
+ *  4x4 block motion compensation without adding delta
+ *
+ *  @param  buf     [in,out] pointer to the block in the current frame receiving the result
+ *  @param  ref_buf [in]     pointer to the corresponding block in the reference frame
+ *  @param  pitch   [in]     pitch for moving to the next y line
+ *  @param  mc_type [in]     interpolation type
+ */
+void ff_ivi_mc_4x4_no_delta(int16_t *buf, const int16_t *ref_buf, uint32_t pitch, int mc_type);
+
+#endif /* AVCODEC_IVI_DSP_H */