virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/prores_ks : do not call estimate_alpha at each quantification step

Browse Source 
also remove unused arg in estimate_alpha_plane

Improve quality of Prores 4444 encoding
This commit is contained in:
Martin Vignali
2018-04-05 22:04:35 +02:00
parent 595505083a
commit 1425114af2
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/proresenc_kostya.c
View File

@@ -712,10 +712,9 @@ static int est_alpha_diff(int cur, int prev, int abits)
return dbits + 1; return dbits + 1;
} }
static int estimate_alpha_plane(ProresContext *ctx, int *error, static int estimate_alpha_plane(ProresContext *ctx,
const uint16_t *src, ptrdiff_t linesize, const uint16_t *src, ptrdiff_t linesize,
int mbs_per_slice, int quant, int mbs_per_slice, int16_t *blocks)
int16_t *blocks)
{ {
const int abits = ctx->alpha_bits; const int abits = ctx->alpha_bits;
const int mask = (1 << abits) - 1; const int mask = (1 << abits) - 1;
@@ -725,7 +724,6 @@ static int estimate_alpha_plane(ProresContext *ctx, int *error,
int run = 0; int run = 0;
int bits; int bits;
*error = 0;
cur = blocks[idx++]; cur = blocks[idx++];
bits = est_alpha_diff(cur, prev, abits); bits = est_alpha_diff(cur, prev, abits);
prev = cur; prev = cur;
@@ -774,6 +772,7 @@ static int find_slice_quant(AVCodecContext *avctx,
int overquant; int overquant;
uint16_t *qmat; uint16_t *qmat;
int linesize[4], line_add; int linesize[4], line_add;
int alpha_bits = 0;
if (ctx->pictures_per_frame == 1) if (ctx->pictures_per_frame == 1)
line_add = 0; line_add = 0;
@@ -819,9 +818,12 @@ static int find_slice_quant(AVCodecContext *avctx,
td->nodes[trellis_node + q].quant = q; td->nodes[trellis_node + q].quant = q;
} }
if (ctx->alpha_bits)
alpha_bits = estimate_alpha_plane(ctx, src, linesize[3],
mbs_per_slice, td->blocks[3]);
// todo: maybe perform coarser quantising to fit into frame size when needed // todo: maybe perform coarser quantising to fit into frame size when needed
for (q = min_quant; q <= max_quant; q++) { for (q = min_quant; q <= max_quant; q++) {
bits = 0; bits = alpha_bits;
error = 0; error = 0;
for (i = 0; i < ctx->num_planes - !!ctx->alpha_bits; i++) { for (i = 0; i < ctx->num_planes - !!ctx->alpha_bits; i++) {
bits += estimate_slice_plane(ctx, &error, i, bits += estimate_slice_plane(ctx, &error, i,
@@ -830,9 +832,6 @@ static int find_slice_quant(AVCodecContext *avctx,
num_cblocks[i], plane_factor[i], num_cblocks[i], plane_factor[i],
ctx->quants[q], td); ctx->quants[q], td);
} }
if (ctx->alpha_bits)
bits += estimate_alpha_plane(ctx, &error, src, linesize[3],
mbs_per_slice, q, td->blocks[3]);
if (bits > 65000 * 8) if (bits > 65000 * 8)
error = SCORE_LIMIT; error = SCORE_LIMIT;
@@ -845,7 +844,7 @@ static int find_slice_quant(AVCodecContext *avctx,
overquant = max_quant; overquant = max_quant;
} else { } else {
for (q = max_quant + 1; q < 128; q++) { for (q = max_quant + 1; q < 128; q++) {
bits = 0; bits = alpha_bits;
error = 0; error = 0;
if (q < MAX_STORED_Q) { if (q < MAX_STORED_Q) {
qmat = ctx->quants[q]; qmat = ctx->quants[q];
@@ -861,9 +860,6 @@ static int find_slice_quant(AVCodecContext *avctx,
num_cblocks[i], plane_factor[i], num_cblocks[i], plane_factor[i],
qmat, td); qmat, td);
} }
if (ctx->alpha_bits)
bits += estimate_alpha_plane(ctx, &error, src, linesize[3],
mbs_per_slice, q, td->blocks[3]);
if (bits <= ctx->bits_per_mb * mbs_per_slice) if (bits <= ctx->bits_per_mb * mbs_per_slice)
break; break;
} }