RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-11 03:32:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'

Browse Source 
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-12 13:32:13 +01:00
commit 15daa8f9dd
2 changed files with 580 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

319
libavcodec/ratecontrol.c
View File

@ -40,27 +40,45 @@
#endif #endif
static int init_pass2(MpegEncContext *s); static int init_pass2(MpegEncContext *s);
static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_factor, int frame_num); static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
double rate_factor, int frame_num);
void ff_write_pass1_stats(MpegEncContext *s){ void ff_write_pass1_stats(MpegEncContext *s)
snprintf(s->avctx->stats_out, 256, "in:%d out:%d type:%d q:%d itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d;\n", {
s->current_picture_ptr->f.display_picture_number, s->current_picture_ptr->f.coded_picture_number, s->pict_type, snprintf(s->avctx->stats_out, 256,
s->current_picture.f.quality, s->i_tex_bits, s->p_tex_bits, s->mv_bits, s->misc_bits, "in:%d out:%d type:%d q:%d itex:%d ptex:%d mv:%d misc:%d "
s->f_code, s->b_code, s->current_picture.mc_mb_var_sum, s->current_picture.mb_var_sum, s->i_count, s->skip_count, s->header_bits); "fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d;\n",
s->current_picture_ptr->f.display_picture_number,
s->current_picture_ptr->f.coded_picture_number,
s->pict_type,
s->current_picture.f.quality,
s->i_tex_bits,
s->p_tex_bits,
s->mv_bits,
s->misc_bits,
s->f_code,
s->b_code,
s->current_picture.mc_mb_var_sum,
s->current_picture.mb_var_sum,
s->i_count, s->skip_count,
s->header_bits);
} }
static double get_fps(AVCodecContext *avctx){ static double get_fps(AVCodecContext *avctx)
{
return 1.0 / av_q2d(avctx->time_base) / FFMAX(avctx->ticks_per_frame, 1); return 1.0 / av_q2d(avctx->time_base) / FFMAX(avctx->ticks_per_frame, 1);
} }
static inline double qp2bits(RateControlEntry *rce, double qp){ static inline double qp2bits(RateControlEntry *rce, double qp)
{
if (qp <= 0.0) { if (qp <= 0.0) {
av_log(NULL, AV_LOG_ERROR, "qp<=0.0\n"); av_log(NULL, AV_LOG_ERROR, "qp<=0.0\n");
} }
return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / qp; return rce->qscale * (double)(rce->i_tex_bits + rce->p_tex_bits + 1) / qp;
} }
static inline double bits2qp(RateControlEntry *rce, double bits){ static inline double bits2qp(RateControlEntry *rce, double bits)
{
if (bits < 0.9) { if (bits < 0.9) {
av_log(NULL, AV_LOG_ERROR, "bits<0.9\n"); av_log(NULL, AV_LOG_ERROR, "bits<0.9\n");
} }
@ -87,10 +105,12 @@ int ff_rate_control_init(MpegEncContext *s)
"isB", "isB",
"avgQP", "avgQP",
"qComp", "qComp",
/* "lastIQP", #if 0
"lastIQP",
"lastPQP", "lastPQP",
"lastBQP", "lastBQP",
"nextNonBQP",*/ "nextNonBQP",
#endif
"avgIITex", "avgIITex",
"avgPITex", "avgPITex",
"avgPPTex", "avgPPTex",
@ -117,7 +137,10 @@ int ff_rate_control_init(MpegEncContext *s)
s->avctx->rc_max_available_vbv_use = 1.0; s->avctx->rc_max_available_vbv_use = 1.0;
} }
res = av_expr_parse(&rcc->rc_eq_eval, s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, 0, s->avctx); res = av_expr_parse(&rcc->rc_eq_eval,
s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp",
const_names, func1_names, func1,
NULL, NULL, 0, s->avctx);
if (res < 0) { if (res < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n", s->avctx->rc_eq); av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n", s->avctx->rc_eq);
return res; return res;
@ -126,13 +149,14 @@ int ff_rate_control_init(MpegEncContext *s)
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
rcc->pred[i].coeff = FF_QP2LAMBDA * 7.0; rcc->pred[i].coeff = FF_QP2LAMBDA * 7.0;
rcc->pred[i].count = 1.0; rcc->pred[i].count = 1.0;
rcc->pred[i].decay = 0.4; rcc->pred[i].decay = 0.4;
rcc->i_cplx_sum [i] = rcc->i_cplx_sum [i] =
rcc->p_cplx_sum [i] = rcc->p_cplx_sum [i] =
rcc->mv_bits_sum[i] = rcc->mv_bits_sum[i] =
rcc->qscale_sum [i] = rcc->qscale_sum [i] =
rcc->frame_count[i] = 1; // 1 is better because of 1/0 and such rcc->frame_count[i] = 1; // 1 is better because of 1/0 and such
rcc->last_qscale_for[i] = FF_QP2LAMBDA * 5; rcc->last_qscale_for[i] = FF_QP2LAMBDA * 5;
} }
rcc->buffer_index = s->avctx->rc_initial_buffer_occupancy; rcc->buffer_index = s->avctx->rc_initial_buffer_occupancy;
@ -145,18 +169,19 @@ int ff_rate_control_init(MpegEncContext *s)
/* find number of pics */ /* find number of pics */
p = s->avctx->stats_in; p = s->avctx->stats_in;
for(i=-1; p; i++){ for (i = -1; p; i++)
p = strchr(p + 1, ';'); p = strchr(p + 1, ';');
}
i += s->max_b_frames; i += s->max_b_frames;
if (i <= 0 || i >= INT_MAX / sizeof(RateControlEntry)) if (i <= 0 || i >= INT_MAX / sizeof(RateControlEntry))
return -1; return -1;
rcc->entry = av_mallocz(i * sizeof(RateControlEntry)); rcc->entry = av_mallocz(i * sizeof(RateControlEntry));
rcc->num_entries = i; rcc->num_entries = i;
/* init all to skipped p frames (with b frames we might have a not encoded frame at the end FIXME) */ /* init all to skipped p frames
* (with b frames we might have a not encoded frame at the end FIXME) */
for (i = 0; i < rcc->num_entries; i++) { for (i = 0; i < rcc->num_entries; i++) {
RateControlEntry *rce = &rcc->entry[i]; RateControlEntry *rce = &rcc->entry[i];
rce->pict_type = rce->new_pict_type = AV_PICTURE_TYPE_P; rce->pict_type = rce->new_pict_type = AV_PICTURE_TYPE_P;
rce->qscale = rce->new_qscale = FF_QP2LAMBDA * 2; rce->qscale = rce->new_qscale = FF_QP2LAMBDA * 2;
rce->misc_bits = s->mb_num + 10; rce->misc_bits = s->mb_num + 10;
@ -183,31 +208,37 @@ int ff_rate_control_init(MpegEncContext *s)
rce = &rcc->entry[picture_number]; rce = &rcc->entry[picture_number];
e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d", e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%d var:%d icount:%d skipcount:%d hbits:%d",
&rce->pict_type, &rce->qscale, &rce->i_tex_bits, &rce->p_tex_bits, &rce->mv_bits, &rce->misc_bits, &rce->pict_type, &rce->qscale, &rce->i_tex_bits, &rce->p_tex_bits,
&rce->f_code, &rce->b_code, &rce->mc_mb_var_sum, &rce->mb_var_sum, &rce->i_count, &rce->skip_count, &rce->header_bits); &rce->mv_bits, &rce->misc_bits,
&rce->f_code, &rce->b_code,
&rce->mc_mb_var_sum, &rce->mb_var_sum,
&rce->i_count, &rce->skip_count, &rce->header_bits);
if (e != 14) { if (e != 14) {
av_log(s->avctx, AV_LOG_ERROR, "statistics are damaged at line %d, parser out=%d\n", i, e); av_log(s->avctx, AV_LOG_ERROR,
"statistics are damaged at line %d, parser out=%d\n",
i, e);
return -1; return -1;
} }
p = next; p = next;
} }
if(init_pass2(s) < 0) return -1; if (init_pass2(s) < 0)
return -1;
// FIXME maybe move to end // FIXME maybe move to end
if ((s->flags & CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) { if ((s->flags & CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
#if CONFIG_LIBXVID #if CONFIG_LIBXVID
return ff_xvid_rate_control_init(s); return ff_xvid_rate_control_init(s);
#else #else
av_log(s->avctx, AV_LOG_ERROR, "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n"); av_log(s->avctx, AV_LOG_ERROR,
"Xvid ratecontrol requires libavcodec compiled with Xvid support.\n");
return -1; return -1;
#endif #endif
} }
} }
if (!(s->flags & CODEC_FLAG_PASS2)) { if (!(s->flags & CODEC_FLAG_PASS2)) {
rcc->short_term_qsum = 0.001; rcc->short_term_qsum = 0.001;
rcc->short_term_qcount = 0.001; rcc->short_term_qcount = 0.001;
@ -224,13 +255,17 @@ int ff_rate_control_init(MpegEncContext *s)
double bits = s->avctx->rc_initial_cplx * (i / 10000.0 + 1.0) * s->mb_num; double bits = s->avctx->rc_initial_cplx * (i / 10000.0 + 1.0) * s->mb_num;
RateControlEntry rce; RateControlEntry rce;
if (i%((s->gop_size+3)/4)==0) rce.pict_type= AV_PICTURE_TYPE_I; if (i % ((s->gop_size + 3) / 4) == 0)
else if(i%(s->max_b_frames+1)) rce.pict_type= AV_PICTURE_TYPE_B; rce.pict_type = AV_PICTURE_TYPE_I;
else rce.pict_type= AV_PICTURE_TYPE_P; else if (i % (s->max_b_frames + 1))
rce.pict_type = AV_PICTURE_TYPE_B;
else
rce.pict_type = AV_PICTURE_TYPE_P;
rce.new_pict_type = rce.pict_type; rce.new_pict_type = rce.pict_type;
rce.mc_mb_var_sum = bits * s->mb_num / 100000; rce.mc_mb_var_sum = bits * s->mb_num / 100000;
rce.mb_var_sum = s->mb_num; rce.mb_var_sum = s->mb_num;
rce.qscale = FF_QP2LAMBDA * 2; rce.qscale = FF_QP2LAMBDA * 2;
rce.f_code = 2; rce.f_code = 2;
rce.b_code = 1; rce.b_code = 1;
@ -253,10 +288,11 @@ int ff_rate_control_init(MpegEncContext *s)
rcc->frame_count[rce.pict_type]++; rcc->frame_count[rce.pict_type]++;
get_qscale(s, &rce, rcc->pass1_wanted_bits / rcc->pass1_rc_eq_output_sum, i); get_qscale(s, &rce, rcc->pass1_wanted_bits / rcc->pass1_rc_eq_output_sum, i);
rcc->pass1_wanted_bits+= s->bit_rate/get_fps(s->avctx); //FIXME misbehaves a little for variable fps
}
}
// FIXME misbehaves a little for variable fps
rcc->pass1_wanted_bits += s->bit_rate / get_fps(s->avctx);
}
}
} }
return 0; return 0;
@ -276,7 +312,8 @@ void ff_rate_control_uninit(MpegEncContext *s)
#endif #endif
} }
int ff_vbv_update(MpegEncContext *s, int frame_size){ int ff_vbv_update(MpegEncContext *s, int frame_size)
{
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;
const double fps = get_fps(s->avctx); const double fps = get_fps(s->avctx);
const int buffer_size = s->avctx->rc_buffer_size; const int buffer_size = s->avctx->rc_buffer_size;
@ -285,6 +322,7 @@ int ff_vbv_update(MpegEncContext *s, int frame_size){
av_dlog(s, "%d %f %d %f %f\n", av_dlog(s, "%d %f %d %f %f\n",
buffer_size, rcc->buffer_index, frame_size, min_rate, max_rate); buffer_size, rcc->buffer_index, frame_size, min_rate, max_rate);
if (buffer_size) { if (buffer_size) {
int left; int left;
@ -316,12 +354,14 @@ int ff_vbv_update(MpegEncContext *s, int frame_size){
/** /**
* Modify the bitrate curve from pass1 for one frame. * Modify the bitrate curve from pass1 for one frame.
*/ */
static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_factor, int frame_num){ static double get_qscale(MpegEncContext *s, RateControlEntry *rce,
double rate_factor, int frame_num)
{
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;
AVCodecContext *a = s->avctx; AVCodecContext *a = s->avctx;
double q, bits;
const int pict_type = rce->new_pict_type; const int pict_type = rce->new_pict_type;
const double mb_num = s->mb_num; const double mb_num = s->mb_num;
double q, bits;
int i; int i;
double const_values[] = { double const_values[] = {
@ -340,10 +380,12 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f
rce->pict_type == AV_PICTURE_TYPE_B, rce->pict_type == AV_PICTURE_TYPE_B,
rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type], rcc->qscale_sum[pict_type] / (double)rcc->frame_count[pict_type],
a->qcompress, a->qcompress,
/* rcc->last_qscale_for[AV_PICTURE_TYPE_I], #if 0
rcc->last_qscale_for[AV_PICTURE_TYPE_I],
rcc->last_qscale_for[AV_PICTURE_TYPE_P], rcc->last_qscale_for[AV_PICTURE_TYPE_P],
rcc->last_qscale_for[AV_PICTURE_TYPE_B], rcc->last_qscale_for[AV_PICTURE_TYPE_B],
rcc->next_non_b_qscale,*/ rcc->next_non_b_qscale,
#endif
rcc->i_cplx_sum[AV_PICTURE_TYPE_I] / (double)rcc->frame_count[AV_PICTURE_TYPE_I], rcc->i_cplx_sum[AV_PICTURE_TYPE_I] / (double)rcc->frame_count[AV_PICTURE_TYPE_I],
rcc->i_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P], rcc->i_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],
rcc->p_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P], rcc->p_cplx_sum[AV_PICTURE_TYPE_P] / (double)rcc->frame_count[AV_PICTURE_TYPE_P],
@ -360,14 +402,17 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f
rcc->pass1_rc_eq_output_sum += bits; rcc->pass1_rc_eq_output_sum += bits;
bits *= rate_factor; bits *= rate_factor;
if(bits<0.0) bits=0.0; if (bits < 0.0)
bits = 0.0;
bits += 1.0; // avoid 1/0 issues bits += 1.0; // avoid 1/0 issues
/* user override */ /* user override */
for (i = 0; i < s->avctx->rc_override_count; i++) { for (i = 0; i < s->avctx->rc_override_count; i++) {
RcOverride *rco = s->avctx->rc_override; RcOverride *rco = s->avctx->rc_override;
if(rco[i].start_frame > frame_num) continue; if (rco[i].start_frame > frame_num)
if(rco[i].end_frame < frame_num) continue; continue;
if (rco[i].end_frame < frame_num)
continue;
if (rco[i].qscale) if (rco[i].qscale)
bits = qp2bits(rce, rco[i].qscale); // FIXME move at end to really force it? bits = qp2bits(rce, rco[i].qscale); // FIXME move at end to really force it?
@ -382,31 +427,38 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f
q = -q * s->avctx->i_quant_factor + s->avctx->i_quant_offset; q = -q * s->avctx->i_quant_factor + s->avctx->i_quant_offset;
else if (pict_type == AV_PICTURE_TYPE_B && s->avctx->b_quant_factor < 0.0) else if (pict_type == AV_PICTURE_TYPE_B && s->avctx->b_quant_factor < 0.0)
q = -q * s->avctx->b_quant_factor + s->avctx->b_quant_offset; q = -q * s->avctx->b_quant_factor + s->avctx->b_quant_offset;
if(q<1) q=1; if (q < 1)
q = 1;
return q; return q;
} }
static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, double q){ static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, double q)
{
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;
AVCodecContext *a = s->avctx; AVCodecContext *a = s->avctx;
const int pict_type = rce->new_pict_type; const int pict_type = rce->new_pict_type;
const double last_p_q = rcc->last_qscale_for[AV_PICTURE_TYPE_P]; const double last_p_q = rcc->last_qscale_for[AV_PICTURE_TYPE_P];
const double last_non_b_q = rcc->last_qscale_for[rcc->last_non_b_pict_type]; const double last_non_b_q = rcc->last_qscale_for[rcc->last_non_b_pict_type];
if (pict_type==AV_PICTURE_TYPE_I && (a->i_quant_factor>0.0 || rcc->last_non_b_pict_type==AV_PICTURE_TYPE_P)) if (pict_type == AV_PICTURE_TYPE_I &&
(a->i_quant_factor > 0.0 || rcc->last_non_b_pict_type == AV_PICTURE_TYPE_P))
q = last_p_q * FFABS(a->i_quant_factor) + a->i_quant_offset; q = last_p_q * FFABS(a->i_quant_factor) + a->i_quant_offset;
else if(pict_type==AV_PICTURE_TYPE_B && a->b_quant_factor>0.0) else if (pict_type == AV_PICTURE_TYPE_B &&
a->b_quant_factor > 0.0)
q = last_non_b_q * a->b_quant_factor + a->b_quant_offset; q = last_non_b_q * a->b_quant_factor + a->b_quant_offset;
if(q<1) q=1; if (q < 1)
q = 1;
/* last qscale / qdiff stuff */ /* last qscale / qdiff stuff */
if (rcc->last_non_b_pict_type == pict_type || pict_type != AV_PICTURE_TYPE_I) { if (rcc->last_non_b_pict_type == pict_type || pict_type != AV_PICTURE_TYPE_I) {
double last_q = rcc->last_qscale_for[pict_type]; double last_q = rcc->last_qscale_for[pict_type];
const int maxdiff = FF_QP2LAMBDA * a->max_qdiff; const int maxdiff = FF_QP2LAMBDA * a->max_qdiff;
if (q > last_q + maxdiff) q= last_q + maxdiff; if (q > last_q + maxdiff)
else if(q < last_q - maxdiff) q= last_q - maxdiff; q = last_q + maxdiff;
else if (q < last_q - maxdiff)
q = last_q - maxdiff;
} }
rcc->last_qscale_for[pict_type] = q; // Note we cannot do that after blurring rcc->last_qscale_for[pict_type] = q; // Note we cannot do that after blurring
@ -420,42 +472,51 @@ static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, doubl
/** /**
* Get the qmin & qmax for pict_type. * Get the qmin & qmax for pict_type.
*/ */
static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pict_type){ static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pict_type)
{
int qmin = s->avctx->lmin; int qmin = s->avctx->lmin;
int qmax = s->avctx->lmax; int qmax = s->avctx->lmax;
assert(qmin <= qmax); assert(qmin <= qmax);
if(pict_type==AV_PICTURE_TYPE_B){ switch (pict_type) {
case AV_PICTURE_TYPE_B:
qmin = (int)(qmin * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5); qmin = (int)(qmin * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5);
qmax = (int)(qmax * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5); qmax = (int)(qmax * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset + 0.5);
}else if(pict_type==AV_PICTURE_TYPE_I){ break;
case AV_PICTURE_TYPE_I:
qmin = (int)(qmin * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5); qmin = (int)(qmin * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5);
qmax = (int)(qmax * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5); qmax = (int)(qmax * FFABS(s->avctx->i_quant_factor) + s->avctx->i_quant_offset + 0.5);
break;
} }
qmin = av_clip(qmin, 1, FF_LAMBDA_MAX); qmin = av_clip(qmin, 1, FF_LAMBDA_MAX);
qmax = av_clip(qmax, 1, FF_LAMBDA_MAX); qmax = av_clip(qmax, 1, FF_LAMBDA_MAX);
if(qmax<qmin) qmax= qmin; if (qmax < qmin)
qmax = qmin;
*qmin_ret = qmin; *qmin_ret = qmin;
*qmax_ret = qmax; *qmax_ret = qmax;
} }
static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q, int frame_num){ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce,
double q, int frame_num)
{
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;
int qmin, qmax;
const int pict_type= rce->new_pict_type;
const double buffer_size = s->avctx->rc_buffer_size; const double buffer_size = s->avctx->rc_buffer_size;
const double fps = get_fps(s->avctx); const double fps = get_fps(s->avctx);
const double min_rate = s->avctx->rc_min_rate / fps; const double min_rate = s->avctx->rc_min_rate / fps;
const double max_rate = s->avctx->rc_max_rate / fps; const double max_rate = s->avctx->rc_max_rate / fps;
const int pict_type = rce->new_pict_type;
int qmin, qmax;
get_qminmax(&qmin, &qmax, s, pict_type); get_qminmax(&qmin, &qmax, s, pict_type);
/* modulation */ /* modulation */
if(s->avctx->rc_qmod_freq && frame_num%s->avctx->rc_qmod_freq==0 && pict_type==AV_PICTURE_TYPE_P) if (s->avctx->rc_qmod_freq &&
frame_num % s->avctx->rc_qmod_freq == 0 &&
pict_type == AV_PICTURE_TYPE_P)
q *= s->avctx->rc_qmod_amp; q *= s->avctx->rc_qmod_amp;
/* buffer overflow/underflow protection */ /* buffer overflow/underflow protection */
@ -465,30 +526,40 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q,
if (min_rate) { if (min_rate) {
double d = 2 * (buffer_size - expected_size) / buffer_size; double d = 2 * (buffer_size - expected_size) / buffer_size;
if(d>1.0) d=1.0; if (d > 1.0)
else if(d<0.0001) d=0.0001; d = 1.0;
else if (d < 0.0001)
d = 0.0001;
q *= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity); q *= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity);
q_limit= bits2qp(rce, FFMAX((min_rate - buffer_size + rcc->buffer_index) * s->avctx->rc_min_vbv_overflow_use, 1)); q_limit = bits2qp(rce,
FFMAX((min_rate - buffer_size + rcc->buffer_index) *
s->avctx->rc_min_vbv_overflow_use, 1));
if (q > q_limit) { if (q > q_limit) {
if(s->avctx->debug&FF_DEBUG_RC){ if (s->avctx->debug & FF_DEBUG_RC)
av_log(s->avctx, AV_LOG_DEBUG, "limiting QP %f -> %f\n", q, q_limit); av_log(s->avctx, AV_LOG_DEBUG,
} "limiting QP %f -> %f\n", q, q_limit);
q = q_limit; q = q_limit;
} }
} }
if (max_rate) { if (max_rate) {
double d = 2 * expected_size / buffer_size; double d = 2 * expected_size / buffer_size;
if(d>1.0) d=1.0; if (d > 1.0)
else if(d<0.0001) d=0.0001; d = 1.0;
else if (d < 0.0001)
d = 0.0001;
q /= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity); q /= pow(d, 1.0 / s->avctx->rc_buffer_aggressivity);
q_limit= bits2qp(rce, FFMAX(rcc->buffer_index * s->avctx->rc_max_available_vbv_use, 1)); q_limit = bits2qp(rce,
FFMAX(rcc->buffer_index *
s->avctx->rc_max_available_vbv_use,
1));
if (q < q_limit) { if (q < q_limit) {
if(s->avctx->debug&FF_DEBUG_RC){ if (s->avctx->debug & FF_DEBUG_RC)
av_log(s->avctx, AV_LOG_DEBUG, "limiting QP %f -> %f\n", q, q_limit); av_log(s->avctx, AV_LOG_DEBUG,
} "limiting QP %f -> %f\n", q, q_limit);
q = q_limit; q = q_limit;
} }
} }
@ -497,8 +568,10 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q,
q, max_rate, min_rate, buffer_size, rcc->buffer_index, q, max_rate, min_rate, buffer_size, rcc->buffer_index,
s->avctx->rc_buffer_aggressivity); s->avctx->rc_buffer_aggressivity);
if (s->avctx->rc_qsquish == 0.0 || qmin == qmax) { if (s->avctx->rc_qsquish == 0.0 || qmin == qmax) {
if (q<qmin) q=qmin; if (q < qmin)
else if(q>qmax) q=qmax; q = qmin;
else if (q > qmax)
q = qmax;
} else { } else {
double min2 = log(qmin); double min2 = log(qmin);
double max2 = log(qmax); double max2 = log(qmax);
@ -526,7 +599,8 @@ static double predict_size(Predictor *p, double q, double var)
static void update_predictor(Predictor *p, double q, double var, double size) static void update_predictor(Predictor *p, double q, double var, double size)
{ {
double new_coeff = size * q / (var + 1); double new_coeff = size * q / (var + 1);
if(var<10) return; if (var < 10)
return;
p->count *= p->decay; p->count *= p->decay;
p->coeff *= p->decay; p->coeff *= p->decay;
@ -534,7 +608,8 @@ static void update_predictor(Predictor *p, double q, double var, double size)
p->coeff += new_coeff; p->coeff += new_coeff;
} }
static void adaptive_quantization(MpegEncContext *s, double q){ static void adaptive_quantization(MpegEncContext *s, double q)
{
int i; int i;
const float lumi_masking = s->avctx->lumi_masking / (128.0 * 128.0); const float lumi_masking = s->avctx->lumi_masking / (128.0 * 128.0);
const float dark_masking = s->avctx->dark_masking / (128.0 * 128.0); const float dark_masking = s->avctx->dark_masking / (128.0 * 128.0);
@ -562,8 +637,10 @@ static void adaptive_quantization(MpegEncContext *s, double q){
int mb_y = mb_xy / s->mb_stride; int mb_y = mb_xy / s->mb_stride;
int mb_distance; int mb_distance;
float mb_factor = 0.0; float mb_factor = 0.0;
if(spat_cplx < 4) spat_cplx= 4; //FIXME finetune if (spat_cplx < 4)
if(temp_cplx < 4) temp_cplx= 4; //FIXME finetune spat_cplx = 4; // FIXME finetune
if (temp_cplx < 4)
temp_cplx = 4; // FIXME finetune
if ((s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_INTRA)) { // FIXME hq mode if ((s->mb_type[mb_xy] & CANDIDATE_MB_TYPE_INTRA)) { // FIXME hq mode
cplx = spat_cplx; cplx = spat_cplx;
@ -588,15 +665,18 @@ static void adaptive_quantization(MpegEncContext *s, double q){
} }
if (mb_y < mb_height / 5) { if (mb_y < mb_height / 5) {
mb_distance = mb_height / 5 - mb_y; mb_distance = mb_height / 5 - mb_y;
mb_factor = FFMAX(mb_factor, (float)mb_distance / (float)(mb_height/5)); mb_factor = FFMAX(mb_factor,
(float)mb_distance / (float)(mb_height / 5));
} else if (mb_y > 4 * mb_height / 5) { } else if (mb_y > 4 * mb_height / 5) {
mb_distance = mb_y - 4 * mb_height / 5; mb_distance = mb_y - 4 * mb_height / 5;
mb_factor = FFMAX(mb_factor, (float)mb_distance / (float)(mb_height/5)); mb_factor = FFMAX(mb_factor,
(float)mb_distance / (float)(mb_height / 5));
} }
factor *= 1.0 - border_masking * mb_factor; factor *= 1.0 - border_masking * mb_factor;
if(factor<0.00001) factor= 0.00001; if (factor < 0.00001)
factor = 0.00001;
bits = cplx * factor; bits = cplx * factor;
cplx_sum += cplx; cplx_sum += cplx;
@ -615,14 +695,15 @@ static void adaptive_quantization(MpegEncContext *s, double q){
if (newq > qmax) { if (newq > qmax) {
bits_sum -= bits_tab[i]; bits_sum -= bits_tab[i];
cplx_sum -= cplx_tab[i] * q / qmax; cplx_sum -= cplx_tab[i] * q / qmax;
} } else if (newq < qmin) {
else if(newq < qmin){
bits_sum -= bits_tab[i]; bits_sum -= bits_tab[i];
cplx_sum -= cplx_tab[i] * q / qmin; cplx_sum -= cplx_tab[i] * q / qmin;
} }
} }
if(bits_sum < 0.001) bits_sum= 0.001; if (bits_sum < 0.001)
if(cplx_sum < 0.001) cplx_sum= 0.001; bits_sum = 0.001;
if (cplx_sum < 0.001)
cplx_sum = 0.001;
} }
for (i = 0; i < s->mb_num; i++) { for (i = 0; i < s->mb_num; i++) {
@ -636,18 +717,19 @@ static void adaptive_quantization(MpegEncContext *s, double q){
intq = (int)(newq + 0.5); intq = (int)(newq + 0.5);
if (intq > qmax) intq= qmax; if (intq > qmax)
else if(intq < qmin) intq= qmin; intq = qmax;
else if (intq < qmin)
intq = qmin;
s->lambda_table[mb_xy] = intq; s->lambda_table[mb_xy] = intq;
} }
} }
void ff_get_2pass_fcode(MpegEncContext *s){ void ff_get_2pass_fcode(MpegEncContext *s)
{
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;
int picture_number= s->picture_number; RateControlEntry *rce = &rcc->entry[s->picture_number];
RateControlEntry *rce;
rce= &rcc->entry[picture_number];
s->f_code = rce->f_code; s->f_code = rce->f_code;
s->b_code = rce->b_code; s->b_code = rce->b_code;
} }
@ -675,7 +757,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
emms_c(); emms_c();
#if CONFIG_LIBXVID #if CONFIG_LIBXVID
if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) if ((s->flags & CODEC_FLAG_PASS2) &&
s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
return ff_xvid_rate_estimate_qscale(s, dry_run); return ff_xvid_rate_estimate_qscale(s, dry_run);
#endif #endif
@ -684,9 +767,13 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
fps = get_fps(s->avctx); fps = get_fps(s->avctx);
/* update predictors */ /* update predictors */
if (picture_number > 2 && !dry_run) { if (picture_number > 2 && !dry_run) {
const int last_var= s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum; const int last_var = s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum
: rcc->last_mc_mb_var_sum;
av_assert1(s->frame_bits >= s->stuffing_bits); av_assert1(s->frame_bits >= s->stuffing_bits);
update_predictor(&rcc->pred[s->last_pict_type], rcc->last_qscale, sqrt(last_var), s->frame_bits - s->stuffing_bits); update_predictor(&rcc->pred[s->last_pict_type],
rcc->last_qscale,
sqrt(last_var),
s->frame_bits - s->stuffing_bits);
} }
if (s->flags & CODEC_FLAG_PASS2) { if (s->flags & CODEC_FLAG_PASS2) {
@ -701,8 +788,9 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
Picture *dts_pic; Picture *dts_pic;
rce = &local_rce; rce = &local_rce;
//FIXME add a dts field to AVFrame and ensure its set and use it here instead of reordering /* FIXME add a dts field to AVFrame and ensure it is set and use it
//but the reordering is simpler for now until h.264 b pyramid must be handeld * here instead of reordering but the reordering is simpler for now
* until H.264 B-pyramid must be handled. */
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)
dts_pic = s->current_picture_ptr; dts_pic = s->current_picture_ptr;
else else
@ -716,7 +804,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
diff = s->total_bits - wanted_bits; diff = s->total_bits - wanted_bits;
br_compensation = (a->bit_rate_tolerance - diff) / a->bit_rate_tolerance; br_compensation = (a->bit_rate_tolerance - diff) / a->bit_rate_tolerance;
if(br_compensation<=0.0) br_compensation=0.001; if (br_compensation <= 0.0)
br_compensation = 0.001;
var = pict_type == AV_PICTURE_TYPE_I ? pic->mb_var_sum : pic->mc_mb_var_sum; var = pict_type == AV_PICTURE_TYPE_I ? pic->mb_var_sum : pic->mc_mb_var_sum;
@ -748,7 +837,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
rce->i_count = 0; // FIXME we do know this approx rce->i_count = 0; // FIXME we do know this approx
rce->i_tex_bits = 0; rce->i_tex_bits = 0;
rce->p_tex_bits = bits * 0.9; rce->p_tex_bits = bits * 0.9;
rce->mv_bits = bits * 0.1; rce->mv_bits = bits * 0.1;
} }
rcc->i_cplx_sum[pict_type] += rce->i_tex_bits * rce->qscale; rcc->i_cplx_sum[pict_type] += rce->i_tex_bits * rce->qscale;
@ -757,7 +845,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
rcc->frame_count[pict_type]++; rcc->frame_count[pict_type]++;
bits = rce->i_tex_bits + rce->p_tex_bits; bits = rce->i_tex_bits + rce->p_tex_bits;
rate_factor= rcc->pass1_wanted_bits/rcc->pass1_rc_eq_output_sum * br_compensation; rate_factor = rcc->pass1_wanted_bits /
rcc->pass1_rc_eq_output_sum * br_compensation;
q = get_qscale(s, rce, rate_factor, picture_number); q = get_qscale(s, rce, rate_factor, picture_number);
if (q < 0) if (q < 0)
@ -767,7 +856,8 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
q = get_diff_limited_q(s, rce, q); q = get_diff_limited_q(s, rce, q);
assert(q > 0.0); assert(q > 0.0);
if(pict_type==AV_PICTURE_TYPE_P || s->intra_only){ //FIXME type dependent blur like in 2-pass // FIXME type dependent blur like in 2-pass
if (pict_type == AV_PICTURE_TYPE_P || s->intra_only) {
rcc->short_term_qsum *= a->qblur; rcc->short_term_qsum *= a->qblur;
rcc->short_term_qcount *= a->qblur; rcc->short_term_qcount *= a->qblur;
@ -785,14 +875,21 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
} }
if (s->avctx->debug & FF_DEBUG_RC) { if (s->avctx->debug & FF_DEBUG_RC) {
av_log(s->avctx, AV_LOG_DEBUG, "%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f size:%d var:%d/%d br:%d fps:%d\n", av_log(s->avctx, AV_LOG_DEBUG,
av_get_picture_type_char(pict_type), qmin, q, qmax, picture_number, (int)wanted_bits/1000, (int)s->total_bits/1000, "%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f "
br_compensation, short_term_q, s->frame_bits, pic->mb_var_sum, pic->mc_mb_var_sum, s->bit_rate/1000, (int)fps "size:%d var:%d/%d br:%d fps:%d\n",
); av_get_picture_type_char(pict_type),
qmin, q, qmax, picture_number,
(int)wanted_bits / 1000, (int)s->total_bits / 1000,
br_compensation, short_term_q, s->frame_bits,
pic->mb_var_sum, pic->mc_mb_var_sum,
s->bit_rate / 1000, (int)fps);
} }
if (q<qmin) q=qmin; if (q < qmin)
else if(q>qmax) q=qmax; q = qmin;
else if (q > qmax)
q = qmax;
if (s->adaptive_quant) if (s->adaptive_quant)
adaptive_quantization(s, q); adaptive_quantization(s, q);
@ -816,13 +913,13 @@ static int init_pass2(MpegEncContext *s)
AVCodecContext *a = s->avctx; AVCodecContext *a = s->avctx;
int i, toobig; int i, toobig;
double fps = get_fps(s->avctx); double fps = get_fps(s->avctx);
double complexity[5]={0,0,0,0,0}; // approximate bits at quant=1 double complexity[5] = { 0 }; // approximate bits at quant=1
uint64_t const_bits[5]={0,0,0,0,0}; // quantizer independent bits uint64_t const_bits[5] = { 0 }; // quantizer independent bits
uint64_t all_const_bits; uint64_t all_const_bits;
uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps); uint64_t all_available_bits = (uint64_t)(s->bit_rate *
(double)rcc->num_entries / fps);
double rate_factor = 0; double rate_factor = 0;
double step; double step;
//int last_i_frame=-10000000;
const int filter_size = (int)(a->qblur * 4) | 1; const int filter_size = (int)(a->qblur * 4) | 1;
double expected_bits; double expected_bits;
double *qscale, *blurred_qscale, qscale_sum; double *qscale, *blurred_qscale, qscale_sum;
@ -837,10 +934,14 @@ static int init_pass2(MpegEncContext *s)
rcc->mv_bits_sum[rce->pict_type] += rce->mv_bits; rcc->mv_bits_sum[rce->pict_type] += rce->mv_bits;
rcc->frame_count[rce->pict_type]++; rcc->frame_count[rce->pict_type]++;
complexity[rce->new_pict_type]+= (rce->i_tex_bits+ rce->p_tex_bits)*(double)rce->qscale; complexity[rce->new_pict_type] += (rce->i_tex_bits + rce->p_tex_bits) *
(double)rce->qscale;
const_bits[rce->new_pict_type] += rce->mv_bits + rce->misc_bits; const_bits[rce->new_pict_type] += rce->mv_bits + rce->misc_bits;
} }
all_const_bits= const_bits[AV_PICTURE_TYPE_I] + const_bits[AV_PICTURE_TYPE_P] + const_bits[AV_PICTURE_TYPE_B];
all_const_bits = const_bits[AV_PICTURE_TYPE_I] +
const_bits[AV_PICTURE_TYPE_P] +
const_bits[AV_PICTURE_TYPE_B];
if (all_available_bits < all_const_bits) { if (all_available_bits < all_const_bits) {
av_log(s->avctx, AV_LOG_ERROR, "requested bitrate is too low\n"); av_log(s->avctx, AV_LOG_ERROR, "requested bitrate is too low\n");
@ -860,6 +961,7 @@ static int init_pass2(MpegEncContext *s)
/* find qscale */ /* find qscale */
for (i = 0; i < rcc->num_entries; i++) { for (i = 0; i < rcc->num_entries; i++) {
RateControlEntry *rce = &rcc->entry[i]; RateControlEntry *rce = &rcc->entry[i];
qscale[i] = get_qscale(s, &rcc->entry[i], rate_factor, i); qscale[i] = get_qscale(s, &rcc->entry[i], rate_factor, i);
rcc->last_qscale_for[rce->pict_type] = qscale[i]; rcc->last_qscale_for[rce->pict_type] = qscale[i];
} }
@ -890,8 +992,10 @@ static int init_pass2(MpegEncContext *s)
double d = index - i; double d = index - i;
double coeff = a->qblur == 0 ? 1.0 : exp(-d * d / (a->qblur * a->qblur)); double coeff = a->qblur == 0 ? 1.0 : exp(-d * d / (a->qblur * a->qblur));
if(index < 0 || index >= rcc->num_entries) continue; if (index < 0 || index >= rcc->num_entries)
if(pict_type != rcc->entry[index].new_pict_type) continue; continue;
if (pict_type != rcc->entry[index].new_pict_type)
continue;
q += qscale[index] * coeff; q += qscale[index] * coeff;
sum += coeff; sum += coeff;
} }
@ -902,7 +1006,9 @@ static int init_pass2(MpegEncContext *s)
for (i = 0; i < rcc->num_entries; i++) { for (i = 0; i < rcc->num_entries; i++) {
RateControlEntry *rce = &rcc->entry[i]; RateControlEntry *rce = &rcc->entry[i];
double bits; double bits;
rce->new_qscale = modify_qscale(s, rce, blurred_qscale[i], i); rce->new_qscale = modify_qscale(s, rce, blurred_qscale[i], i);
bits = qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits; bits = qp2bits(rce, rce->new_qscale) + rce->mv_bits + rce->misc_bits;
bits += 8 * ff_vbv_update(s, bits); bits += 8 * ff_vbv_update(s, bits);
@ -928,7 +1034,8 @@ static int init_pass2(MpegEncContext *s)
i, i,
rcc->entry[i].new_qscale, rcc->entry[i].new_qscale,
rcc->entry[i].new_qscale / FF_QP2LAMBDA); rcc->entry[i].new_qscale / FF_QP2LAMBDA);
qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA, s->avctx->qmin, s->avctx->qmax); qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA,
s->avctx->qmin, s->avctx->qmax);
} }
assert(toobig <= 40); assert(toobig <= 40);
av_log(s->avctx, AV_LOG_DEBUG, av_log(s->avctx, AV_LOG_DEBUG,

2
libavformat/rtpdec.c
View File

@ -482,7 +482,7 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
s->ic = s1; s->ic = s1;
s->st = st; s->st = st;
s->queue_size = queue_size; s->queue_size = queue_size;
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? rtp_init_statistics(&s->statistics, 0);
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
s->ts = ff_mpegts_parse_open(s->ic); s->ts = ff_mpegts_parse_open(s->ic);
if (s->ts == NULL) { if (s->ts == NULL) {