Write-only since 6cf0cb8935f515a7b5f79d2e3cf02bd0764943bf.
Showing the changes to libavcodec (9 of 9 files). Show all
Unified · Split
| @@ -253,7 +253,6 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], · 252 unmodified lines | ||
| 253 | 253 | |
| 254 | 254 | if ((cbp | mvd) == 0) { |
| 255 | 255 | /* skip macroblock */ |
| 256 | − s->skip_count++; | |
| 257 | 256 | s->mb_skip_run++; |
| 258 | 257 | s->last_mv[0][0][0] = 0; |
| 259 | 258 | s->last_mv[0][0][1] = 0; |
| @@ -512,7 +512,6 @@ void ff_h263_encode_mb(MpegEncContext * s, · 511 unmodified lines | ||
| 512 | 512 | s->misc_bits++; |
| 513 | 513 | s->last_bits++; |
| 514 | 514 | } |
| 515 | − s->skip_count++; | |
| 516 | 515 | |
| 517 | 516 | return; |
| 518 | 517 | } |
| @@ -824,7 +824,6 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, · 823 unmodified lines | ||
| 824 | 824 | (s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) { |
| 825 | 825 | s->mb_skip_run++; |
| 826 | 826 | s->qscale -= s->dquant; |
| 827 | − s->skip_count++; | |
| 828 | 827 | s->misc_bits++; |
| 829 | 828 | s->last_bits++; |
| 830 | 829 | if (s->pict_type == AV_PICTURE_TYPE_P) { |
| @@ -512,7 +512,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], · 511 unmodified lines | ||
| 512 | 512 | |
| 513 | 513 | /* nothing to do if this MB was skipped in the next P-frame */ |
| 514 | 514 | if (s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]) { // FIXME avoid DCT & ... |
| 515 | − s->skip_count++; | |
| 516 | 515 | s->mv[0][0][0] = |
| 517 | 516 | s->mv[0][0][1] = |
| 518 | 517 | s->mv[1][0][0] = |
| @@ -536,7 +535,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], · 17 unmodified lines | ||
| 536 | 535 | s->misc_bits++; |
| 537 | 536 | s->last_bits++; |
| 538 | 537 | } |
| 539 | − s->skip_count++; | |
| 540 | 538 | return; |
| 541 | 539 | } |
| 542 | 540 | |
| @@ -691,7 +689,6 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], · 148 unmodified lines | ||
| 691 | 689 | s->misc_bits++; |
| 692 | 690 | s->last_bits++; |
| 693 | 691 | } |
| 694 | − s->skip_count++; | |
| 695 | 692 | |
| 696 | 693 | return; |
| 697 | 694 | } |
| @@ -345,7 +345,6 @@ typedef struct MpegEncContext { · 344 unmodified lines | ||
| 345 | 345 | int i_tex_bits; |
| 346 | 346 | int p_tex_bits; |
| 347 | 347 | int i_count; |
| 348 | − int skip_count; | |
| 349 | 348 | int misc_bits; ///< cbp, mb_type |
| 350 | 349 | int last_bits; ///< temp var used for calculating the above vars |
| 351 | 350 | |
| @@ -2532,7 +2532,6 @@ static inline void copy_context_before_encode(MpegEncContext *d, · 2531 unmodified lines | ||
| 2532 | 2532 | d->i_tex_bits= s->i_tex_bits; |
| 2533 | 2533 | d->p_tex_bits= s->p_tex_bits; |
| 2534 | 2534 | d->i_count= s->i_count; |
| 2535 | − d->skip_count= s->skip_count; | |
| 2536 | 2535 | d->misc_bits= s->misc_bits; |
| 2537 | 2536 | d->last_bits= 0; |
| 2538 | 2537 | |
| @@ -2561,7 +2560,6 @@ static inline void copy_context_after_encode(MpegEncContext *d, · 22 unmodified lines | ||
| 2561 | 2560 | d->i_tex_bits= s->i_tex_bits; |
| 2562 | 2561 | d->p_tex_bits= s->p_tex_bits; |
| 2563 | 2562 | d->i_count= s->i_count; |
| 2564 | − d->skip_count= s->skip_count; | |
| 2565 | 2563 | d->misc_bits= s->misc_bits; |
| 2566 | 2564 | |
| 2567 | 2565 | d->mb_intra= s->mb_intra; |
| @@ -2875,7 +2873,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 307 unmodified lines | ||
| 2875 | 2873 | s->i_tex_bits=0; |
| 2876 | 2874 | s->p_tex_bits=0; |
| 2877 | 2875 | s->i_count=0; |
| 2878 | − s->skip_count=0; | |
| 2879 | 2876 | |
| 2880 | 2877 | for(i=0; i<3; i++){ |
| 2881 | 2878 | /* init last dc values */ |
| @@ -3504,7 +3501,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) · 622 unmodified lines | ||
| 3504 | 3501 | MERGE(i_tex_bits); |
| 3505 | 3502 | MERGE(p_tex_bits); |
| 3506 | 3503 | MERGE(i_count); |
| 3507 | − MERGE(skip_count); | |
| 3508 | 3504 | MERGE(misc_bits); |
| 3509 | 3505 | MERGE(encoding_error[0]); |
| 3510 | 3506 | MERGE(encoding_error[1]); |
| @@ -405,7 +405,6 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s, · 404 unmodified lines | ||
| 405 | 405 | put_bits(&s->pb, 1, 1); |
| 406 | 406 | s->last_bits++; |
| 407 | 407 | s->misc_bits++; |
| 408 | − s->skip_count++; | |
| 409 | 408 | |
| 410 | 409 | return; |
| 411 | 410 | } |
| @@ -39,7 +39,7 @@ void ff_write_pass1_stats(MpegEncContext *s) · 38 unmodified lines | ||
| 39 | 39 | { |
| 40 | 40 | snprintf(s->avctx->stats_out, 256, |
| 41 | 41 | "in:%d out:%d type:%d q:%d itex:%d ptex:%d mv:%d misc:%d " |
| 42 | − "fcode:%d bcode:%d mc-var:%"PRId64" var:%"PRId64" icount:%d skipcount:%d hbits:%d;\n", | |
| 42 | + "fcode:%d bcode:%d mc-var:%"PRId64" var:%"PRId64" icount:%d hbits:%d;\n", | |
| 43 | 43 | s->current_picture_ptr->display_picture_number, |
| 44 | 44 | s->current_picture_ptr->coded_picture_number, |
| 45 | 45 | s->pict_type, |
| @@ -52,7 +52,7 @@ void ff_write_pass1_stats(MpegEncContext *s) · 6 unmodified lines | ||
| 52 | 52 | s->b_code, |
| 53 | 53 | s->mc_mb_var_sum, |
| 54 | 54 | s->mb_var_sum, |
| 55 | − s->i_count, s->skip_count, | |
| 55 | + s->i_count, | |
| 56 | 56 | s->header_bits); |
| 57 | 57 | } |
| 58 | 58 | |
| @@ -606,13 +606,17 @@ av_cold int ff_rate_control_init(MpegEncContext *s) · 547 unmodified lines | ||
| 606 | 606 | av_assert0(picture_number < rcc->num_entries); |
| 607 | 607 | rce = &rcc->entry[picture_number]; |
| 608 | 608 | |
| 609 | − 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", | |
| 609 | + e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d " | |
| 610 | + "mv:%d misc:%d " | |
| 611 | + "fcode:%d bcode:%d " | |
| 612 | + "mc-var:%"SCNd64" var:%"SCNd64" " | |
| 613 | + "icount:%d hbits:%d", | |
| 610 | 614 | &rce->pict_type, &rce->qscale, &rce->i_tex_bits, &rce->p_tex_bits, |
| 611 | 615 | &rce->mv_bits, &rce->misc_bits, |
| 612 | 616 | &rce->f_code, &rce->b_code, |
| 613 | 617 | &rce->mc_mb_var_sum, &rce->mb_var_sum, |
| 614 | − &rce->i_count, &rce->skip_count, &rce->header_bits); | |
| 615 | − if (e != 14) { | |
| 618 | + &rce->i_count, &rce->header_bits); | |
| 619 | + if (e != 13) { | |
| 616 | 620 | av_log(s->avctx, AV_LOG_ERROR, |
| 617 | 621 | "statistics are damaged at line %d, parser out=%d\n", |
| 618 | 622 | i, e); |
| @@ -50,7 +50,6 @@ typedef struct RateControlEntry{ · 49 unmodified lines | ||
| 50 | 50 | int64_t mc_mb_var_sum; |
| 51 | 51 | int64_t mb_var_sum; |
| 52 | 52 | int i_count; |
| 53 | − int skip_count; | |
| 54 | 53 | int f_code; |
| 55 | 54 | int b_code; |
| 56 | 55 | }RateControlEntry; |