* RV40 decoder
*/
+#include "config.h"
+
#include "libavutil/imgutils.h"
#include "avcodec.h"
static VLC aic_mode1_vlc[AIC_MODE1_NUM], aic_mode2_vlc[AIC_MODE2_NUM];
static VLC ptype_vlc[NUM_PTYPE_VLCS], btype_vlc[NUM_BTYPE_VLCS];
-static const int16_t mode2_offs[] = {
- 0, 614, 1222, 1794, 2410, 3014, 3586, 4202, 4792, 5382, 5966, 6542,
- 7138, 7716, 8292, 8864, 9444, 10030, 10642, 11212, 11814
-};
+static av_cold void rv40_init_table(VLC *vlc, unsigned *offset, int nb_bits,
+ int nb_codes, const uint8_t (*tab)[2])
+{
+ static VLC_TYPE vlc_buf[11776][2];
+
+ vlc->table = &vlc_buf[*offset];
+ vlc->table_allocated = 1 << nb_bits;
+ *offset += 1 << nb_bits;
+
+ ff_init_vlc_from_lengths(vlc, nb_bits, nb_codes,
+ &tab[0][1], 2, &tab[0][0], 2, 1,
+ 0, INIT_VLC_USE_NEW_STATIC, NULL);
+}
/**
* Initialize all tables.
*/
static av_cold void rv40_init_tables(void)
{
- int i;
- static VLC_TYPE aic_table[1 << AIC_TOP_BITS][2];
- static VLC_TYPE aic_mode1_table[AIC_MODE1_NUM << AIC_MODE1_BITS][2];
+ int i, offset = 0;
static VLC_TYPE aic_mode2_table[11814][2];
- static VLC_TYPE ptype_table[NUM_PTYPE_VLCS << PTYPE_VLC_BITS][2];
- static VLC_TYPE btype_table[NUM_BTYPE_VLCS << BTYPE_VLC_BITS][2];
-
- aic_top_vlc.table = aic_table;
- aic_top_vlc.table_allocated = 1 << AIC_TOP_BITS;
- init_vlc(&aic_top_vlc, AIC_TOP_BITS, AIC_TOP_SIZE,
- rv40_aic_top_vlc_bits, 1, 1,
- rv40_aic_top_vlc_codes, 1, 1, INIT_VLC_USE_NEW_STATIC);
+
+ rv40_init_table(&aic_top_vlc, &offset, AIC_TOP_BITS, AIC_TOP_SIZE,
+ rv40_aic_top_vlc_tab);
for(i = 0; i < AIC_MODE1_NUM; i++){
// Every tenth VLC table is empty
if((i % 10) == 9) continue;
- aic_mode1_vlc[i].table = &aic_mode1_table[i << AIC_MODE1_BITS];
- aic_mode1_vlc[i].table_allocated = 1 << AIC_MODE1_BITS;
- init_vlc(&aic_mode1_vlc[i], AIC_MODE1_BITS, AIC_MODE1_SIZE,
- aic_mode1_vlc_bits[i], 1, 1,
- aic_mode1_vlc_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC);
+ rv40_init_table(&aic_mode1_vlc[i], &offset, AIC_MODE1_BITS,
+ AIC_MODE1_SIZE, aic_mode1_vlc_tabs[i]);
}
- for(i = 0; i < AIC_MODE2_NUM; i++){
- aic_mode2_vlc[i].table = &aic_mode2_table[mode2_offs[i]];
- aic_mode2_vlc[i].table_allocated = mode2_offs[i + 1] - mode2_offs[i];
+ for (unsigned i = 0, offset = 0; i < AIC_MODE2_NUM; i++){
+ uint16_t syms[AIC_MODE2_SIZE];
+
+ for (int j = 0; j < AIC_MODE2_SIZE; j++) {
+ int first = aic_mode2_vlc_syms[i][j] >> 4;
+ int second = aic_mode2_vlc_syms[i][j] & 0xF;
+ if (HAVE_BIGENDIAN)
+ syms[j] = (first << 8) | second;
+ else
+ syms[j] = first | (second << 8);
+ }
+ aic_mode2_vlc[i].table = &aic_mode2_table[offset];
+ aic_mode2_vlc[i].table_allocated = FF_ARRAY_ELEMS(aic_mode2_table) - offset;
ff_init_vlc_from_lengths(&aic_mode2_vlc[i], AIC_MODE2_BITS, AIC_MODE2_SIZE,
aic_mode2_vlc_bits[i], 1,
- aic_mode2_vlc_syms[i], 1, 1,
- 0, INIT_VLC_USE_NEW_STATIC, NULL);
+ syms, 2, 2, 0, INIT_VLC_STATIC_OVERLONG, NULL);
+ offset += aic_mode2_vlc[i].table_size;
}
for(i = 0; i < NUM_PTYPE_VLCS; i++){
- ptype_vlc[i].table = &ptype_table[i << PTYPE_VLC_BITS];
- ptype_vlc[i].table_allocated = 1 << PTYPE_VLC_BITS;
- ff_init_vlc_from_lengths(&ptype_vlc[i], PTYPE_VLC_BITS, PTYPE_VLC_SIZE,
- &ptype_vlc_tabs[i][0][1], 2,
- &ptype_vlc_tabs[i][0][0], 2, 1,
- 0, INIT_VLC_USE_NEW_STATIC, NULL);
+ rv40_init_table(&ptype_vlc[i], &offset, PTYPE_VLC_BITS, PTYPE_VLC_SIZE,
+ ptype_vlc_tabs[i]);
}
for(i = 0; i < NUM_BTYPE_VLCS; i++){
- btype_vlc[i].table = &btype_table[i << BTYPE_VLC_BITS];
- btype_vlc[i].table_allocated = 1 << BTYPE_VLC_BITS;
- ff_init_vlc_from_lengths(&btype_vlc[i], BTYPE_VLC_BITS, BTYPE_VLC_SIZE,
- &btype_vlc_tabs[i][0][1], 2,
- &btype_vlc_tabs[i][0][0], 2, 1,
- 0, INIT_VLC_USE_NEW_STATIC, NULL);
+ rv40_init_table(&btype_vlc[i], &offset, BTYPE_VLC_BITS, BTYPE_VLC_SIZE,
+ btype_vlc_tabs[i]);
}
}
if(pattern == rv40_aic_table_index[k])
break;
if(j < 3 && k < MODE2_PATTERNS_NUM){ //pattern is found, decoding 2 coefficients
- v = get_vlc2(gb, aic_mode2_vlc[k].table, AIC_MODE2_BITS, 2);
- *ptr++ = v/9;
- *ptr++ = v%9;
+ AV_WN16(ptr, get_vlc2(gb, aic_mode2_vlc[k].table, AIC_MODE2_BITS, 2));
+ ptr += 2;
j++;
}else{
if(B != -1 && C != -1)
r->loop_filter = rv40_loop_filter;
r->luma_dc_quant_i = rv40_luma_dc_quant[0];
r->luma_dc_quant_p = rv40_luma_dc_quant[1];
+ ff_rv40dsp_init(&r->rdsp);
return 0;
}
-AVCodec ff_rv40_decoder = {
+const AVCodec ff_rv40_decoder = {
.name = "rv40",
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
.type = AVMEDIA_TYPE_VIDEO,