X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fintrax8.c;h=4d8d5c84560a677cfcfba4b90a26594987a9a134;hb=f6b85523692b0e7d4c4efb8449fa201d313424fe;hp=b4cac1676e7cb81400e7d21e94fd1d9630650f21;hpb=b1268e0f032a3af3912fe3fb8d3855e12d7ea83b;p=ffmpeg diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index b4cac1676e7..4d8d5c84560 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -24,11 +24,11 @@ #include "avcodec.h" #include "get_bits.h" #include "idctdsp.h" -#include "mpegvideo.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" #include "intrax8dsp.h" +#include "mpegutils.h" #define MAX_TABLE_DEPTH(table_bits, max_bits) \ ((max_bits + table_bits - 1) / table_bits) @@ -216,9 +216,9 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, if (i < 46) { // [0-45] int t, l; if (i < 0) { - (*level) = - (*final) = // prevent 'may be used unilitialized' - (*run) = 64; // this would cause error exit in the ac loop + *level = + *final = // prevent 'may be used unilitialized' + *run = 64; // this would cause error exit in the ac loop return; } @@ -229,20 +229,20 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, * i == 22 r = 0 l = 3; r = i & %00000 */ - (*final) = - t = (i > 22); - i -= 23 * t; + *final = + t = i > 22; + i -= 23 * t; /* l = lut_l[i / 2] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3 }[i >> 1]; * 11 10'01 01'00 00'00 00'00 00'00 00 => 0xE50000 */ - l = (0xE50000 >> (i & (0x1E))) & 3; // 0x1E or (~1) or ((i >> 1) << 1) + l = (0xE50000 >> (i & 0x1E)) & 3; // 0x1E or ~1 or (i >> 1 << 1) /* t = lut_mask[l] = { 0x0f, 0x03, 0x01, 0x00 }[l]; * as i < 256 the higher bits do not matter */ - t = (0x01030F >> (l << 3)); + t = 0x01030F >> (l << 3); - (*run) = i & t; - (*level) = l; + *run = i & t; + *level = l; } else if (i < 73) { // [46-72] uint32_t sm; uint32_t mask; @@ -255,9 +255,9 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, mask = sm & 0xff; sm >>= 8; // 1bit - (*run) = (sm & 0xff) + (e & (mask)); // 6bits - (*level) = (sm >> 8) + (e & (~mask)); // 5bits - (*final) = i > (58 - 46); + *run = (sm & 0xff) + (e & mask); // 6bits + *level = (sm >> 8) + (e & ~mask); // 5bits + *final = i > (58 - 46); } else if (i < 75) { // [73-74] static const uint8_t crazy_mix_runlevel[32] = { 0x22, 0x32, 0x33, 0x53, 0x23, 0x42, 0x43, 0x63, @@ -266,14 +266,14 @@ static void x8_get_ac_rlf(IntraX8Context *const w, const int mode, 0x28, 0x92, 0x36, 0x74, 0x29, 0xa2, 0x46, 0x84, }; - (*final) = !(i & 1); - e = get_bits(w->gb, 5); // get the extra bits - (*run) = crazy_mix_runlevel[e] >> 4; - (*level) = crazy_mix_runlevel[e] & 0x0F; + *final = !(i & 1); + e = get_bits(w->gb, 5); // get the extra bits + *run = crazy_mix_runlevel[e] >> 4; + *level = crazy_mix_runlevel[e] & 0x0F; } else { - (*level) = get_bits(w->gb, 7 - 3 * (i & 1)); - (*run) = get_bits(w->gb, 6); - (*final) = get_bits1(w->gb); + *level = get_bits(w->gb, 7 - 3 * (i & 1)); + *run = get_bits(w->gb, 6); + *final = get_bits1(w->gb); } return; } @@ -302,12 +302,12 @@ static int x8_get_dc_rlf(IntraX8Context *const w, const int mode, i = get_vlc2(w->gb, w->j_dc_vlc[mode]->table, DC_VLC_BITS, DC_VLC_MTD); /* (i >= 17) { i -= 17; final =1; } */ - c = i > 16; - (*final) = c; - i -= 17 * c; + c = i > 16; + *final = c; + i -= 17 * c; if (i <= 0) { - (*level) = 0; + *level = 0; return -i; } c = (i + 1) >> 1; // hackish way to calculate dc_extra_sbits[] @@ -316,8 +316,8 @@ static int x8_get_dc_rlf(IntraX8Context *const w, const int mode, e = get_bits(w->gb, c); // get the extra bits i = dc_index_offset[i] + (e >> 1); - e = -(e & 1); // 0, 0xffffff - (*level) = (i ^ e) - e; // (i ^ 0) -0 , (i ^ 0xff) - (-1) + e = -(e & 1); // 0, 0xffffff + *level = (i ^ e) - e; // (i ^ 0) - 0, (i ^ 0xff) - (-1) return 0; } @@ -348,7 +348,7 @@ static int x8_setup_spatial_predictor(IntraX8Context *const w, const int chroma) w->flat_dc = 1; sum += 9; // ((1 << 17) + 9) / (8 + 8 + 1 + 2) = 6899 - w->predicted_dc = (sum * 6899) >> 17; + w->predicted_dc = sum * 6899 >> 17; } } if (chroma) @@ -393,8 +393,8 @@ static void x8_update_predictions(IntraX8Context *const w, const int orient, static void x8_get_prediction_chroma(IntraX8Context *const w) { - w->edges = 1 * (!(w->mb_x >> 1)); - w->edges |= 2 * (!(w->mb_y >> 1)); + w->edges = 1 * !(w->mb_x >> 1); + w->edges |= 2 * !(w->mb_y >> 1); w->edges |= 4 * (w->mb_x >= (2 * w->mb_width - 1)); // mb_x for chroma would always be odd w->raw_orient = 0; @@ -411,8 +411,8 @@ static void x8_get_prediction(IntraX8Context *const w) { int a, b, c, i; - w->edges = 1 * (!w->mb_x); - w->edges |= 2 * (!w->mb_y); + w->edges = 1 * !w->mb_x; + w->edges |= 2 * !w->mb_y; w->edges |= 4 * (w->mb_x >= (2 * w->mb_width - 1)); switch (w->edges & 3) { @@ -479,9 +479,8 @@ static void x8_get_prediction(IntraX8Context *const w) static void x8_ac_compensation(IntraX8Context *const w, const int direction, const int dc_level) { - MpegEncContext *const s = w->s; int t; -#define B(x, y) s->block[0][w->idsp.idct_permutation[(x) + (y) * 8]] +#define B(x, y) w->block[0][w->idsp.idct_permutation[(x) + (y) * 8]] #define T(x) ((x) * dc_level + 0x8000) >> 16; switch (direction) { case 0: @@ -525,7 +524,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, t = T(1084); // g B(1, 1) += t; - s->block_last_index[0] = FFMAX(s->block_last_index[0], 7 * 8); + w->block_last_index[0] = FFMAX(w->block_last_index[0], 7 * 8); break; case 1: B(0, 1) -= T(6269); @@ -533,7 +532,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, B(0, 5) -= T(172); B(0, 7) -= T(73); - s->block_last_index[0] = FFMAX(s->block_last_index[0], 7 * 8); + w->block_last_index[0] = FFMAX(w->block_last_index[0], 7 * 8); break; case 2: B(1, 0) -= T(6269); @@ -541,7 +540,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, B(5, 0) -= T(172); B(7, 0) -= T(73); - s->block_last_index[0] = FFMAX(s->block_last_index[0], 7); + w->block_last_index[0] = FFMAX(w->block_last_index[0], 7); break; } #undef B @@ -571,8 +570,6 @@ static const int16_t quant_table[64] = { static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) { - MpegEncContext *const s = w->s; - uint8_t *scantable; int final, run, level; int ac_mode, dc_mode, est_run, dc_level; @@ -582,7 +579,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) int sign; assert(w->orient < 12); - w->bdsp.clear_block(s->block[0]); + w->bdsp.clear_block(w->block[0]); if (chroma) dc_mode = 2; @@ -643,12 +640,12 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) if (use_quant_matrix) level = (level * quant_table[pos]) >> 8; - s->block[0][scantable[pos]] = level; + w->block[0][scantable[pos]] = level; } while (!final); - s->block_last_index[0] = pos; + w->block_last_index[0] = pos; } else { // DC only - s->block_last_index[0] = 0; + w->block_last_index[0] = 0; if (w->flat_dc && ((unsigned) (dc_level + 1)) < 3) { // [-1; 1] int32_t divide_quant = !chroma ? w->divide_quant_dc_luma : w->divide_quant_dc_chroma; @@ -665,12 +662,12 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) goto block_placed; } - zeros_only = (dc_level == 0); + zeros_only = dc_level == 0; } if (!chroma) - s->block[0][0] = dc_level * w->quant; + w->block[0][0] = dc_level * w->quant; else - s->block[0][0] = dc_level * w->quant_dc_chroma; + w->block[0][0] = dc_level * w->quant_dc_chroma; // there is !zero_only check in the original, but dc_level check is enough if ((unsigned int) (dc_level + 1) >= 3 && (w->edges & 3) != 3) { @@ -680,7 +677,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) direction = (0x6A017C >> (w->orient * 2)) & 3; if (direction != 3) { // modify block_last[] - x8_ac_compensation(w, direction, s->block[0][0]); + x8_ac_compensation(w, direction, w->block[0][0]); } } @@ -695,7 +692,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) if (!zeros_only) w->idsp.idct_add(w->dest[chroma], w->frame->linesize[!!chroma], - s->block[0]); + w->block[0]); block_placed: if (!chroma) @@ -726,16 +723,17 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) w->dest[1] = frame->data[1]; w->dest[2] = frame->data[2]; - w->dest[0] += w->mb_y * linesize << 3; + w->dest[0] += w->mb_y * linesize << 3; // chroma blocks are on add rows - w->dest[1] += (w->mb_y & (~1)) * uvlinesize << 2; - w->dest[2] += (w->mb_y & (~1)) * uvlinesize << 2; + w->dest[1] += (w->mb_y & ~1) * uvlinesize << 2; + w->dest[2] += (w->mb_y & ~1) * uvlinesize << 2; } av_cold int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, IDCTDSPContext *idsp, - int mb_width, int mb_height, - MpegEncContext *const s) + int16_t (*block)[64], + int block_last_index[12], + int mb_width, int mb_height) { int ret = x8_vlc_init(); if (ret < 0) @@ -745,7 +743,8 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, w->idsp = *idsp; w->mb_width = mb_width; w->mb_height = mb_height; - w->s = s; + w->block = block; + w->block_last_index = block_last_index; // two rows, 2 blocks per cannon mb w->prediction_table = av_mallocz(w->mb_width * 2 * 2); @@ -772,11 +771,10 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w) int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, GetBitContext *gb, int *mb_x, int *mb_y, - int dquant, int quant_offset, int loopfilter) + int dquant, int quant_offset, + int loopfilter, int lowdelay) { - MpegEncContext *const s = w->s; int mb_xy; - assert(s); w->gb = gb; w->dquant = dquant; @@ -825,16 +823,15 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, w->dest[1] += 8; w->dest[2] += 8; - /* emulate MB info in the relevant tables */ - s->mbskip_table[mb_xy] = 0; - s->mbintra_table[mb_xy] = 1; pict->qscale_table[mb_xy] = w->quant; mb_xy++; } w->dest[0] += 8; } if (w->mb_y & 1) - ff_mpeg_draw_horiz_band(s, (w->mb_y - 1) * 8, 16); + ff_draw_horiz_band(w->avctx, w->frame, w->frame, + (w->mb_y - 1) * 8, 16, + PICT_FRAME, 0, lowdelay); } error: