History

avcodec/mpegvideo, ratecontrol: Remove write-only skip_count

Write-only since 6cf0cb8935f515a7b5f79d2e3cf02bd0764943bf.

Andreas Rheinhardt committed 2 years ago

Commit 685cda21 parent 68a06649 files · +9 −18Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t