falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

dv: move inverse weight tables to decoder 

The encoder has its own tables and does not access the idct_factor
member of the DVVideoContext structure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Christophe Gisquet Michael Niedermayer 10 years ago
parent
6fe02d25ee
commit
05da586fef
5 changed files with 113 additions and 106 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -34
      libavcodec/dv.c
  2. +1
    -0
      libavcodec/dv.h
  3. +0
    -65
      libavcodec/dvdata.c
  4. +0
    -7
      libavcodec/dvdata.h
  5. +112
    -0
      libavcodec/dvdec.c

+ 0
- 34
libavcodec/dv.c View File

@@ -185,7 +185,6 @@ static const uint8_t dv_quant_areas[4] = { 6, 21, 43, 64 };
int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const AVDVProfile *d)
{
int j, i, c, s, p;
uint32_t *factor1, *factor2;

p = i = 0;
for (c = 0; c < d->n_difchan; c++) {
@@ -203,39 +202,6 @@ int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const AVDVProfile *d)
}
}

factor1 = &ctx->idct_factor[0];
factor2 = &ctx->idct_factor[DV_PROFILE_IS_HD(d) ? 4096 : 2816];
if (DV_PROFILE_IS_HD(d)) {
const uint16_t *iweight1, *iweight2;
if (d->height == 720) {
iweight1 = &ff_dv_iweight_720_y[0];
iweight2 = &ff_dv_iweight_720_c[0];
} else {
iweight1 = &ff_dv_iweight_1080_y[0];
iweight2 = &ff_dv_iweight_1080_c[0];
}
for (c = 0; c < 4; c++) {
for (s = 0; s < 16; s++) {
for (i = 0; i < 64; i++) {
*factor1++ = (dv100_qstep[s] << (c + 9)) * iweight1[i];
*factor2++ = (dv100_qstep[s] << (c + 9)) * iweight2[i];
}
}
}
} else {
const uint16_t *iweight1 = &ff_dv_iweight_88[0];
for (j = 0; j < 2; j++, iweight1 = &ff_dv_iweight_248[0]) {
for (s = 0; s < 22; s++) {
for (i = c = 0; c < 4; c++) {
for (; i < dv_quant_areas[c]; i++) {
*factor1 = iweight1[i] << (ff_dv_quant_shifts[s][c] + 1);
*factor2++ = (*factor1++) << 1;
}
}
}
}
}

return 0;
}



+ 1
- 0
libavcodec/dv.h View File

@@ -95,6 +95,7 @@ enum dv_pack_type {
extern RL_VLC_ELEM ff_dv_rl_vlc[1184];

int ff_dv_init_dynamic_tables(DVVideoContext *s, const AVDVProfile *d);

int ff_dvvideo_init(AVCodecContext *avctx);

static inline int dv_work_pool_size(const AVDVProfile *d)


+ 0
- 65
libavcodec/dvdata.c View File

@@ -69,71 +69,6 @@ const uint8_t ff_dv_quant_shifts[22][4] = {

const uint8_t ff_dv_quant_offset[4] = { 6, 3, 0, 1 };

const uint16_t ff_dv_iweight_88[64] = {
32768, 16705, 16705, 17734, 17032, 17734, 18205, 18081,
18081, 18205, 18725, 18562, 19195, 18562, 18725, 19266,
19091, 19705, 19705, 19091, 19266, 21407, 19643, 20267,
20228, 20267, 19643, 21407, 22725, 21826, 20853, 20806,
20806, 20853, 21826, 22725, 23170, 23170, 21407, 21400,
21407, 23170, 23170, 24598, 23786, 22018, 22018, 23786,
24598, 25251, 24465, 22654, 24465, 25251, 25972, 25172,
25172, 25972, 26722, 27969, 26722, 29692, 29692, 31521,
};
const uint16_t ff_dv_iweight_248[64] = {
32768, 16384, 16705, 16705, 17734, 17734, 17734, 17734,
18081, 18081, 18725, 18725, 21407, 21407, 19091, 19091,
19195, 19195, 18205, 18205, 18725, 18725, 19705, 19705,
20267, 20267, 21826, 21826, 23170, 23170, 20806, 20806,
20267, 20267, 19266, 19266, 21407, 21407, 20853, 20853,
21400, 21400, 23786, 23786, 24465, 24465, 22018, 22018,
23170, 23170, 22725, 22725, 24598, 24598, 24465, 24465,
25172, 25172, 27969, 27969, 25972, 25972, 29692, 29692
};

/**
* The "inverse" DV100 weights are actually just the spec weights (zig-zagged).
*/
const uint16_t ff_dv_iweight_1080_y[64] = {
128, 16, 16, 17, 17, 17, 18, 18,
18, 18, 18, 18, 19, 18, 18, 19,
19, 19, 19, 19, 19, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 45, 45, 42, 42,
42, 45, 45, 48, 46, 43, 43, 46,
48, 49, 48, 44, 48, 49, 101, 98,
98, 101, 104, 109, 104, 116, 116, 123,
};
const uint16_t ff_dv_iweight_1080_c[64] = {
128, 16, 16, 17, 17, 17, 25, 25,
25, 25, 26, 25, 26, 25, 26, 26,
26, 27, 27, 26, 26, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 91, 91, 84, 84,
84, 91, 91, 96, 93, 86, 86, 93,
96, 197, 191, 177, 191, 197, 203, 197,
197, 203, 209, 219, 209, 232, 232, 246,
};
const uint16_t ff_dv_iweight_720_y[64] = {
128, 16, 16, 17, 17, 17, 18, 18,
18, 18, 18, 18, 19, 18, 18, 19,
19, 19, 19, 19, 19, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 68, 68, 63, 63,
63, 68, 68, 96, 92, 86, 86, 92,
96, 98, 96, 88, 96, 98, 202, 196,
196, 202, 208, 218, 208, 232, 232, 246,
};
const uint16_t ff_dv_iweight_720_c[64] = {
128, 24, 24, 26, 26, 26, 36, 36,
36, 36, 36, 36, 38, 36, 36, 38,
38, 38, 38, 38, 38, 84, 76, 80,
80, 80, 76, 84, 88, 86, 82, 82,
82, 82, 86, 88, 182, 182, 168, 168,
168, 182, 182, 192, 186, 192, 172, 186,
192, 394, 382, 354, 382, 394, 406, 394,
394, 406, 418, 438, 418, 464, 464, 492,
};

/*
* There's a catch about the following three tables: the mapping they establish
* between (run, level) and vlc is not 1-1. So you have to watch out for that


+ 0
- 7
libavcodec/dvdata.h View File

@@ -26,13 +26,6 @@ extern const uint8_t ff_dv_zigzag248_direct[64];
extern const uint8_t ff_dv_quant_shifts[22][4];
extern const uint8_t ff_dv_quant_offset[4];

extern const uint16_t ff_dv_iweight_88[64];
extern const uint16_t ff_dv_iweight_248[64];
extern const uint16_t ff_dv_iweight_1080_y[64];
extern const uint16_t ff_dv_iweight_1080_c[64];
extern const uint16_t ff_dv_iweight_720_y[64];
extern const uint16_t ff_dv_iweight_720_c[64];

#define NB_DV_VLC 409

extern const uint16_t ff_dv_vlc_bits[NB_DV_VLC];


+ 112
- 0
libavcodec/dvdec.c View File

@@ -62,6 +62,117 @@ typedef struct BlockInfo {

static const int dv_iweight_bits = 14;

static const uint16_t dv_iweight_88[64] = {
32768, 16705, 16705, 17734, 17032, 17734, 18205, 18081,
18081, 18205, 18725, 18562, 19195, 18562, 18725, 19266,
19091, 19705, 19705, 19091, 19266, 21407, 19643, 20267,
20228, 20267, 19643, 21407, 22725, 21826, 20853, 20806,
20806, 20853, 21826, 22725, 23170, 23170, 21407, 21400,
21407, 23170, 23170, 24598, 23786, 22018, 22018, 23786,
24598, 25251, 24465, 22654, 24465, 25251, 25972, 25172,
25172, 25972, 26722, 27969, 26722, 29692, 29692, 31521,
};
static const uint16_t dv_iweight_248[64] = {
32768, 16384, 16705, 16705, 17734, 17734, 17734, 17734,
18081, 18081, 18725, 18725, 21407, 21407, 19091, 19091,
19195, 19195, 18205, 18205, 18725, 18725, 19705, 19705,
20267, 20267, 21826, 21826, 23170, 23170, 20806, 20806,
20267, 20267, 19266, 19266, 21407, 21407, 20853, 20853,
21400, 21400, 23786, 23786, 24465, 24465, 22018, 22018,
23170, 23170, 22725, 22725, 24598, 24598, 24465, 24465,
25172, 25172, 27969, 27969, 25972, 25972, 29692, 29692
};

/**
* The "inverse" DV100 weights are actually just the spec weights (zig-zagged).
*/
static const uint16_t dv_iweight_1080_y[64] = {
128, 16, 16, 17, 17, 17, 18, 18,
18, 18, 18, 18, 19, 18, 18, 19,
19, 19, 19, 19, 19, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 45, 45, 42, 42,
42, 45, 45, 48, 46, 43, 43, 46,
48, 49, 48, 44, 48, 49, 101, 98,
98, 101, 104, 109, 104, 116, 116, 123,
};
static const uint16_t dv_iweight_1080_c[64] = {
128, 16, 16, 17, 17, 17, 25, 25,
25, 25, 26, 25, 26, 25, 26, 26,
26, 27, 27, 26, 26, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 91, 91, 84, 84,
84, 91, 91, 96, 93, 86, 86, 93,
96, 197, 191, 177, 191, 197, 203, 197,
197, 203, 209, 219, 209, 232, 232, 246,
};
static const uint16_t dv_iweight_720_y[64] = {
128, 16, 16, 17, 17, 17, 18, 18,
18, 18, 18, 18, 19, 18, 18, 19,
19, 19, 19, 19, 19, 42, 38, 40,
40, 40, 38, 42, 44, 43, 41, 41,
41, 41, 43, 44, 68, 68, 63, 63,
63, 68, 68, 96, 92, 86, 86, 92,
96, 98, 96, 88, 96, 98, 202, 196,
196, 202, 208, 218, 208, 232, 232, 246,
};
const uint16_t dv_iweight_720_c[64] = {
128, 24, 24, 26, 26, 26, 36, 36,
36, 36, 36, 36, 38, 36, 36, 38,
38, 38, 38, 38, 38, 84, 76, 80,
80, 80, 76, 84, 88, 86, 82, 82,
82, 82, 86, 88, 182, 182, 168, 168,
168, 182, 182, 192, 186, 192, 172, 186,
192, 394, 382, 354, 382, 394, 406, 394,
394, 406, 418, 438, 418, 464, 464, 492,
};

static void dv_init_weight_tables(DVVideoContext *ctx, const AVDVProfile *d)
{
int j, i, c, s;
uint32_t *factor1 = &ctx->idct_factor[0],
*factor2 = &ctx->idct_factor[DV_PROFILE_IS_HD(d) ? 4096 : 2816];

if (DV_PROFILE_IS_HD(d)) {
/* quantization quanta by QNO for DV100 */
static const uint8_t dv100_qstep[16] = {
1, /* QNO = 0 and 1 both have no quantization */
1,
2, 3, 4, 5, 6, 7, 8, 16, 18, 20, 22, 24, 28, 52
};
const uint16_t *iweight1, *iweight2;

if (d->height == 720) {
iweight1 = &dv_iweight_720_y[0];
iweight2 = &dv_iweight_720_c[0];
} else {
iweight1 = &dv_iweight_1080_y[0];
iweight2 = &dv_iweight_1080_c[0];
}
for (c = 0; c < 4; c++) {
for (s = 0; s < 16; s++) {
for (i = 0; i < 64; i++) {
*factor1++ = (dv100_qstep[s] << (c + 9)) * iweight1[i];
*factor2++ = (dv100_qstep[s] << (c + 9)) * iweight2[i];
}
}
}
} else {
static const uint8_t dv_quant_areas[4] = { 6, 21, 43, 64 };
const uint16_t *iweight1 = &dv_iweight_88[0];
for (j = 0; j < 2; j++, iweight1 = &dv_iweight_248[0]) {
for (s = 0; s < 22; s++) {
for (i = c = 0; c < 4; c++) {
for (; i < dv_quant_areas[c]; i++) {
*factor1 = iweight1[i] << (ff_dv_quant_shifts[s][c] + 1);
*factor2++ = (*factor1++) << 1;
}
}
}
}
}
}

static av_cold int dvvideo_decode_init(AVCodecContext *avctx)
{
DVVideoContext *s = avctx->priv_data;
@@ -375,6 +486,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "Error initializing the work tables.\n");
return ret;
}
dv_init_weight_tables(s, sys);
s->sys = sys;
}



Write Preview
Loading…
Cancel
Save