RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vc2enc: simplify slice cost caching 

The fact that now all quantization indices costs are cached justifies
storing 20 more integers in a structure already allocated on heap.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2016-03-01 13:04:40 +00:00
parent 6061b78e83
commit 41985d40c6
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/vc2enc.c
View File

@ -36,9 +36,6 @@
* (COEF_LUT_TAB*MAX_QUANT_INDEX) since the sign is appended during encoding */ * (COEF_LUT_TAB*MAX_QUANT_INDEX) since the sign is appended during encoding */
#define COEF_LUT_TAB 2048 #define COEF_LUT_TAB 2048
/* Per slice quantization bit cost cache */
#define SLICE_CACHED_QUANTIZERS 30
/* Decides the cutoff point in # of slices to distribute the leftover bytes */ /* Decides the cutoff point in # of slices to distribute the leftover bytes */
#define SLICE_REDIST_TOTAL 150 #define SLICE_REDIST_TOTAL 150
@ -67,15 +64,9 @@ typedef struct Plane {
ptrdiff_t coef_stride; ptrdiff_t coef_stride;
} Plane; } Plane;
typedef struct BitCostCache {
int bits;
int quantizer;
} BitCostCache;
typedef struct SliceArgs { typedef struct SliceArgs {
PutBitContext pb; PutBitContext pb;
BitCostCache cache[SLICE_CACHED_QUANTIZERS]; int cache[MAX_QUANT_INDEX];
int cached_results;
void *ctx; void *ctx;
int x; int x;
int y; int y;
@ -584,18 +575,15 @@ static void encode_subband(VC2EncContext *s, PutBitContext *pb, int sx, int sy,
} }
} }
static int count_hq_slice(VC2EncContext *s, BitCostCache *cache, static int count_hq_slice(VC2EncContext *s, int *cache,
int *cached_results, int slice_x, int slice_y, int slice_x, int slice_y, int quant_idx)
int quant_idx)
{ {
int i, x, y; int x, y;
uint8_t quants[MAX_DWT_LEVELS][4]; uint8_t quants[MAX_DWT_LEVELS][4];
int bits = 0, p, level, orientation; int bits = 0, p, level, orientation;
if (cache && *cached_results) if (cache && cache[quant_idx])
for (i = 0; i < *cached_results; i++) return cache[quant_idx];
if (cache[i].quantizer == quant_idx)
return cache[i].bits;
bits += 8*s->prefix_bytes; bits += 8*s->prefix_bytes;
bits += 8; /* quant_idx */ bits += 8; /* quant_idx */
@ -646,11 +634,8 @@ static int count_hq_slice(VC2EncContext *s, BitCostCache *cache,
bits += pad_c*8; bits += pad_c*8;
} }
if (cache) { if (cache)
cache[*cached_results].quantizer = quant_idx; cache[quant_idx] = bits;
cache[*cached_results].bits = bits;
*cached_results = FFMIN(*cached_results + 1, SLICE_CACHED_QUANTIZERS);
}
return bits; return bits;
} }
@ -668,14 +653,12 @@ static int rate_control(AVCodecContext *avctx, void *arg)
int quant = slice_dat->quant_idx, range = quant/5; int quant = slice_dat->quant_idx, range = quant/5;
const int top = slice_dat->bits_ceil; const int top = slice_dat->bits_ceil;
const int bottom = slice_dat->bits_floor; const int bottom = slice_dat->bits_floor;
int bits = count_hq_slice(s, slice_dat->cache, &slice_dat->cached_results, int bits = count_hq_slice(s, slice_dat->cache, sx, sy, quant);
sx, sy, quant);
range -= range & 1; /* Make it an even number */ range -= range & 1; /* Make it an even number */
while ((bits > top) || (bits < bottom)) { while ((bits > top) || (bits < bottom)) {
range *= bits > top ? +1 : -1; range *= bits > top ? +1 : -1;
quant = av_clip(quant + range, 0, s->q_ceil); quant = av_clip(quant + range, 0, s->q_ceil);
bits = count_hq_slice(s, slice_dat->cache, &slice_dat->cached_results, bits = count_hq_slice(s, slice_dat->cache, sx, sy, quant);
sx, sy, quant);
range = av_clip(range/2, 1, s->q_ceil); range = av_clip(range/2, 1, s->q_ceil);
if (quant_buf[1] == quant) { if (quant_buf[1] == quant) {
quant = bits_last < bits ? quant_buf[0] : quant; quant = bits_last < bits ? quant_buf[0] : quant;
@ -704,9 +687,9 @@ static void calc_slice_sizes(VC2EncContext *s)
args->ctx = s; args->ctx = s;
args->x = slice_x; args->x = slice_x;
args->y = slice_y; args->y = slice_y;
args->cached_results = 0;
args->bits_ceil = s->slice_max_bytes << 3; args->bits_ceil = s->slice_max_bytes << 3;
args->bits_floor = s->slice_min_bytes << 3; args->bits_floor = s->slice_min_bytes << 3;
memset(args->cache, 0, MAX_QUANT_INDEX*sizeof(*args->cache));
} }
} }
@ -808,8 +791,7 @@ static int encode_slices(VC2EncContext *s)
args = top_loc[i]; args = top_loc[i];
prev_bytes = args->bytes; prev_bytes = args->bytes;
new_idx = av_clip(args->quant_idx - 1, 0, s->q_ceil); new_idx = av_clip(args->quant_idx - 1, 0, s->q_ceil);
bits = count_hq_slice(s, args->cache, &args->cached_results, bits = count_hq_slice(s, args->cache, args->x, args->y, new_idx);
args->x, args->y, new_idx);
bytes = FFALIGN((bits >> 3), s->size_scaler) + 4 + s->prefix_bytes; bytes = FFALIGN((bits >> 3), s->size_scaler) + 4 + s->prefix_bytes;
diff = bytes - prev_bytes; diff = bytes - prev_bytes;
if ((bytes_left - diff) >= 0) { if ((bytes_left - diff) >= 0) {
@ -1050,7 +1032,7 @@ static int minimum_frame_bits(VC2EncContext *s)
s->size_scaler = 64; s->size_scaler = 64;
for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_y = 0; slice_y < s->num_y; slice_y++) {
for (slice_x = 0; slice_x < s->num_x; slice_x++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) {
bits += count_hq_slice(s, NULL, NULL, slice_x, slice_y, s->q_ceil); bits += count_hq_slice(s, NULL, slice_x, slice_y, s->q_ceil);
} }
} }
return bits; return bits;