RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-19 05:40:56 +00:00
Code Issues Projects Releases Wiki Activity

Revert "vc2enc: Calculate average slice quantiser correctly"

Browse Source 
This reverts commit 626d200e76.
This commit is contained in:
Kieran Kunhya 2017-11-04 18:31:59 +00:00
parent 415038f2bd
commit 1358f7ddb3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vc2enc.c
View File

@ -167,7 +167,7 @@ typedef struct VC2EncContext {
int slice_max_bytes; int slice_max_bytes;
int slice_min_bytes; int slice_min_bytes;
int q_ceil; int q_ceil;
int64_t q_avg; int q_avg;
/* Options */ /* Options */
double tolerance; double tolerance;
@ -755,7 +755,7 @@ static int calc_slice_sizes(VC2EncContext *s)
for (i = 0; i < s->num_x*s->num_y; i++) { for (i = 0; i < s->num_x*s->num_y; i++) {
SliceArgs *args = &enc_args[i]; SliceArgs *args = &enc_args[i];
total_bytes_needed += args->bytes; total_bytes_needed += args->bytes;
s->q_avg += args->quant_idx; s->q_avg = (s->q_avg + args->quant_idx)/2;
} }
return total_bytes_needed; return total_bytes_needed;
@ -1045,7 +1045,7 @@ static av_cold int vc2_encode_end(AVCodecContext *avctx)
int i; int i;
VC2EncContext *s = avctx->priv_data; VC2EncContext *s = avctx->priv_data;
av_log(avctx, AV_LOG_INFO, "Qavg: %f\n", (float)s->q_avg / (s->num_x*s->num_y)); av_log(avctx, AV_LOG_INFO, "Qavg: %i\n", s->q_avg);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ff_vc2enc_free_transforms(&s->transform_args[i].t); ff_vc2enc_free_transforms(&s->transform_args[i].t);