@@ -253,7 +253,6 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
if ((cbp | mvd) == 0) {
/* skip macroblock */
- s->skip_count++;
s->mb_skip_run++;
s->last_mv[0][0][0] = 0;
s->last_mv[0][0][1] = 0;
@@ -512,7 +512,6 @@ void ff_h263_encode_mb(MpegEncContext * s,
s->misc_bits++;
s->last_bits++;
}
- s->skip_count++;
return;
}
@@ -824,7 +824,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
s->mb_skip_run++;
s->qscale -= s->dquant;
- s->skip_count++;
s->misc_bits++;
s->last_bits++;
if (s->pict_type == AV_PICTURE_TYPE_P) {
@@ -512,7 +512,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
/* nothing to do if this MB was skipped in the next P-frame */
if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { // FIXME avoid DCT & ...
- s->skip_count++;
s->mv[0][0][0] =
s->mv[0][0][1] =
s->mv[1][0][0] =
@@ -536,7 +535,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
s->misc_bits++;
s->last_bits++;
}
- s->skip_count++;
return;
}
@@ -691,7 +689,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
s->misc_bits++;
s->last_bits++;
}
- s->skip_count++;
return;
}
@@ -345,7 +345,6 @@ typedef struct MpegEncContext {
int i_tex_bits;
int p_tex_bits;
int i_count;
- int skip_count;
int misc_bits; ///< cbp, mb_type
int last_bits; ///< temp var used for calculating the above vars
@@ -2532,7 +2532,6 @@ static inline void copy_context_before_encode(MpegEncContext *d,
d->i_tex_bits= s->i_tex_bits;
d->p_tex_bits= s->p_tex_bits;
d->i_count= s->i_count;
- d->skip_count= s->skip_count;
d->misc_bits= s->misc_bits;
d->last_bits= 0;
@@ -2561,7 +2560,6 @@ static inline void copy_context_after_encode(MpegEncContext *d,
d->i_tex_bits= s->i_tex_bits;
d->p_tex_bits= s->p_tex_bits;
d->i_count= s->i_count;
- d->skip_count= s->skip_count;
d->misc_bits= s->misc_bits;
d->mb_intra= s->mb_intra;
@@ -2875,7 +2873,6 @@ static int encode_thread(AVCodecContext *c, void *arg){
s->i_tex_bits=0;
s->p_tex_bits=0;
s->i_count=0;
- s->skip_count=0;
for(i=0; i<3; i++){
/* init last dc values */
@@ -3504,7 +3501,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src)
MERGE(i_tex_bits);
MERGE(p_tex_bits);
MERGE(i_count);
- MERGE(skip_count);
MERGE(misc_bits);
MERGE(encoding_error[0]);
MERGE(encoding_error[1]);
@@ -405,7 +405,6 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s,
put_bits(&s->pb, 1, 1);
s->last_bits++;
s->misc_bits++;
- s->skip_count++;
return;
}
@@ -39,7 +39,7 @@ 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:%"PRId64" var:%"PRId64" icount:%d skipcount:%d hbits:%d;\n",
+ "fcode:%d bcode:%d mc-var:%"PRId64" var:%"PRId64" icount:%d hbits:%d;\n",
s->current_picture_ptr->display_picture_number,
s->current_picture_ptr->coded_picture_number,
s->pict_type,
@@ -52,7 +52,7 @@ void ff_write_pass1_stats(MpegEncContext *s)
s->b_code,
s->mc_mb_var_sum,
s->mb_var_sum,
- s->i_count, s->skip_count,
+ s->i_count,
s->header_bits);
}
@@ -606,13 +606,17 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
av_assert0(picture_number < rcc->num_entries);
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:%"SCNd64" var:%"SCNd64" 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:%"SCNd64" var:%"SCNd64" "
+ "icount:%d hbits:%d",
&rce->pict_type, &rce->qscale, &rce->i_tex_bits, &rce->p_tex_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) {
+ &rce->i_count, &rce->header_bits);
+ if (e != 13) {
av_log(s->avctx, AV_LOG_ERROR,
"statistics are damaged at line %d, parser out=%d\n",
i, e);
@@ -50,7 +50,6 @@ typedef struct RateControlEntry{
int64_t mc_mb_var_sum;
int64_t mb_var_sum;
int i_count;
- int skip_count;
int f_code;
int b_code;
}RateControlEntry;
Write-only since 6cf0cb8935f515a7b5f79d2e3cf02bd0764943bf. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h261enc.c | 1 - libavcodec/ituh263enc.c | 1 - libavcodec/mpeg12enc.c | 1 - libavcodec/mpeg4videoenc.c | 3 --- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 4 ---- libavcodec/msmpeg4enc.c | 1 - libavcodec/ratecontrol.c | 14 +++++++++----- libavcodec/ratecontrol.h | 1 - 9 files changed, 9 insertions(+), 18 deletions(-)