rv34.c 63.7 KB
Newer Older
Kostya Shishkov's avatar
Kostya Shishkov committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
/*
 * RV30/40 decoder common data
 * Copyright (c) 2007 Mike Melanson, Konstantin Shishkov
 *
 * 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
 */

/**
23
 * @file
Kostya Shishkov's avatar
Kostya Shishkov committed
24 25 26
 * RV30/40 decoder common data
 */

27
#include "libavutil/imgutils.h"
28 29
#include "libavutil/internal.h"

Kostya Shishkov's avatar
Kostya Shishkov committed
30
#include "avcodec.h"
31
#include "error_resilience.h"
Kostya Shishkov's avatar
Kostya Shishkov committed
32 33
#include "mpegvideo.h"
#include "golomb.h"
34
#include "internal.h"
35
#include "mathops.h"
Kostya Shishkov's avatar
Kostya Shishkov committed
36
#include "rectangle.h"
37
#include "thread.h"
Kostya Shishkov's avatar
Kostya Shishkov committed
38 39 40 41 42

#include "rv34vlc.h"
#include "rv34data.h"
#include "rv34.h"

43 44 45 46 47
static inline void ZERO8x2(void* dst, int stride)
{
    fill_rectangle(dst,                 1, 2, stride, 0, 4);
    fill_rectangle(((uint8_t*)(dst))+4, 1, 2, stride, 0, 4);
}
48

Kostya Shishkov's avatar
Kostya Shishkov committed
49 50 51
/** translation of RV30/40 macroblock types to lavc ones */
static const int rv34_mb_type_to_lavc[12] = {
    MB_TYPE_INTRA,
52
    MB_TYPE_INTRA16x16              | MB_TYPE_SEPARATE_DC,
Kostya Shishkov's avatar
Kostya Shishkov committed
53 54 55 56 57 58 59 60 61
    MB_TYPE_16x16   | MB_TYPE_L0,
    MB_TYPE_8x8     | MB_TYPE_L0,
    MB_TYPE_16x16   | MB_TYPE_L0,
    MB_TYPE_16x16   | MB_TYPE_L1,
    MB_TYPE_SKIP,
    MB_TYPE_DIRECT2 | MB_TYPE_16x16,
    MB_TYPE_16x8    | MB_TYPE_L0,
    MB_TYPE_8x16    | MB_TYPE_L0,
    MB_TYPE_16x16   | MB_TYPE_L0L1,
62
    MB_TYPE_16x16   | MB_TYPE_L0    | MB_TYPE_SEPARATE_DC
Kostya Shishkov's avatar
Kostya Shishkov committed
63 64 65 66 67
};


static RV34VLC intra_vlcs[NUM_INTRA_TABLES], inter_vlcs[NUM_INTER_TABLES];

68 69
static int rv34_decode_mv(RV34DecContext *r, int block_type);

Kostya Shishkov's avatar
Kostya Shishkov committed
70
/**
71
 * @name RV30/40 VLC generating functions
Kostya Shishkov's avatar
Kostya Shishkov committed
72 73 74
 * @{
 */

75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97
static const int table_offs[] = {
      0,   1818,   3622,   4144,   4698,   5234,   5804,   5868,   5900,   5932,
   5996,   6252,   6316,   6348,   6380,   7674,   8944,  10274,  11668,  12250,
  14060,  15846,  16372,  16962,  17512,  18148,  18180,  18212,  18244,  18308,
  18564,  18628,  18660,  18692,  20036,  21314,  22648,  23968,  24614,  26384,
  28190,  28736,  29366,  29938,  30608,  30640,  30672,  30704,  30768,  31024,
  31088,  31120,  31184,  32570,  33898,  35236,  36644,  37286,  39020,  40802,
  41368,  42052,  42692,  43348,  43380,  43412,  43444,  43476,  43604,  43668,
  43700,  43732,  45100,  46430,  47778,  49160,  49802,  51550,  53340,  53972,
  54648,  55348,  55994,  56122,  56154,  56186,  56218,  56346,  56410,  56442,
  56474,  57878,  59290,  60636,  62036,  62682,  64460,  64524,  64588,  64716,
  64844,  66076,  67466,  67978,  68542,  69064,  69648,  70296,  72010,  72074,
  72138,  72202,  72330,  73572,  74936,  75454,  76030,  76566,  77176,  77822,
  79582,  79646,  79678,  79742,  79870,  81180,  82536,  83064,  83672,  84242,
  84934,  85576,  87384,  87448,  87480,  87544,  87672,  88982,  90340,  90902,
  91598,  92182,  92846,  93488,  95246,  95278,  95310,  95374,  95502,  96878,
  98266,  98848,  99542, 100234, 100884, 101524, 103320, 103352, 103384, 103416,
 103480, 104874, 106222, 106910, 107584, 108258, 108902, 109544, 111366, 111398,
 111430, 111462, 111494, 112878, 114320, 114988, 115660, 116310, 116950, 117592
};

static VLC_TYPE table_data[117592][2];

Kostya Shishkov's avatar
Kostya Shishkov committed
98 99 100 101
/**
 * Generate VLC from codeword lengths.
 * @param bits   codeword lengths (zeroes are accepted)
 * @param size   length of input data
102
 * @param vlc    output VLC
Kostya Shishkov's avatar
Kostya Shishkov committed
103
 * @param insyms symbols for input codes (NULL for default ones)
104
 * @param num    VLC table number (for static initialization)
Kostya Shishkov's avatar
Kostya Shishkov committed
105
 */
106 107
static void rv34_gen_vlc(const uint8_t *bits, int size, VLC *vlc, const uint8_t *insyms,
                         const int num)
Kostya Shishkov's avatar
Kostya Shishkov committed
108 109 110
{
    int i;
    int counts[17] = {0}, codes[17];
Måns Rullgård's avatar
Måns Rullgård committed
111 112
    uint16_t cw[MAX_VLC_SIZE], syms[MAX_VLC_SIZE];
    uint8_t bits2[MAX_VLC_SIZE];
Kostya Shishkov's avatar
Kostya Shishkov committed
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
    int maxbits = 0, realsize = 0;

    for(i = 0; i < size; i++){
        if(bits[i]){
            bits2[realsize] = bits[i];
            syms[realsize] = insyms ? insyms[i] : i;
            realsize++;
            maxbits = FFMAX(maxbits, bits[i]);
            counts[bits[i]]++;
        }
    }

    codes[0] = 0;
    for(i = 0; i < 16; i++)
        codes[i+1] = (codes[i] + counts[i]) << 1;
    for(i = 0; i < realsize; i++)
        cw[i] = codes[bits2[i]]++;

131 132
    vlc->table = &table_data[table_offs[num]];
    vlc->table_allocated = table_offs[num + 1] - table_offs[num];
133 134 135 136
    ff_init_vlc_sparse(vlc, FFMIN(maxbits, 9), realsize,
                       bits2, 1, 1,
                       cw,    2, 2,
                       syms,  2, 2, INIT_VLC_USE_NEW_STATIC);
Kostya Shishkov's avatar
Kostya Shishkov committed
137 138 139 140 141
}

/**
 * Initialize all tables.
 */
142
static av_cold void rv34_init_tables(void)
Kostya Shishkov's avatar
Kostya Shishkov committed
143 144 145 146 147
{
    int i, j, k;

    for(i = 0; i < NUM_INTRA_TABLES; i++){
        for(j = 0; j < 2; j++){
148 149 150
            rv34_gen_vlc(rv34_table_intra_cbppat   [i][j], CBPPAT_VLC_SIZE,   &intra_vlcs[i].cbppattern[j],     NULL, 19*i + 0 + j);
            rv34_gen_vlc(rv34_table_intra_secondpat[i][j], OTHERBLK_VLC_SIZE, &intra_vlcs[i].second_pattern[j], NULL, 19*i + 2 + j);
            rv34_gen_vlc(rv34_table_intra_thirdpat [i][j], OTHERBLK_VLC_SIZE, &intra_vlcs[i].third_pattern[j],  NULL, 19*i + 4 + j);
151
            for(k = 0; k < 4; k++){
152
                rv34_gen_vlc(rv34_table_intra_cbp[i][j+k*2],  CBP_VLC_SIZE,   &intra_vlcs[i].cbp[j][k],         rv34_cbp_code, 19*i + 6 + j*4 + k);
153
            }
Kostya Shishkov's avatar
Kostya Shishkov committed
154
        }
155
        for(j = 0; j < 4; j++){
156
            rv34_gen_vlc(rv34_table_intra_firstpat[i][j], FIRSTBLK_VLC_SIZE, &intra_vlcs[i].first_pattern[j], NULL, 19*i + 14 + j);
157
        }
158
        rv34_gen_vlc(rv34_intra_coeff[i], COEFF_VLC_SIZE, &intra_vlcs[i].coefficient, NULL, 19*i + 18);
Kostya Shishkov's avatar
Kostya Shishkov committed
159 160 161
    }

    for(i = 0; i < NUM_INTER_TABLES; i++){
162
        rv34_gen_vlc(rv34_inter_cbppat[i], CBPPAT_VLC_SIZE, &inter_vlcs[i].cbppattern[0], NULL, i*12 + 95);
163
        for(j = 0; j < 4; j++){
164
            rv34_gen_vlc(rv34_inter_cbp[i][j], CBP_VLC_SIZE, &inter_vlcs[i].cbp[0][j], rv34_cbp_code, i*12 + 96 + j);
165
        }
Kostya Shishkov's avatar
Kostya Shishkov committed
166
        for(j = 0; j < 2; j++){
167 168 169
            rv34_gen_vlc(rv34_table_inter_firstpat [i][j], FIRSTBLK_VLC_SIZE, &inter_vlcs[i].first_pattern[j],  NULL, i*12 + 100 + j);
            rv34_gen_vlc(rv34_table_inter_secondpat[i][j], OTHERBLK_VLC_SIZE, &inter_vlcs[i].second_pattern[j], NULL, i*12 + 102 + j);
            rv34_gen_vlc(rv34_table_inter_thirdpat [i][j], OTHERBLK_VLC_SIZE, &inter_vlcs[i].third_pattern[j],  NULL, i*12 + 104 + j);
Kostya Shishkov's avatar
Kostya Shishkov committed
170
        }
171
        rv34_gen_vlc(rv34_inter_coeff[i], COEFF_VLC_SIZE, &inter_vlcs[i].coefficient, NULL, i*12 + 106);
Kostya Shishkov's avatar
Kostya Shishkov committed
172 173 174 175 176 177
    }
}

/** @} */ // vlc group

/**
178
 * @name RV30/40 4x4 block decoding functions
Kostya Shishkov's avatar
Kostya Shishkov committed
179 180 181 182 183 184 185 186 187 188 189 190
 * @{
 */

/**
 * Decode coded block pattern.
 */
static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
{
    int pattern, code, cbp=0;
    int ones;
    static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000};
    static const int shifts[4] = { 0, 2, 8, 10 };
191
    const int *curshift = shifts;
Kostya Shishkov's avatar
Kostya Shishkov committed
192 193 194 195 196 197 198 199 200 201 202 203 204 205
    int i, t, mask;

    code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2);
    pattern = code & 0xF;
    code >>= 4;

    ones = rv34_count_ones[pattern];

    for(mask = 8; mask; mask >>= 1, curshift++){
        if(pattern & mask)
            cbp |= get_vlc2(gb, vlc->cbp[table][ones].table, vlc->cbp[table][ones].bits, 1) << curshift[0];
    }

    for(i = 0; i < 4; i++){
206
        t = (modulo_three_table[code] >> (6 - 2*i)) & 3;
Kostya Shishkov's avatar
Kostya Shishkov committed
207 208 209 210 211 212 213 214 215
        if(t == 1)
            cbp |= cbp_masks[get_bits1(gb)] << i;
        if(t == 2)
            cbp |= cbp_masks[2] << i;
    }
    return cbp;
}

/**
216
 * Get one coefficient value from the bitstream and store it.
Kostya Shishkov's avatar
Kostya Shishkov committed
217
 */
Diego Biurrun's avatar
Diego Biurrun committed
218
static inline void decode_coeff(int16_t *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q)
Kostya Shishkov's avatar
Kostya Shishkov committed
219 220 221 222 223 224 225 226 227 228 229 230
{
    if(coef){
        if(coef == esc){
            coef = get_vlc2(gb, vlc->table, 9, 2);
            if(coef > 23){
                coef -= 23;
                coef = 22 + ((1 << coef) | get_bits(gb, coef));
            }
            coef += esc;
        }
        if(get_bits1(gb))
            coef = -coef;
231
        *dst = (coef*q + 8) >> 4;
Kostya Shishkov's avatar
Kostya Shishkov committed
232 233 234 235 236 237
    }
}

/**
 * Decode 2x2 subblock of coefficients.
 */
Diego Biurrun's avatar
Diego Biurrun committed
238
static inline void decode_subblock(int16_t *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc, int q)
Kostya Shishkov's avatar
Kostya Shishkov committed
239
{
240
    int flags = modulo_three_table[code];
Kostya Shishkov's avatar
Kostya Shishkov committed
241

242
    decode_coeff(    dst+0*4+0, (flags >> 6)    , 3, gb, vlc, q);
Kostya Shishkov's avatar
Kostya Shishkov committed
243
    if(is_block2){
244 245
        decode_coeff(dst+1*4+0, (flags >> 4) & 3, 2, gb, vlc, q);
        decode_coeff(dst+0*4+1, (flags >> 2) & 3, 2, gb, vlc, q);
Kostya Shishkov's avatar
Kostya Shishkov committed
246
    }else{
247 248
        decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q);
        decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q);
Kostya Shishkov's avatar
Kostya Shishkov committed
249
    }
250
    decode_coeff(    dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q);
251 252 253 254 255
}

/**
 * Decode a single coefficient.
 */
Diego Biurrun's avatar
Diego Biurrun committed
256
static inline void decode_subblock1(int16_t *dst, int code, GetBitContext *gb, VLC *vlc, int q)
257 258 259
{
    int coeff = modulo_three_table[code] >> 6;
    decode_coeff(dst, coeff, 3, gb, vlc, q);
260 261
}

Diego Biurrun's avatar
Diego Biurrun committed
262
static inline void decode_subblock3(int16_t *dst, int code, GetBitContext *gb, VLC *vlc,
263 264
                                    int q_dc, int q_ac1, int q_ac2)
{
265
    int flags = modulo_three_table[code];
266

267 268 269 270
    decode_coeff(dst+0*4+0, (flags >> 6)    , 3, gb, vlc, q_dc);
    decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q_ac1);
    decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q_ac1);
    decode_coeff(dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q_ac2);
Kostya Shishkov's avatar
Kostya Shishkov committed
271 272 273 274 275 276 277 278 279 280 281 282 283
}

/**
 * Decode coefficients for 4x4 block.
 *
 * This is done by filling 2x2 subblocks with decoded coefficients
 * in this order (the same for subblocks and subblock coefficients):
 *  o--o
 *    /
 *   /
 *  o--o
 */

Diego Biurrun's avatar
Diego Biurrun committed
284
static int rv34_decode_block(int16_t *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2)
Kostya Shishkov's avatar
Kostya Shishkov committed
285
{
286
    int code, pattern, has_ac = 1;
Kostya Shishkov's avatar
Kostya Shishkov committed
287 288 289 290 291 292

    code = get_vlc2(gb, rvlc->first_pattern[fc].table, 9, 2);

    pattern = code & 0x7;

    code >>= 3;
293 294

    if (modulo_three_table[code] & 0x3F) {
295
        decode_subblock3(dst, code, gb, &rvlc->coefficient, q_dc, q_ac1, q_ac2);
296 297 298 299 300 301
    } else {
        decode_subblock1(dst, code, gb, &rvlc->coefficient, q_dc);
        if (!pattern)
            return 0;
        has_ac = 0;
    }
Kostya Shishkov's avatar
Kostya Shishkov committed
302 303 304

    if(pattern & 4){
        code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2);
305
        decode_subblock(dst + 4*0+2, code, 0, gb, &rvlc->coefficient, q_ac2);
Kostya Shishkov's avatar
Kostya Shishkov committed
306 307 308
    }
    if(pattern & 2){ // Looks like coefficients 1 and 2 are swapped for this block
        code = get_vlc2(gb, rvlc->second_pattern[sc].table, 9, 2);
309
        decode_subblock(dst + 4*2+0, code, 1, gb, &rvlc->coefficient, q_ac2);
Kostya Shishkov's avatar
Kostya Shishkov committed
310 311 312
    }
    if(pattern & 1){
        code = get_vlc2(gb, rvlc->third_pattern[sc].table, 9, 2);
313
        decode_subblock(dst + 4*2+2, code, 0, gb, &rvlc->coefficient, q_ac2);
Kostya Shishkov's avatar
Kostya Shishkov committed
314
    }
315
    return has_ac | pattern;
Kostya Shishkov's avatar
Kostya Shishkov committed
316 317 318
}

/**
319
 * @name RV30/40 bitstream parsing
Kostya Shishkov's avatar
Kostya Shishkov committed
320 321 322 323 324 325 326 327 328 329 330
 * @{
 */

/**
 * Decode starting slice position.
 * @todo Maybe replace with ff_h263_decode_mba() ?
 */
int ff_rv34_get_start_offset(GetBitContext *gb, int mb_size)
{
    int i;
    for(i = 0; i < 5; i++)
331
        if(rv34_mb_max_sizes[i] >= mb_size - 1)
Kostya Shishkov's avatar
Kostya Shishkov committed
332 333 334 335 336 337 338 339 340 341 342 343 344 345 346
            break;
    return rv34_mb_bits_sizes[i];
}

/**
 * Select VLC set for decoding from current quantizer, modifier and frame type.
 */
static inline RV34VLC* choose_vlc_set(int quant, int mod, int type)
{
    if(mod == 2 && quant < 19) quant += 10;
    else if(mod && quant < 26) quant += 5;
    return type ? &inter_vlcs[rv34_quant_to_vlc_set[1][av_clip(quant, 0, 30)]]
                : &intra_vlcs[rv34_quant_to_vlc_set[0][av_clip(quant, 0, 30)]];
}

347
/**
348
 * Decode intra macroblock header and return CBP in case of success, -1 otherwise.
349
 */
350
static int rv34_decode_intra_mb_header(RV34DecContext *r, int8_t *intra_types)
351 352 353 354
{
    MpegEncContext *s = &r->s;
    GetBitContext *gb = &s->gb;
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
355
    int t;
356

357 358
    r->is16 = get_bits1(gb);
    if(r->is16){
359
        s->current_picture_ptr->mb_type[mb_pos] = MB_TYPE_INTRA16x16;
360 361 362 363 364 365
        r->block_type = RV34_MB_TYPE_INTRA16x16;
        t = get_bits(gb, 2);
        fill_rectangle(intra_types, 4, 4, r->intra_types_stride, t, sizeof(intra_types[0]));
        r->luma_vlc   = 2;
    }else{
        if(!r->rv30){
366 367 368
            if(!get_bits1(gb))
                av_log(s->avctx, AV_LOG_ERROR, "Need DQUANT\n");
        }
369
        s->current_picture_ptr->mb_type[mb_pos] = MB_TYPE_INTRA;
370 371
        r->block_type = RV34_MB_TYPE_INTRA;
        if(r->decode_intra_types(r, gb, intra_types) < 0)
372
            return -1;
373
        r->luma_vlc   = 1;
374
    }
375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394

    r->chroma_vlc = 0;
    r->cur_vlcs   = choose_vlc_set(r->si.quant, r->si.vlc_set, 0);

    return rv34_decode_cbp(gb, r->cur_vlcs, r->is16);
}

/**
 * Decode inter macroblock header and return CBP in case of success, -1 otherwise.
 */
static int rv34_decode_inter_mb_header(RV34DecContext *r, int8_t *intra_types)
{
    MpegEncContext *s = &r->s;
    GetBitContext *gb = &s->gb;
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
    int i, t;

    r->block_type = r->decode_mb_info(r);
    if(r->block_type == -1)
        return -1;
395
    s->current_picture_ptr->mb_type[mb_pos] = rv34_mb_type_to_lavc[r->block_type];
396 397 398 399 400 401 402
    r->mb_type[mb_pos] = r->block_type;
    if(r->block_type == RV34_MB_SKIP){
        if(s->pict_type == AV_PICTURE_TYPE_P)
            r->mb_type[mb_pos] = RV34_MB_P_16x16;
        if(s->pict_type == AV_PICTURE_TYPE_B)
            r->mb_type[mb_pos] = RV34_MB_B_DIRECT;
    }
403
    r->is16 = !!IS_INTRA16x16(s->current_picture_ptr->mb_type[mb_pos]);
404 405 406 407 408 409 410 411
    rv34_decode_mv(r, r->block_type);
    if(r->block_type == RV34_MB_SKIP){
        fill_rectangle(intra_types, 4, 4, r->intra_types_stride, 0, sizeof(intra_types[0]));
        return 0;
    }
    r->chroma_vlc = 1;
    r->luma_vlc   = 0;

412
    if(IS_INTRA(s->current_picture_ptr->mb_type[mb_pos])){
413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438
        if(r->is16){
            t = get_bits(gb, 2);
            fill_rectangle(intra_types, 4, 4, r->intra_types_stride, t, sizeof(intra_types[0]));
            r->luma_vlc   = 2;
        }else{
            if(r->decode_intra_types(r, gb, intra_types) < 0)
                return -1;
            r->luma_vlc   = 1;
        }
        r->chroma_vlc = 0;
        r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 0);
    }else{
        for(i = 0; i < 16; i++)
            intra_types[(i & 3) + (i>>2) * r->intra_types_stride] = 0;
        r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 1);
        if(r->mb_type[mb_pos] == RV34_MB_P_MIX16x16){
            r->is16 = 1;
            r->chroma_vlc = 1;
            r->luma_vlc   = 2;
            r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 0);
        }
    }

    return rv34_decode_cbp(gb, r->cur_vlcs, r->is16);
}

Kostya Shishkov's avatar
Kostya Shishkov committed
439 440 441
/** @} */ //bitstream functions

/**
442
 * @name motion vector related code (prediction, reconstruction, motion compensation)
Kostya Shishkov's avatar
Kostya Shishkov committed
443 444 445 446 447 448 449 450 451 452
 * @{
 */

/** macroblock partition width in 8x8 blocks */
static const uint8_t part_sizes_w[RV34_MB_TYPES] = { 2, 2, 2, 1, 2, 2, 2, 2, 2, 1, 2, 2 };

/** macroblock partition height in 8x8 blocks */
static const uint8_t part_sizes_h[RV34_MB_TYPES] = { 2, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 2 };

/** availability index for subblocks */
453
static const uint8_t avail_indexes[4] = { 6, 7, 10, 11 };
Kostya Shishkov's avatar
Kostya Shishkov committed
454 455 456 457 458 459 460 461 462 463 464 465 466 467 468

/**
 * motion vector prediction
 *
 * Motion prediction performed for the block by using median prediction of
 * motion vectors from the left, top and right top blocks but in corner cases
 * some other vectors may be used instead.
 */
static void rv34_pred_mv(RV34DecContext *r, int block_type, int subblock_no, int dmv_no)
{
    MpegEncContext *s = &r->s;
    int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
    int A[2] = {0}, B[2], C[2];
    int i, j;
    int mx, my;
469
    int* avail = r->avail_cache + avail_indexes[subblock_no];
Kostya Shishkov's avatar
Kostya Shishkov committed
470 471 472 473 474 475
    int c_off = part_sizes_w[block_type];

    mv_pos += (subblock_no & 1) + (subblock_no >> 1)*s->b8_stride;
    if(subblock_no == 3)
        c_off = -1;

476
    if(avail[-1]){
477 478
        A[0] = s->current_picture_ptr->motion_val[0][mv_pos-1][0];
        A[1] = s->current_picture_ptr->motion_val[0][mv_pos-1][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
479
    }
480
    if(avail[-4]){
481 482
        B[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][0];
        B[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
483 484 485 486
    }else{
        B[0] = A[0];
        B[1] = A[1];
    }
487 488
    if(!avail[c_off-4]){
        if(avail[-4] && (avail[-1] || r->rv30)){
489 490
            C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][0];
            C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride-1][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
491 492 493 494 495
        }else{
            C[0] = A[0];
            C[1] = A[1];
        }
    }else{
496 497
        C[0] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][0];
        C[1] = s->current_picture_ptr->motion_val[0][mv_pos-s->b8_stride+c_off][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
498 499 500 501 502 503 504
    }
    mx = mid_pred(A[0], B[0], C[0]);
    my = mid_pred(A[1], B[1], C[1]);
    mx += r->dmv[dmv_no][0];
    my += r->dmv[dmv_no][1];
    for(j = 0; j < part_sizes_h[block_type]; j++){
        for(i = 0; i < part_sizes_w[block_type]; i++){
505 506
            s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][0] = mx;
            s->current_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][1] = my;
Kostya Shishkov's avatar
Kostya Shishkov committed
507 508 509 510
        }
    }
}

511 512
#define GET_PTS_DIFF(a, b) ((a - b + 8192) & 0x1FFF)

513 514 515
/**
 * Calculate motion vector component that should be added for direct blocks.
 */
516
static int calc_add_mv(RV34DecContext *r, int dir, int val)
517
{
518
    int mul = dir ? -r->mv_weight2 : r->mv_weight1;
519

520
    return (val * mul + 0x2000) >> 14;
521 522
}

Kostya Shishkov's avatar
Kostya Shishkov committed
523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550
/**
 * Predict motion vector for B-frame macroblock.
 */
static inline void rv34_pred_b_vector(int A[2], int B[2], int C[2],
                                      int A_avail, int B_avail, int C_avail,
                                      int *mx, int *my)
{
    if(A_avail + B_avail + C_avail != 3){
        *mx = A[0] + B[0] + C[0];
        *my = A[1] + B[1] + C[1];
        if(A_avail + B_avail + C_avail == 2){
            *mx /= 2;
            *my /= 2;
        }
    }else{
        *mx = mid_pred(A[0], B[0], C[0]);
        *my = mid_pred(A[1], B[1], C[1]);
    }
}

/**
 * motion vector prediction for B-frames
 */
static void rv34_pred_mv_b(RV34DecContext *r, int block_type, int dir)
{
    MpegEncContext *s = &r->s;
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
    int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
551
    int A[2] = { 0 }, B[2] = { 0 }, C[2] = { 0 };
Kostya Shishkov's avatar
Kostya Shishkov committed
552 553 554 555 556
    int has_A = 0, has_B = 0, has_C = 0;
    int mx, my;
    int i, j;
    Picture *cur_pic = s->current_picture_ptr;
    const int mask = dir ? MB_TYPE_L1 : MB_TYPE_L0;
557
    int type = cur_pic->mb_type[mb_pos];
Kostya Shishkov's avatar
Kostya Shishkov committed
558

559
    if((r->avail_cache[6-1] & type) & mask){
560 561
        A[0] = cur_pic->motion_val[dir][mv_pos - 1][0];
        A[1] = cur_pic->motion_val[dir][mv_pos - 1][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
562 563
        has_A = 1;
    }
564
    if((r->avail_cache[6-4] & type) & mask){
565 566
        B[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][0];
        B[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
567 568
        has_B = 1;
    }
569
    if(r->avail_cache[6-4] && (r->avail_cache[6-2] & type) & mask){
570 571
        C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][0];
        C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride + 2][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
572
        has_C = 1;
573
    }else if((s->mb_x+1) == s->mb_width && (r->avail_cache[6-5] & type) & mask){
574 575
        C[0] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][0];
        C[1] = cur_pic->motion_val[dir][mv_pos - s->b8_stride - 1][1];
Kostya Shishkov's avatar
Kostya Shishkov committed
576 577 578 579 580 581 582
        has_C = 1;
    }

    rv34_pred_b_vector(A, B, C, has_A, has_B, has_C, &mx, &my);

    mx += r->dmv[dir][0];
    my += r->dmv[dir][1];
583

Kostya Shishkov's avatar
Kostya Shishkov committed
584 585
    for(j = 0; j < 2; j++){
        for(i = 0; i < 2; i++){
586 587
            cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][0] = mx;
            cur_pic->motion_val[dir][mv_pos + i + j*s->b8_stride][1] = my;
Kostya Shishkov's avatar
Kostya Shishkov committed
588 589
        }
    }
590
    if(block_type == RV34_MB_B_BACKWARD || block_type == RV34_MB_B_FORWARD){
591
        ZERO8x2(cur_pic->motion_val[!dir][mv_pos], s->b8_stride);
592
    }
Kostya Shishkov's avatar
Kostya Shishkov committed
593 594
}

595 596 597 598 599 600 601 602
/**
 * motion vector prediction - RV3 version
 */
static void rv34_pred_mv_rv3(RV34DecContext *r, int block_type, int dir)
{
    MpegEncContext *s = &r->s;
    int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
    int A[2] = {0}, B[2], C[2];
603
    int i, j, k;
604
    int mx, my;
605
    int* avail = r->avail_cache + avail_indexes[0];
606

607
    if(avail[-1]){
608 609
        A[0] = s->current_picture_ptr->motion_val[0][mv_pos - 1][0];
        A[1] = s->current_picture_ptr->motion_val[0][mv_pos - 1][1];
610
    }
611
    if(avail[-4]){
612 613
        B[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride][0];
        B[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride][1];
614 615 616 617
    }else{
        B[0] = A[0];
        B[1] = A[1];
    }
618 619
    if(!avail[-4 + 2]){
        if(avail[-4] && (avail[-1])){
620 621
            C[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride - 1][0];
            C[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride - 1][1];
622 623 624 625 626
        }else{
            C[0] = A[0];
            C[1] = A[1];
        }
    }else{
627 628
        C[0] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride + 2][0];
        C[1] = s->current_picture_ptr->motion_val[0][mv_pos - s->b8_stride + 2][1];
629 630 631 632 633 634 635
    }
    mx = mid_pred(A[0], B[0], C[0]);
    my = mid_pred(A[1], B[1], C[1]);
    mx += r->dmv[0][0];
    my += r->dmv[0][1];
    for(j = 0; j < 2; j++){
        for(i = 0; i < 2; i++){
636
            for(k = 0; k < 2; k++){
637 638
                s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][0] = mx;
                s->current_picture_ptr->motion_val[k][mv_pos + i + j*s->b8_stride][1] = my;
639
            }
640 641 642 643
        }
    }
}

644
static const int chroma_coeffs[3] = { 0, 3, 5 };
645

Kostya Shishkov's avatar
Kostya Shishkov committed
646 647 648 649 650 651 652 653 654 655
/**
 * generic motion compensation function
 *
 * @param r decoder context
 * @param block_type type of the current block
 * @param xoff horizontal offset from the start of the current block
 * @param yoff vertical offset from the start of the current block
 * @param mv_off offset to the motion vector information
 * @param width width of the current partition in 8x8 blocks
 * @param height height of the current partition in 8x8 blocks
656 657 658 659
 * @param dir motion compensation direction (i.e. from the last or the next reference frame)
 * @param thirdpel motion vectors are specified in 1/3 of pixel
 * @param qpel_mc a set of functions used to perform luma motion compensation
 * @param chroma_mc a set of functions used to perform chroma motion compensation
Kostya Shishkov's avatar
Kostya Shishkov committed
660 661 662 663
 */
static inline void rv34_mc(RV34DecContext *r, const int block_type,
                          const int xoff, const int yoff, int mv_off,
                          const int width, const int height, int dir,
664
                          const int thirdpel, int weighted,
Kostya Shishkov's avatar
Kostya Shishkov committed
665 666 667 668 669
                          qpel_mc_func (*qpel_mc)[16],
                          h264_chroma_mc_func (*chroma_mc))
{
    MpegEncContext *s = &r->s;
    uint8_t *Y, *U, *V, *srcY, *srcU, *srcV;
670
    int dxy, mx, my, umx, umy, lx, ly, uvmx, uvmy, src_x, src_y, uvsrc_x, uvsrc_y;
Kostya Shishkov's avatar
Kostya Shishkov committed
671 672 673 674
    int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride + mv_off;
    int is16x16 = 1;

    if(thirdpel){
675
        int chroma_mx, chroma_my;
676 677 678 679 680 681
        mx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) / 3 - (1 << 24);
        my = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) / 3 - (1 << 24);
        lx = (s->current_picture_ptr->motion_val[dir][mv_pos][0] + (3 << 24)) % 3;
        ly = (s->current_picture_ptr->motion_val[dir][mv_pos][1] + (3 << 24)) % 3;
        chroma_mx = s->current_picture_ptr->motion_val[dir][mv_pos][0] / 2;
        chroma_my = s->current_picture_ptr->motion_val[dir][mv_pos][1] / 2;
682 683 684 685
        umx = (chroma_mx + (3 << 24)) / 3 - (1 << 24);
        umy = (chroma_my + (3 << 24)) / 3 - (1 << 24);
        uvmx = chroma_coeffs[(chroma_mx + (3 << 24)) % 3];
        uvmy = chroma_coeffs[(chroma_my + (3 << 24)) % 3];
Kostya Shishkov's avatar
Kostya Shishkov committed
686
    }else{
Kostya Shishkov's avatar
Kostya Shishkov committed
687
        int cx, cy;
688 689 690 691 692 693
        mx = s->current_picture_ptr->motion_val[dir][mv_pos][0] >> 2;
        my = s->current_picture_ptr->motion_val[dir][mv_pos][1] >> 2;
        lx = s->current_picture_ptr->motion_val[dir][mv_pos][0] & 3;
        ly = s->current_picture_ptr->motion_val[dir][mv_pos][1] & 3;
        cx = s->current_picture_ptr->motion_val[dir][mv_pos][0] / 2;
        cy = s->current_picture_ptr->motion_val[dir][mv_pos][1] / 2;
Kostya Shishkov's avatar
Kostya Shishkov committed
694 695 696 697 698 699 700
        umx = cx >> 2;
        umy = cy >> 2;
        uvmx = (cx & 3) << 1;
        uvmy = (cy & 3) << 1;
        //due to some flaw RV40 uses the same MC compensation routine for H2V2 and H3V3
        if(uvmx == 6 && uvmy == 6)
            uvmx = uvmy = 4;
Kostya Shishkov's avatar
Kostya Shishkov committed
701
    }
702 703 704

    if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
        /* wait for the referenced mb row to be finished */
705
        int mb_row = s->mb_y + ((yoff + my + 5 + 8 * height) >> 4);
706
        ThreadFrame *f = dir ? &s->next_picture_ptr->tf : &s->last_picture_ptr->tf;
707 708 709
        ff_thread_await_progress(f, mb_row, 0);
    }

710
    dxy = ly*4 + lx;
711 712 713
    srcY = dir ? s->next_picture_ptr->f.data[0] : s->last_picture_ptr->f.data[0];
    srcU = dir ? s->next_picture_ptr->f.data[1] : s->last_picture_ptr->f.data[1];
    srcV = dir ? s->next_picture_ptr->f.data[2] : s->last_picture_ptr->f.data[2];
Kostya Shishkov's avatar
Kostya Shishkov committed
714 715
    src_x = s->mb_x * 16 + xoff + mx;
    src_y = s->mb_y * 16 + yoff + my;
716 717
    uvsrc_x = s->mb_x * 8 + (xoff >> 1) + umx;
    uvsrc_y = s->mb_y * 8 + (yoff >> 1) + umy;
Kostya Shishkov's avatar
Kostya Shishkov committed
718 719 720
    srcY += src_y * s->linesize + src_x;
    srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
    srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
721 722 723
    if(s->h_edge_pos - (width << 3) < 6 || s->v_edge_pos - (height << 3) < 6 ||
       (unsigned)(src_x - !!lx*2) > s->h_edge_pos - !!lx*2 - (width <<3) - 4 ||
       (unsigned)(src_y - !!ly*2) > s->v_edge_pos - !!ly*2 - (height<<3) - 4) {
724
        uint8_t *uvbuf = s->edge_emu_buffer + 22 * s->linesize;
Kostya Shishkov's avatar
Kostya Shishkov committed
725 726

        srcY -= 2 + 2*s->linesize;
727 728 729
        s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY,
                                 s->linesize, s->linesize,
                                 (width << 3) + 6, (height << 3) + 6,
730
                                 src_x - 2, src_y - 2,
731
                                 s->h_edge_pos, s->v_edge_pos);
Kostya Shishkov's avatar
Kostya Shishkov committed
732
        srcY = s->edge_emu_buffer + 2 + 2*s->linesize;
733
        s->vdsp.emulated_edge_mc(uvbuf, srcU,
734
                                 s->uvlinesize, s->uvlinesize,
735
                                 (width << 2) + 1, (height << 2) + 1,
736
                                 uvsrc_x, uvsrc_y,
737
                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
738 739 740
        s->vdsp.emulated_edge_mc(uvbuf + 16, srcV,
                                 s->uvlinesize, s->uvlinesize,
                                 (width << 2) + 1, (height << 2) + 1,
741
                                 uvsrc_x, uvsrc_y,
742
                                 s->h_edge_pos >> 1, s->v_edge_pos >> 1);
Kostya Shishkov's avatar
Kostya Shishkov committed
743 744 745
        srcU = uvbuf;
        srcV = uvbuf + 16;
    }
746 747 748 749 750 751 752 753 754
    if(!weighted){
        Y = s->dest[0] + xoff      + yoff     *s->linesize;
        U = s->dest[1] + (xoff>>1) + (yoff>>1)*s->uvlinesize;
        V = s->dest[2] + (xoff>>1) + (yoff>>1)*s->uvlinesize;
    }else{
        Y = r->tmp_b_block_y [dir]     +  xoff     +  yoff    *s->linesize;
        U = r->tmp_b_block_uv[dir*2]   + (xoff>>1) + (yoff>>1)*s->uvlinesize;
        V = r->tmp_b_block_uv[dir*2+1] + (xoff>>1) + (yoff>>1)*s->uvlinesize;
    }
Kostya Shishkov's avatar
Kostya Shishkov committed
755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774

    if(block_type == RV34_MB_P_16x8){
        qpel_mc[1][dxy](Y, srcY, s->linesize);
        Y    += 8;
        srcY += 8;
    }else if(block_type == RV34_MB_P_8x16){
        qpel_mc[1][dxy](Y, srcY, s->linesize);
        Y    += 8 * s->linesize;
        srcY += 8 * s->linesize;
    }
    is16x16 = (block_type != RV34_MB_P_8x8) && (block_type != RV34_MB_P_16x8) && (block_type != RV34_MB_P_8x16);
    qpel_mc[!is16x16][dxy](Y, srcY, s->linesize);
    chroma_mc[2-width]   (U, srcU, s->uvlinesize, height*4, uvmx, uvmy);
    chroma_mc[2-width]   (V, srcV, s->uvlinesize, height*4, uvmx, uvmy);
}

static void rv34_mc_1mv(RV34DecContext *r, const int block_type,
                        const int xoff, const int yoff, int mv_off,
                        const int width, const int height, int dir)
{
775
    rv34_mc(r, block_type, xoff, yoff, mv_off, width, height, dir, r->rv30, 0,
776 777
            r->rdsp.put_pixels_tab,
            r->rdsp.put_chroma_pixels_tab);
Kostya Shishkov's avatar
Kostya Shishkov committed
778 779
}

780 781
static void rv4_weight(RV34DecContext *r)
{
782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799
    r->rdsp.rv40_weight_pixels_tab[r->scaled_weight][0](r->s.dest[0],
                                                        r->tmp_b_block_y[0],
                                                        r->tmp_b_block_y[1],
                                                        r->weight1,
                                                        r->weight2,
                                                        r->s.linesize);
    r->rdsp.rv40_weight_pixels_tab[r->scaled_weight][1](r->s.dest[1],
                                                        r->tmp_b_block_uv[0],
                                                        r->tmp_b_block_uv[2],
                                                        r->weight1,
                                                        r->weight2,
                                                        r->s.uvlinesize);
    r->rdsp.rv40_weight_pixels_tab[r->scaled_weight][1](r->s.dest[2],
                                                        r->tmp_b_block_uv[1],
                                                        r->tmp_b_block_uv[3],
                                                        r->weight1,
                                                        r->weight2,
                                                        r->s.uvlinesize);
Kostya Shishkov's avatar
Kostya Shishkov committed
800 801 802 803
}

static void rv34_mc_2mv(RV34DecContext *r, const int block_type)
{
804 805 806
    int weighted = !r->rv30 && block_type != RV34_MB_B_BIDIR && r->weight1 != 8192;

    rv34_mc(r, block_type, 0, 0, 0, 2, 2, 0, r->rv30, weighted,
807 808
            r->rdsp.put_pixels_tab,
            r->rdsp.put_chroma_pixels_tab);
809 810 811 812 813 814 815 816 817 818
    if(!weighted){
        rv34_mc(r, block_type, 0, 0, 0, 2, 2, 1, r->rv30, 0,
                r->rdsp.avg_pixels_tab,
                r->rdsp.avg_chroma_pixels_tab);
    }else{
        rv34_mc(r, block_type, 0, 0, 0, 2, 2, 1, r->rv30, 1,
                r->rdsp.put_pixels_tab,
                r->rdsp.put_chroma_pixels_tab);
        rv4_weight(r);
    }
Kostya Shishkov's avatar
Kostya Shishkov committed
819 820
}

821 822
static void rv34_mc_2mv_skip(RV34DecContext *r)
{
Diego Biurrun's avatar
Diego Biurrun committed
823
    int i, j;
824 825
    int weighted = !r->rv30 && r->weight1 != 8192;

826 827 828
    for(j = 0; j < 2; j++)
        for(i = 0; i < 2; i++){
             rv34_mc(r, RV34_MB_P_8x8, i*8, j*8, i+j*r->s.b8_stride, 1, 1, 0, r->rv30,
829
                     weighted,
830 831
                     r->rdsp.put_pixels_tab,
                     r->rdsp.put_chroma_pixels_tab);
832
             rv34_mc(r, RV34_MB_P_8x8, i*8, j*8, i+j*r->s.b8_stride, 1, 1, 1, r->rv30,
833 834 835
                     weighted,
                     weighted ? r->rdsp.put_pixels_tab : r->rdsp.avg_pixels_tab,
                     weighted ? r->rdsp.put_chroma_pixels_tab : r->rdsp.avg_chroma_pixels_tab);
836
        }
837 838
    if(weighted)
        rv4_weight(r);
839 840
}

Kostya Shishkov's avatar
Kostya Shishkov committed
841 842 843 844 845 846 847 848 849 850 851
/** number of motion vectors in each macroblock type */
static const int num_mvs[RV34_MB_TYPES] = { 0, 0, 1, 4, 1, 1, 0, 0, 2, 2, 2, 1 };

/**
 * Decode motion vector differences
 * and perform motion vector reconstruction and motion compensation.
 */
static int rv34_decode_mv(RV34DecContext *r, int block_type)
{
    MpegEncContext *s = &r->s;
    GetBitContext *gb = &s->gb;
852
    int i, j, k, l;
853 854
    int mv_pos = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
    int next_bt;
Kostya Shishkov's avatar
Kostya Shishkov committed
855 856 857 858 859 860 861 862 863

    memset(r->dmv, 0, sizeof(r->dmv));
    for(i = 0; i < num_mvs[block_type]; i++){
        r->dmv[i][0] = svq3_get_se_golomb(gb);
        r->dmv[i][1] = svq3_get_se_golomb(gb);
    }
    switch(block_type){
    case RV34_MB_TYPE_INTRA:
    case RV34_MB_TYPE_INTRA16x16:
864
        ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
Kostya Shishkov's avatar
Kostya Shishkov committed
865 866
        return 0;
    case RV34_MB_SKIP:
867
        if(s->pict_type == AV_PICTURE_TYPE_P){
868
            ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
Kostya Shishkov's avatar
Kostya Shishkov committed
869 870 871 872
            rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, 0);
            break;
        }
    case RV34_MB_B_DIRECT:
873
        //surprisingly, it uses motion scheme from next reference frame
874 875
        /* wait for the current mb row to be finished */
        if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
876
            ff_thread_await_progress(&s->next_picture_ptr->tf, FFMAX(0, s->mb_y-1), 0);
877

878
        next_bt = s->next_picture_ptr->mb_type[s->mb_x + s->mb_y * s->mb_stride];
879
        if(IS_INTRA(next_bt) || IS_SKIP(next_bt)){
880 881
            ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
            ZERO8x2(s->current_picture_ptr->motion_val[1][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
882
        }else
883 884 885 886
            for(j = 0; j < 2; j++)
                for(i = 0; i < 2; i++)
                    for(k = 0; k < 2; k++)
                        for(l = 0; l < 2; l++)
887
                            s->current_picture_ptr->motion_val[l][mv_pos + i + j*s->b8_stride][k] = calc_add_mv(r, l, s->next_picture_ptr->motion_val[0][mv_pos + i + j*s->b8_stride][k]);
888
        if(!(IS_16X8(next_bt) || IS_8X16(next_bt) || IS_8X8(next_bt))) //we can use whole macroblock MC
889 890 891
            rv34_mc_2mv(r, block_type);
        else
            rv34_mc_2mv_skip(r);
892
        ZERO8x2(s->current_picture_ptr->motion_val[0][s->mb_x * 2 + s->mb_y * 2 * s->b8_stride], s->b8_stride);
Kostya Shishkov's avatar
Kostya Shishkov committed
893 894 895 896 897 898 899 900 901 902
        break;
    case RV34_MB_P_16x16:
    case RV34_MB_P_MIX16x16:
        rv34_pred_mv(r, block_type, 0, 0);
        rv34_mc_1mv (r, block_type, 0, 0, 0, 2, 2, 0);
        break;
    case RV34_MB_B_FORWARD:
    case RV34_MB_B_BACKWARD:
        r->dmv[1][0] = r->dmv[0][0];
        r->dmv[1][1] = r->dmv[0][1];
903 904 905 906
        if(r->rv30)
            rv34_pred_mv_rv3(r, block_type, block_type == RV34_MB_B_BACKWARD);
        else
            rv34_pred_mv_b  (r, block_type, block_type == RV34_MB_B_BACKWARD);
Kostya Shishkov's avatar
Kostya Shishkov committed
907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939
        rv34_mc_1mv     (r, block_type, 0, 0, 0, 2, 2, block_type == RV34_MB_B_BACKWARD);
        break;
    case RV34_MB_P_16x8:
    case RV34_MB_P_8x16:
        rv34_pred_mv(r, block_type, 0, 0);
        rv34_pred_mv(r, block_type, 1 + (block_type == RV34_MB_P_16x8), 1);
        if(block_type == RV34_MB_P_16x8){
            rv34_mc_1mv(r, block_type, 0, 0, 0,            2, 1, 0);
            rv34_mc_1mv(r, block_type, 0, 8, s->b8_stride, 2, 1, 0);
        }
        if(block_type == RV34_MB_P_8x16){
            rv34_mc_1mv(r, block_type, 0, 0, 0, 1, 2, 0);
            rv34_mc_1mv(r, block_type, 8, 0, 1, 1, 2, 0);
        }
        break;
    case RV34_MB_B_BIDIR:
        rv34_pred_mv_b  (r, block_type, 0);
        rv34_pred_mv_b  (r, block_type, 1);
        rv34_mc_2mv     (r, block_type);
        break;
    case RV34_MB_P_8x8:
        for(i=0;i< 4;i++){
            rv34_pred_mv(r, block_type, i, i);
            rv34_mc_1mv (r, block_type, (i&1)<<3, (i&2)<<2, (i&1)+(i>>1)*s->b8_stride, 1, 1, 0);
        }
        break;
    }

    return 0;
}
/** @} */ // mv group

/**
940
 * @name Macroblock reconstruction functions
Kostya Shishkov's avatar
Kostya Shishkov committed
941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974
 * @{
 */
/** mapping of RV30/40 intra prediction types to standard H.264 types */
static const int ittrans[9] = {
 DC_PRED, VERT_PRED, HOR_PRED, DIAG_DOWN_RIGHT_PRED, DIAG_DOWN_LEFT_PRED,
 VERT_RIGHT_PRED, VERT_LEFT_PRED, HOR_UP_PRED, HOR_DOWN_PRED,
};

/** mapping of RV30/40 intra 16x16 prediction types to standard H.264 types */
static const int ittrans16[4] = {
 DC_PRED8x8, VERT_PRED8x8, HOR_PRED8x8, PLANE_PRED8x8,
};

/**
 * Perform 4x4 intra prediction.
 */
static void rv34_pred_4x4_block(RV34DecContext *r, uint8_t *dst, int stride, int itype, int up, int left, int down, int right)
{
    uint8_t *prev = dst - stride + 4;
    uint32_t topleft;

    if(!up && !left)
        itype = DC_128_PRED;
    else if(!up){
        if(itype == VERT_PRED) itype = HOR_PRED;
        if(itype == DC_PRED)   itype = LEFT_DC_PRED;
    }else if(!left){
        if(itype == HOR_PRED)  itype = VERT_PRED;
        if(itype == DC_PRED)   itype = TOP_DC_PRED;
        if(itype == DIAG_DOWN_LEFT_PRED) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN;
    }
    if(!down){
        if(itype == DIAG_DOWN_LEFT_PRED) itype = DIAG_DOWN_LEFT_PRED_RV40_NODOWN;
        if(itype == HOR_UP_PRED) itype = HOR_UP_PRED_RV40_NODOWN;
975
        if(itype == VERT_LEFT_PRED) itype = VERT_LEFT_PRED_RV40_NODOWN;
Kostya Shishkov's avatar
Kostya Shishkov committed
976 977
    }
    if(!right && up){
978
        topleft = dst[-stride + 3] * 0x01010101u;
979
        prev = (uint8_t*)&topleft;
Kostya Shishkov's avatar
Kostya Shishkov committed
980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999
    }
    r->h.pred4x4[itype](dst, prev, stride);
}

static inline int adjust_pred16(int itype, int up, int left)
{
    if(!up && !left)
        itype = DC_128_PRED8x8;
    else if(!up){
        if(itype == PLANE_PRED8x8)itype = HOR_PRED8x8;
        if(itype == VERT_PRED8x8) itype = HOR_PRED8x8;
        if(itype == DC_PRED8x8)   itype = LEFT_DC_PRED8x8;
    }else if(!left){
        if(itype == PLANE_PRED8x8)itype = VERT_PRED8x8;
        if(itype == HOR_PRED8x8)  itype = VERT_PRED8x8;
        if(itype == DC_PRED8x8)   itype = TOP_DC_PRED8x8;
    }
    return itype;
}

1000 1001 1002
static inline void rv34_process_block(RV34DecContext *r,
                                      uint8_t *pdst, int stride,
                                      int fc, int sc, int q_dc, int q_ac)
Kostya Shishkov's avatar
Kostya Shishkov committed
1003 1004
{
    MpegEncContext *s = &r->s;
Diego Biurrun's avatar
Diego Biurrun committed
1005
    int16_t *ptr = s->block[0];
1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
    int has_ac = rv34_decode_block(ptr, &s->gb, r->cur_vlcs,
                                   fc, sc, q_dc, q_ac, q_ac);
    if(has_ac){
        r->rdsp.rv34_idct_add(pdst, stride, ptr);
    }else{
        r->rdsp.rv34_idct_dc_add(pdst, stride, ptr[0]);
        ptr[0] = 0;
    }
}

1016
static void rv34_output_i16x16(RV34DecContext *r, int8_t *intra_types, int cbp)
Kostya Shishkov's avatar
Kostya Shishkov committed
1017
{
Diego Biurrun's avatar
Diego Biurrun committed
1018
    LOCAL_ALIGNED_16(int16_t, block16, [16]);
1019 1020 1021 1022 1023
    MpegEncContext *s    = &r->s;
    GetBitContext  *gb   = &s->gb;
    int             q_dc = rv34_qscale_tab[ r->luma_dc_quant_i[s->qscale] ],
                    q_ac = rv34_qscale_tab[s->qscale];
    uint8_t        *dst  = s->dest[0];
Diego Biurrun's avatar
Diego Biurrun committed
1024
    int16_t        *ptr  = s->block[0];
1025 1026
    int i, j, itype, has_ac;

1027
    memset(block16, 0, 16 * sizeof(*block16));
Kostya Shishkov's avatar
Kostya Shishkov committed
1028

1029 1030
    has_ac = rv34_decode_block(block16, gb, r->cur_vlcs, 3, 0, q_dc, q_dc, q_ac);
    if(has_ac)
1031
        r->rdsp.rv34_inv_transform(block16);
1032
    else
1033
        r->rdsp.rv34_inv_transform_dc(block16);
1034 1035 1036 1037 1038 1039 1040

    itype = ittrans16[intra_types[0]];
    itype = adjust_pred16(itype, r->avail_cache[6-4], r->avail_cache[6-1]);
    r->h.pred16x16[itype](dst, s->linesize);

    for(j = 0; j < 4; j++){
        for(i = 0; i < 4; i++, cbp >>= 1){
1041
            int dc = block16[i + j*4];
1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052

            if(cbp & 1){
                has_ac = rv34_decode_block(ptr, gb, r->cur_vlcs, r->luma_vlc, 0, q_ac, q_ac, q_ac);
            }else
                has_ac = 0;

            if(has_ac){
                ptr[0] = dc;
                r->rdsp.rv34_idct_add(dst+4*i, s->linesize, ptr);
            }else
                r->rdsp.rv34_idct_dc_add(dst+4*i, s->linesize, dc);
Kostya Shishkov's avatar
Kostya Shishkov committed
1053
        }
1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072

        dst += 4*s->linesize;
    }

    itype = ittrans16[intra_types[0]];
    if(itype == PLANE_PRED8x8) itype = DC_PRED8x8;
    itype = adjust_pred16(itype, r->avail_cache[6-4], r->avail_cache[6-1]);

    q_dc = rv34_qscale_tab[rv34_chroma_quant[1][s->qscale]];
    q_ac = rv34_qscale_tab[rv34_chroma_quant[0][s->qscale]];

    for(j = 1; j < 3; j++){
        dst = s->dest[j];
        r->h.pred8x8[itype](dst, s->uvlinesize);
        for(i = 0; i < 4; i++, cbp >>= 1){
            uint8_t *pdst;
            if(!(cbp & 1)) continue;
            pdst   = dst + (i&1)*4 + (i&2)*2*s->uvlinesize;

1073 1074
            rv34_process_block(r, pdst, s->uvlinesize,
                               r->chroma_vlc, 1, q_dc, q_ac);
Kostya Shishkov's avatar
Kostya Shishkov committed
1075 1076 1077 1078
        }
    }
}

1079 1080 1081 1082 1083 1084
static void rv34_output_intra(RV34DecContext *r, int8_t *intra_types, int cbp)
{
    MpegEncContext *s   = &r->s;
    uint8_t        *dst = s->dest[0];
    int      avail[6*8] = {0};
    int i, j, k;
1085
    int idx, q_ac, q_dc;
1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099

    // Set neighbour information.
    if(r->avail_cache[1])
        avail[0] = 1;
    if(r->avail_cache[2])
        avail[1] = avail[2] = 1;
    if(r->avail_cache[3])
        avail[3] = avail[4] = 1;
    if(r->avail_cache[4])
        avail[5] = 1;
    if(r->avail_cache[5])
        avail[8] = avail[16] = 1;
    if(r->avail_cache[9])
        avail[24] = avail[32] = 1;
Kostya Shishkov's avatar
Kostya Shishkov committed
1100

1101 1102 1103 1104 1105 1106 1107 1108
    q_ac = rv34_qscale_tab[s->qscale];
    for(j = 0; j < 4; j++){
        idx = 9 + j*8;
        for(i = 0; i < 4; i++, cbp >>= 1, dst += 4, idx++){
            rv34_pred_4x4_block(r, dst, s->linesize, ittrans[intra_types[i]], avail[idx-8], avail[idx-1], avail[idx+7], avail[idx-7]);
            avail[idx] = 1;
            if(!(cbp & 1)) continue;

1109 1110
            rv34_process_block(r, dst, s->linesize,
                               r->luma_vlc, 0, q_ac, q_ac);
Kostya Shishkov's avatar
Kostya Shishkov committed
1111
        }
1112 1113 1114
        dst += s->linesize * 4 - 4*4;
        intra_types += r->intra_types_stride;
    }
Kostya Shishkov's avatar
Kostya Shishkov committed
1115

1116
    intra_types -= r->intra_types_stride * 4;
1117

1118 1119
    q_dc = rv34_qscale_tab[rv34_chroma_quant[1][s->qscale]];
    q_ac = rv34_qscale_tab[rv34_chroma_quant[0][s->qscale]];
Kostya Shishkov's avatar
Kostya Shishkov committed
1120

1121 1122
    for(k = 0; k < 2; k++){
        dst = s->dest[1+k];
1123
        fill_rectangle(r->avail_cache + 6, 2, 2, 4, 0, 4);
Kostya Shishkov's avatar
Kostya Shishkov committed
1124 1125

        for(j = 0; j < 2; j++){
1126 1127 1128 1129 1130 1131 1132 1133
            int* acache = r->avail_cache + 6 + j*4;
            for(i = 0; i < 2; i++, cbp >>= 1, acache++){
                int itype = ittrans[intra_types[i*2+j*2*r->intra_types_stride]];
                rv34_pred_4x4_block(r, dst+4*i, s->uvlinesize, itype, acache[-4], acache[-1], !i && !j, acache[-3]);
                acache[0] = 1;

                if(!(cbp&1)) continue;

1134 1135
                rv34_process_block(r, dst + 4*i, s->uvlinesize,
                                   r->chroma_vlc, 1, q_dc, q_ac);
Kostya Shishkov's avatar
Kostya Shishkov committed
1136
            }
1137 1138

            dst += 4*s->uvlinesize;
Kostya Shishkov's avatar
Kostya Shishkov committed
1139 1140 1141 1142
        }
    }
}

1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157
static int is_mv_diff_gt_3(int16_t (*motion_val)[2], int step)
{
    int d;
    d = motion_val[0][0] - motion_val[-step][0];
    if(d < -3 || d > 3)
        return 1;
    d = motion_val[0][1] - motion_val[-step][1];
    if(d < -3 || d > 3)
        return 1;
    return 0;
}

static int rv34_set_deblock_coef(RV34DecContext *r)
{
    MpegEncContext *s = &r->s;
1158
    int hmvmask = 0, vmvmask = 0, i, j;
1159
    int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
1160
    int16_t (*motion_val)[2] = &s->current_picture_ptr->motion_val[0][midx];
1161 1162 1163
    for(j = 0; j < 16; j += 8){
        for(i = 0; i < 2; i++){
            if(is_mv_diff_gt_3(motion_val + i, 1))
1164
                vmvmask |= 0x11 << (j + i*2);
1165
            if((j || s->mb_y) && is_mv_diff_gt_3(motion_val + i, s->b8_stride))
1166
                hmvmask |= 0x03 << (j + i*2);
1167 1168 1169
        }
        motion_val += s->b8_stride;
    }
1170 1171 1172 1173
    if(s->first_slice_line)
        hmvmask &= ~0x000F;
    if(!s->mb_x)
        vmvmask &= ~0x1111;
1174 1175 1176 1177 1178 1179 1180 1181 1182
    if(r->rv30){ //RV30 marks both subblocks on the edge for filtering
        vmvmask |= (vmvmask & 0x4444) >> 1;
        hmvmask |= (hmvmask & 0x0F00) >> 4;
        if(s->mb_x)
            r->deblock_coefs[s->mb_x - 1 + s->mb_y*s->mb_stride] |= (vmvmask & 0x1111) << 3;
        if(!s->first_slice_line)
            r->deblock_coefs[s->mb_x + (s->mb_y - 1)*s->mb_stride] |= (hmvmask & 0xF) << 12;
    }
    return hmvmask | vmvmask;
1183 1184
}

1185
static int rv34_decode_inter_macroblock(RV34DecContext *r, int8_t *intra_types)
Kostya Shishkov's avatar
Kostya Shishkov committed
1186
{
1187 1188 1189
    MpegEncContext *s   = &r->s;
    GetBitContext  *gb  = &s->gb;
    uint8_t        *dst = s->dest[0];
Diego Biurrun's avatar
Diego Biurrun committed
1190
    int16_t        *ptr = s->block[0];
1191
    int          mb_pos = s->mb_x + s->mb_y * s->mb_stride;
Kostya Shishkov's avatar
Kostya Shishkov committed
1192
    int cbp, cbp2;
1193
    int q_dc, q_ac, has_ac;
1194
    int i, j;
Kostya Shishkov's avatar
Kostya Shishkov committed
1195 1196 1197 1198
    int dist;

    // Calculate which neighbours are available. Maybe it's worth optimizing too.
    memset(r->avail_cache, 0, sizeof(r->avail_cache));
1199
    fill_rectangle(r->avail_cache + 6, 2, 2, 4, 1, 4);
Kostya Shishkov's avatar
Kostya Shishkov committed
1200 1201
    dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width;
    if(s->mb_x && dist)
1202
        r->avail_cache[5] =
1203
        r->avail_cache[9] = s->current_picture_ptr->mb_type[mb_pos - 1];
Kostya Shishkov's avatar
Kostya Shishkov committed
1204
    if(dist >= s->mb_width)
1205
        r->avail_cache[2] =
1206
        r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride];
Kostya Shishkov's avatar
Kostya Shishkov committed
1207
    if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1)
1208
        r->avail_cache[4] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1];
Kostya Shishkov's avatar
Kostya Shishkov committed
1209
    if(s->mb_x && dist > s->mb_width)
1210
        r->avail_cache[1] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1];
Kostya Shishkov's avatar
Kostya Shishkov committed
1211 1212

    s->qscale = r->si.quant;
1213
    cbp = cbp2 = rv34_decode_inter_mb_header(r, intra_types);
1214 1215
    r->cbp_luma  [mb_pos] = cbp;
    r->cbp_chroma[mb_pos] = cbp >> 16;
1216
    r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos];
1217
    s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
Kostya Shishkov's avatar
Kostya Shishkov committed
1218 1219 1220 1221

    if(cbp == -1)
        return -1;

1222
    if (IS_INTRA(s->current_picture_ptr->mb_type[mb_pos])){
1223 1224 1225 1226 1227
        if(r->is16) rv34_output_i16x16(r, intra_types, cbp);
        else        rv34_output_intra(r, intra_types, cbp);
        return 0;
    }

Kostya Shishkov's avatar
Kostya Shishkov committed
1228
    if(r->is16){
1229
        // Only for RV34_MB_P_MIX16x16
Diego Biurrun's avatar
Diego Biurrun committed
1230
        LOCAL_ALIGNED_16(int16_t, block16, [16]);
1231 1232
        memset(block16, 0, 16 * sizeof(*block16));
        q_dc = rv34_qscale_tab[ r->luma_dc_quant_p[s->qscale] ];
1233
        q_ac = rv34_qscale_tab[s->qscale];
1234
        if (rv34_decode_block(block16, gb, r->cur_vlcs, 3, 0, q_dc, q_dc, q_ac))
1235
            r->rdsp.rv34_inv_transform(block16);
1236
        else
1237
            r->rdsp.rv34_inv_transform_dc(block16);
Kostya Shishkov's avatar
Kostya Shishkov committed
1238

1239
        q_ac = rv34_qscale_tab[s->qscale];
1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257

        for(j = 0; j < 4; j++){
            for(i = 0; i < 4; i++, cbp >>= 1){
                int      dc   = block16[i + j*4];

                if(cbp & 1){
                    has_ac = rv34_decode_block(ptr, gb, r->cur_vlcs, r->luma_vlc, 0, q_ac, q_ac, q_ac);
                }else
                    has_ac = 0;

                if(has_ac){
                    ptr[0] = dc;
                    r->rdsp.rv34_idct_add(dst+4*i, s->linesize, ptr);
                }else
                    r->rdsp.rv34_idct_dc_add(dst+4*i, s->linesize, dc);
            }

            dst += 4*s->linesize;
1258
        }
Kostya Shishkov's avatar
Kostya Shishkov committed
1259 1260

        r->cur_vlcs = choose_vlc_set(r->si.quant, r->si.vlc_set, 1);
1261 1262
    }else{
        q_ac = rv34_qscale_tab[s->qscale];
1263 1264 1265 1266 1267 1268 1269 1270 1271

        for(j = 0; j < 4; j++){
            for(i = 0; i < 4; i++, cbp >>= 1){
                if(!(cbp & 1)) continue;

                rv34_process_block(r, dst + 4*i, s->linesize,
                                   r->luma_vlc, 0, q_ac, q_ac);
            }
            dst += 4*s->linesize;
1272
        }
Kostya Shishkov's avatar
Kostya Shishkov committed
1273
    }
1274

1275 1276
    q_dc = rv34_qscale_tab[rv34_chroma_quant[1][s->qscale]];
    q_ac = rv34_qscale_tab[rv34_chroma_quant[0][s->qscale]];
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287

    for(j = 1; j < 3; j++){
        dst = s->dest[j];
        for(i = 0; i < 4; i++, cbp >>= 1){
            uint8_t *pdst;
            if(!(cbp & 1)) continue;
            pdst = dst + (i&1)*4 + (i&2)*2*s->uvlinesize;

            rv34_process_block(r, pdst, s->uvlinesize,
                               r->chroma_vlc, 1, q_dc, q_ac);
        }
Kostya Shishkov's avatar
Kostya Shishkov committed
1288 1289 1290 1291 1292
    }

    return 0;
}

1293 1294 1295
static int rv34_decode_intra_macroblock(RV34DecContext *r, int8_t *intra_types)
{
    MpegEncContext *s = &r->s;
1296
    int cbp, dist;
1297 1298 1299 1300 1301 1302 1303 1304
    int mb_pos = s->mb_x + s->mb_y * s->mb_stride;

    // Calculate which neighbours are available. Maybe it's worth optimizing too.
    memset(r->avail_cache, 0, sizeof(r->avail_cache));
    fill_rectangle(r->avail_cache + 6, 2, 2, 4, 1, 4);
    dist = (s->mb_x - s->resync_mb_x) + (s->mb_y - s->resync_mb_y) * s->mb_width;
    if(s->mb_x && dist)
        r->avail_cache[5] =
1305
        r->avail_cache[9] = s->current_picture_ptr->mb_type[mb_pos - 1];
1306 1307
    if(dist >= s->mb_width)
        r->avail_cache[2] =
1308
        r->avail_cache[3] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride];
1309
    if(((s->mb_x+1) < s->mb_width) && dist >= s->mb_width - 1)
1310
        r->avail_cache[4] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride + 1];
1311
    if(s->mb_x && dist > s->mb_width)
1312
        r->avail_cache[1] = s->current_picture_ptr->mb_type[mb_pos - s->mb_stride - 1];
1313 1314

    s->qscale = r->si.quant;
1315
    cbp = rv34_decode_intra_mb_header(r, intra_types);
1316 1317 1318
    r->cbp_luma  [mb_pos] = cbp;
    r->cbp_chroma[mb_pos] = cbp >> 16;
    r->deblock_coefs[mb_pos] = 0xFFFF;
1319
    s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
1320 1321 1322 1323 1324

    if(cbp == -1)
        return -1;

    if(r->is16){
1325 1326
        rv34_output_i16x16(r, intra_types, cbp);
        return 0;
1327 1328
    }

1329
    rv34_output_intra(r, intra_types, cbp);
1330 1331 1332
    return 0;
}

Kostya Shishkov's avatar
Kostya Shishkov committed
1333 1334 1335 1336 1337 1338 1339 1340 1341
static int check_slice_end(RV34DecContext *r, MpegEncContext *s)
{
    int bits;
    if(s->mb_y >= s->mb_height)
        return 1;
    if(!s->mb_num_left)
        return 1;
    if(r->s.mb_skip_run > 1)
        return 0;
Janne Grunau's avatar
Janne Grunau committed
1342
    bits = get_bits_left(&s->gb);
1343
    if(bits <= 0 || (bits < 8 && !show_bits(&s->gb, bits)))
Kostya Shishkov's avatar
Kostya Shishkov committed
1344 1345 1346 1347
        return 1;
    return 0;
}

1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364

static void rv34_decoder_free(RV34DecContext *r)
{
    av_freep(&r->intra_types_hist);
    r->intra_types = NULL;
    av_freep(&r->tmp_b_block_base);
    av_freep(&r->mb_type);
    av_freep(&r->cbp_luma);
    av_freep(&r->cbp_chroma);
    av_freep(&r->deblock_coefs);
}


static int rv34_decoder_alloc(RV34DecContext *r)
{
    r->intra_types_stride = r->s.mb_width * 4 + 4;

1365
    r->cbp_chroma       = av_mallocz(r->s.mb_stride * r->s.mb_height *
1366
                                    sizeof(*r->cbp_chroma));
1367
    r->cbp_luma         = av_mallocz(r->s.mb_stride * r->s.mb_height *
1368
                                    sizeof(*r->cbp_luma));
1369
    r->deblock_coefs    = av_mallocz(r->s.mb_stride * r->s.mb_height *
1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394
                                    sizeof(*r->deblock_coefs));
    r->intra_types_hist = av_malloc(r->intra_types_stride * 4 * 2 *
                                    sizeof(*r->intra_types_hist));
    r->mb_type          = av_mallocz(r->s.mb_stride * r->s.mb_height *
                                     sizeof(*r->mb_type));

    if (!(r->cbp_chroma       && r->cbp_luma && r->deblock_coefs &&
          r->intra_types_hist && r->mb_type)) {
        rv34_decoder_free(r);
        return AVERROR(ENOMEM);
    }

    r->intra_types = r->intra_types_hist + r->intra_types_stride * 4;

    return 0;
}


static int rv34_decoder_realloc(RV34DecContext *r)
{
    rv34_decoder_free(r);
    return rv34_decoder_alloc(r);
}


1395
static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int buf_size)
Kostya Shishkov's avatar
Kostya Shishkov committed
1396 1397 1398
{
    MpegEncContext *s = &r->s;
    GetBitContext *gb = &s->gb;
1399
    int mb_pos, slice_type;
Kostya Shishkov's avatar
Kostya Shishkov committed
1400 1401 1402 1403 1404 1405 1406 1407 1408
    int res;

    init_get_bits(&r->s.gb, buf, buf_size*8);
    res = r->parse_slice_header(r, gb, &r->si);
    if(res < 0){
        av_log(s->avctx, AV_LOG_ERROR, "Incorrect or unknown slice header\n");
        return -1;
    }

1409 1410 1411 1412
    slice_type = r->si.type ? r->si.type : AV_PICTURE_TYPE_I;
    if (slice_type != s->pict_type) {
        av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
        return AVERROR_INVALIDDATA;
Kostya Shishkov's avatar
Kostya Shishkov committed
1413
    }
1414 1415 1416
    if (s->width != r->si.width || s->height != r->si.height) {
        av_log(s->avctx, AV_LOG_ERROR, "Size mismatch\n");
        return AVERROR_INVALIDDATA;
Kostya Shishkov's avatar
Kostya Shishkov committed
1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429
    }

    r->si.end = end;
    s->qscale = r->si.quant;
    s->mb_num_left = r->si.end - r->si.start;
    r->s.mb_skip_run = 0;

    mb_pos = s->mb_x + s->mb_y * s->mb_width;
    if(r->si.start != mb_pos){
        av_log(s->avctx, AV_LOG_ERROR, "Slice indicates MB offset %d, got %d\n", r->si.start, mb_pos);
        s->mb_x = r->si.start % s->mb_width;
        s->mb_y = r->si.start / s->mb_width;
    }
1430
    memset(r->intra_types_hist, -1, r->intra_types_stride * 4 * 2 * sizeof(*r->intra_types_hist));
Kostya Shishkov's avatar
Kostya Shishkov committed
1431
    s->first_slice_line = 1;
1432 1433
    s->resync_mb_x = s->mb_x;
    s->resync_mb_y = s->mb_y;
Kostya Shishkov's avatar
Kostya Shishkov committed
1434 1435 1436 1437 1438

    ff_init_block_index(s);
    while(!check_slice_end(r, s)) {
        ff_update_block_index(s);

1439 1440 1441 1442 1443
        if(r->si.type)
            res = rv34_decode_inter_macroblock(r, r->intra_types + s->mb_x * 4 + 4);
        else
            res = rv34_decode_intra_macroblock(r, r->intra_types + s->mb_x * 4 + 4);
        if(res < 0){
1444
            ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_ERROR);
Kostya Shishkov's avatar
Kostya Shishkov committed
1445 1446 1447 1448 1449 1450 1451
            return -1;
        }
        if (++s->mb_x == s->mb_width) {
            s->mb_x = 0;
            s->mb_y++;
            ff_init_block_index(s);

1452 1453
            memmove(r->intra_types_hist, r->intra_types, r->intra_types_stride * 4 * sizeof(*r->intra_types_hist));
            memset(r->intra_types, -1, r->intra_types_stride * 4 * sizeof(*r->intra_types_hist));
1454 1455 1456

            if(r->loop_filter && s->mb_y >= 2)
                r->loop_filter(r, s->mb_y - 2);
1457 1458

            if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
1459
                ff_thread_report_progress(&s->current_picture_ptr->tf,
1460 1461
                                          s->mb_y - 2, 0);

Kostya Shishkov's avatar
Kostya Shishkov committed
1462 1463 1464 1465 1466
        }
        if(s->mb_x == s->resync_mb_x)
            s->first_slice_line=0;
        s->mb_num_left--;
    }
1467
    ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, ER_MB_END);
Kostya Shishkov's avatar
Kostya Shishkov committed
1468

1469
    return s->mb_y == s->mb_height;
Kostya Shishkov's avatar
Kostya Shishkov committed
1470 1471 1472 1473 1474 1475 1476
}

/** @} */ // recons group end

/**
 * Initialize decoder.
 */
1477
av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
Kostya Shishkov's avatar
Kostya Shishkov committed
1478 1479 1480
{
    RV34DecContext *r = avctx->priv_data;
    MpegEncContext *s = &r->s;
1481
    int ret;
Kostya Shishkov's avatar
Kostya Shishkov committed
1482

1483
    ff_MPV_decode_defaults(s);
1484
    s->avctx      = avctx;
Kostya Shishkov's avatar
Kostya Shishkov committed
1485
    s->out_format = FMT_H263;
1486
    s->codec_id   = avctx->codec_id;
Kostya Shishkov's avatar
Kostya Shishkov committed
1487

1488
    s->width  = avctx->width;
Kostya Shishkov's avatar
Kostya Shishkov committed
1489 1490 1491
    s->height = avctx->height;

    r->s.avctx = avctx;
1492
    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
Kostya Shishkov's avatar
Kostya Shishkov committed
1493 1494 1495
    avctx->has_b_frames = 1;
    s->low_delay = 0;

1496
    if ((ret = ff_MPV_common_init(s)) < 0)
1497
        return ret;
Kostya Shishkov's avatar
Kostya Shishkov committed
1498

1499
    ff_h264_pred_init(&r->h, AV_CODEC_ID_RV40, 8, 1);
Kostya Shishkov's avatar
Kostya Shishkov committed
1500

1501
#if CONFIG_RV30_DECODER
1502
    if (avctx->codec_id == AV_CODEC_ID_RV30)
1503
        ff_rv30dsp_init(&r->rdsp);
1504 1505
#endif
#if CONFIG_RV40_DECODER
1506
    if (avctx->codec_id == AV_CODEC_ID_RV40)
1507
        ff_rv40dsp_init(&r->rdsp);
1508 1509
#endif

1510 1511
    if ((ret = rv34_decoder_alloc(r)) < 0) {
        ff_MPV_common_end(&r->s);
1512
        return ret;
1513
    }
1514

1515 1516
    if(!intra_vlcs[0].cbppattern[0].bits)
        rv34_init_tables();
Kostya Shishkov's avatar
Kostya Shishkov committed
1517

1518 1519
    avctx->internal->allocate_progress = 1;

Kostya Shishkov's avatar
Kostya Shishkov committed
1520 1521 1522
    return 0;
}

1523 1524
int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx)
{
1525
    int err;
1526 1527 1528 1529 1530 1531
    RV34DecContext *r = avctx->priv_data;

    r->s.avctx = avctx;

    if (avctx->internal->is_copy) {
        r->tmp_b_block_base = NULL;
1532
        if ((err = ff_MPV_common_init(&r->s)) < 0)
1533
            return err;
1534 1535
        if ((err = rv34_decoder_alloc(r)) < 0) {
            ff_MPV_common_end(&r->s);
1536
            return err;
1537
        }
1538
    }
1539

1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
    return 0;
}

int ff_rv34_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
{
    RV34DecContext *r = dst->priv_data, *r1 = src->priv_data;
    MpegEncContext * const s = &r->s, * const s1 = &r1->s;
    int err;

    if (dst == src || !s1->context_initialized)
        return 0;

1552 1553 1554
    if (s->height != s1->height || s->width != s1->width) {
        s->height = s1->height;
        s->width  = s1->width;
1555
        if ((err = ff_MPV_common_frame_size_change(s)) < 0)
1556 1557 1558 1559 1560
            return err;
        if ((err = rv34_decoder_realloc(r)) < 0)
            return err;
    }

1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572
    if ((err = ff_mpeg_update_thread_context(dst, src)))
        return err;

    r->cur_pts  = r1->cur_pts;
    r->last_pts = r1->last_pts;
    r->next_pts = r1->next_pts;

    memset(&r->si, 0, sizeof(r->si));

    return 0;
}

1573
static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)
Kostya Shishkov's avatar
Kostya Shishkov committed
1574 1575 1576 1577 1578
{
    if(avctx->slice_count) return avctx->slice_offset[n];
    else                   return AV_RL32(buf + n*8 - 4) == 1 ? AV_RL32(buf + n*8) :  AV_RB32(buf + n*8);
}

1579 1580 1581 1582
static int finish_frame(AVCodecContext *avctx, AVFrame *pict)
{
    RV34DecContext *r = avctx->priv_data;
    MpegEncContext *s = &r->s;
1583
    int got_picture = 0, ret;
1584

1585
    ff_er_frame_end(&s->er);
1586
    ff_MPV_frame_end(s);
1587
    s->mb_num_left = 0;
1588 1589

    if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME))
1590
        ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
1591 1592

    if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
1593 1594
        if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
            return ret;
1595
        ff_print_debug_info(s, s->current_picture_ptr, pict);
1596
        ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1);
1597 1598
        got_picture = 1;
    } else if (s->last_picture_ptr != NULL) {
1599 1600
        if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
            return ret;
1601
        ff_print_debug_info(s, s->last_picture_ptr, pict);
1602
        ff_mpv_export_qp_table(s, pict, s->last_picture_ptr, FF_QSCALE_TYPE_MPEG1);
1603 1604 1605 1606 1607 1608
        got_picture = 1;
    }

    return got_picture;
}

1609 1610 1611 1612 1613 1614 1615 1616 1617 1618
static AVRational update_sar(int old_w, int old_h, AVRational sar, int new_w, int new_h)
{
    // attempt to keep aspect during typical resolution switches
    if (!sar.num)
        sar = (AVRational){1, 1};

    sar = av_mul_q(sar, (AVRational){new_h * old_w, new_w * old_h});
    return sar;
}

Kostya Shishkov's avatar
Kostya Shishkov committed
1619
int ff_rv34_decode_frame(AVCodecContext *avctx,
1620
                            void *data, int *got_picture_ptr,
1621
                            AVPacket *avpkt)
Kostya Shishkov's avatar
Kostya Shishkov committed
1622
{
1623 1624
    const uint8_t *buf = avpkt->data;
    int buf_size = avpkt->size;
Kostya Shishkov's avatar
Kostya Shishkov committed
1625 1626 1627 1628
    RV34DecContext *r = avctx->priv_data;
    MpegEncContext *s = &r->s;
    AVFrame *pict = data;
    SliceInfo si;
1629
    int i, ret;
Kostya Shishkov's avatar
Kostya Shishkov committed
1630
    int slice_count;
1631
    const uint8_t *slices_hdr = NULL;
Kostya Shishkov's avatar
Kostya Shishkov committed
1632 1633 1634 1635 1636 1637
    int last = 0;

    /* no supplementary picture */
    if (buf_size == 0) {
        /* special case for last picture */
        if (s->low_delay==0 && s->next_picture_ptr) {
1638 1639
            if ((ret = av_frame_ref(pict, &s->next_picture_ptr->f)) < 0)
                return ret;
1640
            s->next_picture_ptr = NULL;
Kostya Shishkov's avatar
Kostya Shishkov committed
1641

1642
            *got_picture_ptr = 1;
Kostya Shishkov's avatar
Kostya Shishkov committed
1643 1644 1645 1646 1647 1648 1649 1650
        }
        return 0;
    }

    if(!avctx->slice_count){
        slice_count = (*buf++) + 1;
        slices_hdr = buf + 4;
        buf += 8 * slice_count;
1651
        buf_size -= 1 + 8 * slice_count;
Kostya Shishkov's avatar
Kostya Shishkov committed
1652 1653 1654
    }else
        slice_count = avctx->slice_count;

1655
    //parse first slice header to check whether this frame can be decoded
1656 1657 1658
    if(get_slice_offset(avctx, slices_hdr, 0) < 0 ||
       get_slice_offset(avctx, slices_hdr, 0) > buf_size){
        av_log(avctx, AV_LOG_ERROR, "Slice offset is invalid\n");
1659
        return AVERROR_INVALIDDATA;
1660
    }
1661
    init_get_bits(&s->gb, buf+get_slice_offset(avctx, slices_hdr, 0), (buf_size-get_slice_offset(avctx, slices_hdr, 0))*8);
1662
    if(r->parse_slice_header(r, &r->s.gb, &si) < 0 || si.start){
1663
        av_log(avctx, AV_LOG_ERROR, "First slice header is incorrect\n");
1664 1665 1666 1667 1668 1669 1670
        return AVERROR_INVALIDDATA;
    }
    if ((!s->last_picture_ptr || !s->last_picture_ptr->f.data[0]) &&
        si.type == AV_PICTURE_TYPE_B) {
        av_log(avctx, AV_LOG_ERROR, "Invalid decoder state: B-frame without "
               "reference data.\n");
        return AVERROR_INVALIDDATA;
1671
    }
1672 1673
    if(   (avctx->skip_frame >= AVDISCARD_NONREF && si.type==AV_PICTURE_TYPE_B)
       || (avctx->skip_frame >= AVDISCARD_NONKEY && si.type!=AV_PICTURE_TYPE_I)
1674
       ||  avctx->skip_frame >= AVDISCARD_ALL)
1675
        return avpkt->size;
1676

1677 1678 1679
    /* first slice */
    if (si.start == 0) {
        if (s->mb_num_left > 0) {
1680
            av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n",
1681
                   s->mb_num_left);
1682
            ff_er_frame_end(&s->er);
1683 1684 1685 1686 1687 1688 1689 1690
            ff_MPV_frame_end(s);
        }

        if (s->width != si.width || s->height != si.height) {
            int err;

            av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n",
                   si.width, si.height);
1691

1692 1693 1694
            if (av_image_check_size(si.width, si.height, 0, s->avctx))
                return AVERROR_INVALIDDATA;

1695 1696 1697
            s->avctx->sample_aspect_ratio = update_sar(
                s->width, s->height, s->avctx->sample_aspect_ratio,
                si.width, si.height);
1698 1699
            s->width  = si.width;
            s->height = si.height;
1700 1701 1702 1703 1704

            err = ff_set_dimensions(s->avctx, s->width, s->height);
            if (err < 0)
                return err;

1705
            if ((err = ff_MPV_common_frame_size_change(s)) < 0)
1706 1707 1708 1709 1710 1711 1712
                return err;
            if ((err = rv34_decoder_realloc(r)) < 0)
                return err;
        }
        s->pict_type = si.type ? si.type : AV_PICTURE_TYPE_I;
        if (ff_MPV_frame_start(s, s->avctx) < 0)
            return -1;
1713
        ff_mpeg_er_frame_start(s);
1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734
        if (!r->tmp_b_block_base) {
            int i;

            r->tmp_b_block_base = av_malloc(s->linesize * 48);
            for (i = 0; i < 2; i++)
                r->tmp_b_block_y[i] = r->tmp_b_block_base
                                      + i * 16 * s->linesize;
            for (i = 0; i < 4; i++)
                r->tmp_b_block_uv[i] = r->tmp_b_block_base + 32 * s->linesize
                                       + (i >> 1) * 8 * s->uvlinesize
                                       + (i &  1) * 16;
        }
        r->cur_pts = si.pts;
        if (s->pict_type != AV_PICTURE_TYPE_B) {
            r->last_pts = r->next_pts;
            r->next_pts = r->cur_pts;
        } else {
            int refdist = GET_PTS_DIFF(r->next_pts, r->last_pts);
            int dist0   = GET_PTS_DIFF(r->cur_pts,  r->last_pts);
            int dist1   = GET_PTS_DIFF(r->next_pts, r->cur_pts);

1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749
            if(!refdist){
                r->mv_weight1 = r->mv_weight2 = r->weight1 = r->weight2 = 8192;
                r->scaled_weight = 0;
            }else{
                r->mv_weight1 = (dist0 << 14) / refdist;
                r->mv_weight2 = (dist1 << 14) / refdist;
                if((r->mv_weight1|r->mv_weight2) & 511){
                    r->weight1 = r->mv_weight1;
                    r->weight2 = r->mv_weight2;
                    r->scaled_weight = 0;
                }else{
                    r->weight1 = r->mv_weight1 >> 9;
                    r->weight2 = r->mv_weight2 >> 9;
                    r->scaled_weight = 1;
                }
1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760
            }
        }
        s->mb_x = s->mb_y = 0;
        ff_thread_finish_setup(s->avctx);
    } else if (HAVE_THREADS &&
               (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
        av_log(s->avctx, AV_LOG_ERROR, "Decoder needs full frames in frame "
               "multithreading mode (start MB is %d).\n", si.start);
        return AVERROR_INVALIDDATA;
    }

1761 1762
    for(i = 0; i < slice_count; i++){
        int offset = get_slice_offset(avctx, slices_hdr, i);
Kostya Shishkov's avatar
Kostya Shishkov committed
1763 1764
        int size;
        if(i+1 == slice_count)
1765
            size = buf_size - offset;
Kostya Shishkov's avatar
Kostya Shishkov committed
1766
        else
1767
            size = get_slice_offset(avctx, slices_hdr, i+1) - offset;
Kostya Shishkov's avatar
Kostya Shishkov committed
1768

1769
        if(offset < 0 || offset > buf_size){
1770
            av_log(avctx, AV_LOG_ERROR, "Slice offset is invalid\n");
1771 1772 1773
            break;
        }

Kostya Shishkov's avatar
Kostya Shishkov committed
1774
        r->si.end = s->mb_width * s->mb_height;
1775 1776
        s->mb_num_left = r->s.mb_x + r->s.mb_y*r->s.mb_width - r->si.start;

Kostya Shishkov's avatar
Kostya Shishkov committed
1777
        if(i+1 < slice_count){
1778 1779 1780 1781 1782
            if (get_slice_offset(avctx, slices_hdr, i+1) < 0 ||
                get_slice_offset(avctx, slices_hdr, i+1) > buf_size) {
                av_log(avctx, AV_LOG_ERROR, "Slice offset is invalid\n");
                break;
            }
Kostya Shishkov's avatar
Kostya Shishkov committed
1783 1784 1785 1786 1787 1788 1789 1790 1791
            init_get_bits(&s->gb, buf+get_slice_offset(avctx, slices_hdr, i+1), (buf_size-get_slice_offset(avctx, slices_hdr, i+1))*8);
            if(r->parse_slice_header(r, &r->s.gb, &si) < 0){
                if(i+2 < slice_count)
                    size = get_slice_offset(avctx, slices_hdr, i+2) - offset;
                else
                    size = buf_size - offset;
            }else
                r->si.end = si.start;
        }
1792 1793 1794 1795
        if (size < 0 || size > buf_size - offset) {
            av_log(avctx, AV_LOG_ERROR, "Slice size is invalid\n");
            break;
        }
Kostya Shishkov's avatar
Kostya Shishkov committed
1796 1797 1798 1799 1800
        last = rv34_decode_slice(r, r->si.end, buf + offset, size);
        if(last)
            break;
    }

1801 1802 1803 1804
    if (s->current_picture_ptr) {
        if (last) {
            if(r->loop_filter)
                r->loop_filter(r, s->mb_height - 1);
1805

1806 1807 1808 1809
            ret = finish_frame(avctx, pict);
            if (ret < 0)
                return ret;
            *got_picture_ptr = ret;
1810 1811 1812 1813 1814
        } else if (HAVE_THREADS &&
                   (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
            av_log(avctx, AV_LOG_INFO, "marking unfished frame as finished\n");
            /* always mark the current frame as finished, frame-mt supports
             * only complete frames */
1815
            ff_er_frame_end(&s->er);
1816
            ff_MPV_frame_end(s);
1817
            s->mb_num_left = 0;
1818
            ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0);
1819
            return AVERROR_INVALIDDATA;
Kostya Shishkov's avatar
Kostya Shishkov committed
1820 1821
        }
    }
1822

1823
    return avpkt->size;
Kostya Shishkov's avatar
Kostya Shishkov committed
1824 1825
}

1826
av_cold int ff_rv34_decode_end(AVCodecContext *avctx)
Kostya Shishkov's avatar
Kostya Shishkov committed
1827 1828 1829
{
    RV34DecContext *r = avctx->priv_data;

1830
    ff_MPV_common_end(&r->s);
1831
    rv34_decoder_free(r);
Kostya Shishkov's avatar
Kostya Shishkov committed
1832 1833 1834

    return 0;
}