g3dvl: Move all of the software VP8 decoder into the same folder, unified the onyx*.* into vp8_decoder.*

Signed-off-by: Emeric Grange <emeric.grange@gmail.com>

1 files changed, 0 insertions, 455 deletions

diff --git a/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c b/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c
deleted file mode 100644
index 7db2533a22..0000000000
--- a/src/gallium/auxiliary/vl/vp8/decoder/decodemv.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#include "treereader.h"
-#include "../common/entropymv.h"
-#include "../common/entropymode.h"
-#include "onyxd_int.h"
-#include "../common/findnearmv.h"
-
-#if ENABLE_DEBUG
-#include <assert.h>
-#endif
-
-static int vp8_read_bmode(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_bmode_tree, p);
-
-    return i;
-}
-
-static int vp8_read_ymode(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_ymode_tree, p);
-
-    return i;
-}
-
-static int vp8_kfread_ymode(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_kf_ymode_tree, p);
-
-    return i;
-}
-
-static int vp8_read_uv_mode(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_uv_mode_tree, p);
-
-    return i;
-}
-
-static void vp8_read_mb_features(BOOL_DECODER *bd, MB_MODE_INFO *mi, MACROBLOCKD *x)
-{
-    /* Is segmentation enabled. */
-    if (x->segmentation_enabled && x->update_mb_segmentation_map)
-    {
-        /* If so then read the segment id. */
-        if (vp8_read(bd, x->mb_segment_tree_probs[0]))
-            mi->segment_id = (unsigned char)(2 + vp8_read(bd, x->mb_segment_tree_probs[2]));
-        else
-            mi->segment_id = (unsigned char)(vp8_read(bd, x->mb_segment_tree_probs[1]));
-    }
-}
-
-static void vp8_kfread_modes(VP8D_COMP *pbi, MODE_INFO *m, int mb_row, int mb_col)
-{
-    BOOL_DECODER *const bd = &pbi->bd;
-    const int mis = pbi->common.mode_info_stride;
-
-        {
-            MB_PREDICTION_MODE y_mode;
-
-            /* Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default)
-             * By default on a key frame reset all MBs to segment 0 */
-            m->mbmi.segment_id = 0;
-
-            if (pbi->mb.update_mb_segmentation_map)
-                vp8_read_mb_features(bd, &m->mbmi, &pbi->mb);
-
-            /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
-            if (pbi->common.mb_no_coeff_skip)
-                m->mbmi.mb_skip_coeff = vp8_read(bd, pbi->prob_skip_false);
-            else
-                m->mbmi.mb_skip_coeff = 0;
-
-            y_mode = (MB_PREDICTION_MODE)vp8_kfread_ymode(bd, pbi->common.kf_ymode_prob);
-
-            m->mbmi.ref_frame = INTRA_FRAME;
-
-            if ((m->mbmi.mode = y_mode) == B_PRED)
-            {
-                int i = 0;
-
-                do
-                {
-                    const B_PREDICTION_MODE A = above_block_mode(m, i, mis);
-                    const B_PREDICTION_MODE L = left_block_mode(m, i);
-
-                    m->bmi[i].as_mode = (B_PREDICTION_MODE)vp8_read_bmode(bd, pbi->common.kf_bmode_prob [A] [L]);
-                }
-                while (++i < 16);
-            }
-
-            m->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bd, pbi->common.kf_uv_mode_prob);
-        }
-}
-
-static int read_mvcomponent(BOOL_DECODER *bd, const MV_CONTEXT *mvc)
-{
-    const vp8_prob *const p = (const vp8_prob *)mvc;
-    int x = 0;
-
-    if (vp8_read(bd, p [mvpis_short])) /* Large */
-    {
-        int i = 0;
-
-        do {
-            x += vp8_read(bd, p [MVPbits + i]) << i;
-        }
-        while (++i < 3);
-
-        i = mvlong_width - 1; /* Skip bit 3, which is sometimes implicit */
-
-        do
-        {
-            x += vp8_read(bd, p [MVPbits + i]) << i;
-        }
-        while (--i > 3);
-
-        if (!(x & 0xFFF0) || vp8_read(bd, p[MVPbits + 3]))
-            x += 8;
-    }
-    else /* Small */
-        x = vp8_treed_read(bd, vp8_small_mvtree, p + MVPshort);
-
-    if (x && vp8_read(bd, p[MVPsign]))
-        x = -x;
-
-    return x;
-}
-
-static void read_mv(BOOL_DECODER *bd, MV *mv, const MV_CONTEXT *mvc)
-{
-    mv->row = (short)(read_mvcomponent(bd,   mvc) << 1);
-    mv->col = (short)(read_mvcomponent(bd, ++mvc) << 1);
-}
-
-static void read_mvcontexts(BOOL_DECODER *bd, MV_CONTEXT *mvc)
-{
-    int i = 0;
-
-    do {
-        const vp8_prob *up = vp8_mv_update_probs[i].prob;
-        vp8_prob *p = (vp8_prob *)(mvc + i);
-        vp8_prob *const pstop = p + MVPcount;
-
-        do {
-            if (vp8_read(bd, *up++))
-            {
-                const vp8_prob x = (vp8_prob)vp8_read_literal(bd, 7);
-
-                *p = x ? x << 1 : 1;
-            }
-        }
-        while (++p < pstop);
-    }
-    while (++i < 2);
-}
-
-static MB_PREDICTION_MODE read_mv_ref(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_mv_ref_tree, p);
-
-    return (MB_PREDICTION_MODE)i;
-}
-
-static B_PREDICTION_MODE sub_mv_ref(BOOL_DECODER *bd, const vp8_prob *p)
-{
-    const int i = vp8_treed_read(bd, vp8_sub_mv_ref_tree, p);
-
-    return (B_PREDICTION_MODE)i;
-}
-
-static const unsigned char mbsplit_fill_count[4] = {8, 8, 4, 1};
-
-static const unsigned char mbsplit_fill_offset[4][16] =
-{
-    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15},
-    { 0,  1,  4,  5,  8,  9, 12, 13,  2,  3,  6,  7, 10, 11, 14, 15},
-    { 0,  1,  4,  5,  2,  3,  6,  7,  8,  9, 12, 13, 10, 11, 14, 15},
-    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15}
-};
-
-static const unsigned char mbsplit_offset[4][16] =
-{
-    { 0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
-    { 0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
-    { 0,  2,  8, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
-    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15}
-};
-
-static void mb_mode_mv_init(VP8D_COMP *pbi)
-{
-    BOOL_DECODER *const bd = &pbi->bd;
-    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
-
-    pbi->prob_skip_false = 0;
-    if (pbi->common.mb_no_coeff_skip)
-        pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bd, 8);
-
-    if (pbi->common.frame_type != KEY_FRAME)
-    {
-        pbi->prob_intra = (vp8_prob)vp8_read_literal(bd, 8);
-        pbi->prob_last  = (vp8_prob)vp8_read_literal(bd, 8);
-        pbi->prob_gf    = (vp8_prob)vp8_read_literal(bd, 8);
-
-        if (vp8_read_bit(bd))
-        {
-            int i = 0;
-            do {
-                pbi->common.fc.ymode_prob[i] = (vp8_prob)vp8_read_literal(bd, 8);
-            }
-            while (++i < 4);
-        }
-
-        if (vp8_read_bit(bd))
-        {
-            int i = 0;
-            do {
-                pbi->common.fc.uv_mode_prob[i] = (vp8_prob)vp8_read_literal(bd, 8);
-            }
-            while (++i < 3);
-        }
-
-        read_mvcontexts(bd, mvc);
-    }
-}
-
-static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
-                            int mb_row, int mb_col)
-{
-    BOOL_DECODER *const bd = &pbi->bd;
-    MV_CONTEXT *const mvc = pbi->common.fc.mvc;
-    const int mis = pbi->common.mode_info_stride;
-
-    int_mv *const mv = &mbmi->mv;
-    int mb_to_left_edge;
-    int mb_to_right_edge;
-    int mb_to_top_edge;
-    int mb_to_bottom_edge;
-
-    mb_to_top_edge     = pbi->mb.mb_to_top_edge;
-    mb_to_bottom_edge  = pbi->mb.mb_to_bottom_edge;
-    mb_to_top_edge    -= LEFT_TOP_MARGIN;
-    mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
-
-    mbmi->need_to_clamp_mvs = 0;
-
-    /* Distance of Mb to the various image edges.
-     * These specified to 8th pel as they are always compared to MV values that
-     * are in 1/8th pel units */
-    pbi->mb.mb_to_left_edge =
-    mb_to_left_edge  = -((mb_col * 16) << 3);
-    mb_to_left_edge -= LEFT_TOP_MARGIN;
-
-    pbi->mb.mb_to_right_edge =
-    mb_to_right_edge  = ((pbi->common.mb_cols - 1 - mb_col) * 16) << 3;
-    mb_to_right_edge += RIGHT_BOTTOM_MARGIN;
-
-    /* If required read in new segmentation data for this MB */
-    if (pbi->mb.update_mb_segmentation_map)
-        vp8_read_mb_features(bd, mbmi, &pbi->mb);
-
-    /* Read the macroblock coeff skip flag if this feature is in use, else default to 0 */
-    if (pbi->common.mb_no_coeff_skip)
-        mbmi->mb_skip_coeff = vp8_read(bd, pbi->prob_skip_false);
-    else
-        mbmi->mb_skip_coeff = 0;
-
-    if ((mbmi->ref_frame = (MV_REFERENCE_FRAME) vp8_read(bd, pbi->prob_intra))) /* inter MB */
-    {
-        int rct[4];
-        vp8_prob mv_ref_p [VP8_MVREFS-1];
-        int_mv nearest, nearby, best_mv;
-
-        if (vp8_read(bd, pbi->prob_last))
-        {
-            mbmi->ref_frame = (MV_REFERENCE_FRAME)((int)mbmi->ref_frame + (int)(1 + vp8_read(bd, pbi->prob_gf)));
-        }
-
-        vp8_find_near_mvs(&pbi->mb, mi, &nearest, &nearby, &best_mv, rct, mbmi->ref_frame, pbi->common.ref_frame_sign_bias);
-
-        vp8_mv_ref_probs(mv_ref_p, rct);
-
-        mbmi->uv_mode = DC_PRED;
-        mbmi->mode = read_mv_ref(bd, mv_ref_p);
-        switch (mbmi->mode)
-        {
-        case SPLITMV:
-        {
-            const int s = mbmi->partitioning = vp8_treed_read(bd, vp8_mbsplit_tree, vp8_mbsplit_probs);
-            const int num_p = vp8_mbsplit_count[s];
-            int j = 0;
-
-            do /* For each subset j */
-            {
-                int_mv leftmv, abovemv;
-                int_mv blockmv;
-                int k; /* First block in subset j */
-                int mv_contz;
-                k = mbsplit_offset[s][j];
-
-                leftmv.as_int = left_block_mv(mi, k);
-                abovemv.as_int = above_block_mv(mi, k, mis);
-                mv_contz = vp8_mv_cont(&leftmv, &abovemv);
-
-                switch (sub_mv_ref(bd, vp8_sub_mv_ref_prob2[mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
-                {
-                case NEW4X4:
-                    read_mv(bd, &blockmv.as_mv, (const MV_CONTEXT *)mvc);
-                    blockmv.as_mv.row += best_mv.as_mv.row;
-                    blockmv.as_mv.col += best_mv.as_mv.col;
-                    break;
-                case LEFT4X4:
-                    blockmv.as_int = leftmv.as_int;
-                    break;
-                case ABOVE4X4:
-                    blockmv.as_int = abovemv.as_int;
-                    break;
-                case ZERO4X4:
-                    blockmv.as_int = 0;
-                    break;
-                default:
-                    break;
-                }
-
-                mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(&blockmv,
-                                                              mb_to_left_edge,
-                                                              mb_to_right_edge,
-                                                              mb_to_top_edge,
-                                                              mb_to_bottom_edge);
-
-                {
-                    /* Fill (uniform) modes, mvs of jth subset.
-                     * Must do it here because ensuing subsets can
-                     * refer back to us via "left" or "above". */
-                    const unsigned char *fill_offset = &mbsplit_fill_offset[s][(unsigned char)j * mbsplit_fill_count[s]];
-                    unsigned int fill_count = mbsplit_fill_count[s];
-
-                    do {
-                        mi->bmi[*fill_offset].mv.as_int = blockmv.as_int;
-                        fill_offset++;
-                    } while (--fill_count);
-                }
-            }
-            while (++j < num_p);
-        }
-        mv->as_int = mi->bmi[15].mv.as_int;
-        break; /* Done with SPLITMV */
-
-        case NEARMV:
-            mv->as_int = nearby.as_int;
-            /* Clip "next_nearest" so that it does not extend to far out of image */
-            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
-                         mb_to_top_edge, mb_to_bottom_edge);
-            break;
-
-        case NEARESTMV:
-            mv->as_int = nearest.as_int;
-            /* Clip "next_nearest" so that it does not extend to far out of image */
-            vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge,
-                         mb_to_top_edge, mb_to_bottom_edge);
-            break;
-
-        case ZEROMV:
-            mv->as_int = 0;
-            break;
-
-        case NEWMV:
-            read_mv(bd, &mv->as_mv, (const MV_CONTEXT *)mvc);
-            mv->as_mv.row += best_mv.as_mv.row;
-            mv->as_mv.col += best_mv.as_mv.col;
-
-            /* Don't need to check this on NEARMV and NEARESTMV modes
-             * since those modes clamp the MV. The NEWMV mode does not,
-             * so signal to the prediction stage whether special
-             * handling may be required. */
-            mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(mv,
-                                                          mb_to_left_edge,
-                                                          mb_to_right_edge,
-                                                          mb_to_top_edge,
-                                                          mb_to_bottom_edge);
-            break;
-
-#if ENABLE_DEBUG
-        default:
-            assert(0);
-#else
-        default:
-            break;
-#endif
-        }
-    }
-    else
-    {
-        /* Required for left and above block mv */
-        mbmi->mv.as_int = 0;
-
-        /* MB is intra coded */
-        if ((mbmi->mode = (MB_PREDICTION_MODE)vp8_read_ymode(bd, pbi->common.fc.ymode_prob)) == B_PRED)
-        {
-            int j = 0;
-            do {
-                mi->bmi[j].as_mode = (B_PREDICTION_MODE)vp8_read_bmode(bd, pbi->common.fc.bmode_prob);
-            }
-            while (++j < 16);
-        }
-
-        mbmi->uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bd, pbi->common.fc.uv_mode_prob);
-    }
-}
-
-void vp8_decode_mode_mvs(VP8D_COMP *pbi)
-{
-    MODE_INFO *mi = pbi->common.mi;
-    int mb_row = -1;
-
-    mb_mode_mv_init(pbi);
-
-    while (++mb_row < pbi->common.mb_rows)
-    {
-        int mb_col = -1;
-        int mb_to_top_edge;
-        int mb_to_bottom_edge;
-
-        pbi->mb.mb_to_top_edge =
-        mb_to_top_edge  = -((mb_row * 16)) << 3;
-        mb_to_top_edge -= LEFT_TOP_MARGIN;
-
-        pbi->mb.mb_to_bottom_edge =
-        mb_to_bottom_edge  = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3;
-        mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN;
-
-        while (++mb_col < pbi->common.mb_cols)
-        {
-            /*read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col);*/
-            if (pbi->common.frame_type == KEY_FRAME)
-                vp8_kfread_modes(pbi, mi, mb_row, mb_col);
-            else
-                read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col);
-
-            mi++; /* Next macroblock */
-        }
-
-        mi++; /* Skip left predictor each row */
-    }
-}