History

avcodec/mpegvideo: Only keep MpegEncContext.dc_val[0]

The chroma dc_val pointers are mostly unused (accesses use dc_val[0] and block_index), so remove them.

Andreas Rheinhardt committed 1 year ago

Commit 81ab1101 parent c4fd33a11 files · +35 −39Browse files

Unified · Split

11 files
  1. libavcodec/ituh263dec.c +1 −1
  2. libavcodec/ituh263enc.c +1 −1
  3. libavcodec/mpeg4video.h +1 −2
  4. libavcodec/mpeg4videodec.c +2 −2
  5. libavcodec/mpeg4videoenc.c +1 −1
  6. libavcodec/mpeg_er.c +4 −4
  7. libavcodec/mpegvideo.c +2 −4
  8. libavcodec/mpegvideo.h +1 −1
  9. libavcodec/mpegvideo_enc.c +3 −3
  10. libavcodec/msmpeg4.c +1 −2
  11. libavcodec/vc1_block.c +18 −18
libavcodec/ituh263dec.c+1−1
@@ -450,7 +450,7 @@ static void h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) · 449 unmodified lines
450450 {
451451 int wrap, a, c, pred_dc, scale;
452452 const int xy = s->block_index[n];
453− int16_t *const dc_val = s->dc_val[0] + xy;
453+ int16_t *const dc_val = s->dc_val + xy;
454454 int16_t *const ac_val = (s->ac_val + xy)[0];
455455
456456 /* find prediction */
libavcodec/ituh263enc.c+1−1
@@ -596,7 +596,7 @@ static int h263_pred_dc(MPVEncContext *const s, int n, int16_t **dc_val_ptr) · 595 unmodified lines
596596 {
597597 const int wrap = s->c.block_wrap[n];
598598 const int xy = s->c.block_index[n];
599− int16_t *const dc_val = s->c.dc_val[0] + xy;
599+ int16_t *const dc_val = s->c.dc_val + xy;
600600 int pred_dc;
601601
602602 /* find prediction */
libavcodec/mpeg4video.h+1−2
@@ -45,12 +45,11 @@ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); · 44 unmodified lines
4545 static inline int ff_mpeg4_pred_dc(MpegEncContext *s, int n, int *dir_ptr)
4646 {
4747 int a, b, c, wrap, pred;
48− const int16_t *dc_val;
48+ const int16_t *const dc_val = s->dc_val + s->block_index[n];
4949
5050 /* find prediction */
5151
5252 wrap = s->block_wrap[n];
53− dc_val = s->dc_val[0] + s->block_index[n];
5453
5554 /* B C
5655 * A X
libavcodec/mpeg4videodec.c+2−2
@@ -920,7 +920,7 @@ static inline int mpeg4_get_level_dc(MpegEncContext *s, int n, int pred, int lev · 919 unmodified lines
920920 else if (!(s->workaround_bugs & FF_BUG_DC_CLIP))
921921 level = 2047;
922922 }
923− s->dc_val[0][s->block_index[n]] = level;
923+ s->dc_val[s->block_index[n]] = level;
924924
925925 return ret;
926926 }
@@ -1347,7 +1347,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block, · 420 unmodified lines
13471347 if (use_intra_dc_vlc) {
13481348 /* DC coef */
13491349 if (s->partitioned_frame) {
1350− level = s->dc_val[0][s->block_index[n]];
1350+ level = s->dc_val[s->block_index[n]];
13511351 if (n < 4)
13521352 level = FASTDIV((level + (s->y_dc_scale >> 1)), s->y_dc_scale);
13531353 else
libavcodec/mpeg4videoenc.c+1−1
@@ -742,7 +742,7 @@ static void mpeg4_encode_mb(MPVEncContext *const s, int16_t block[][64], · 741 unmodified lines
742742
743743 pred = FASTDIV((pred + (scale >> 1)), scale);
744744 dc_diff[i] = block[i][0] - pred;
745− s->c.dc_val[0][s->c.block_index[i]] = av_clip_uintp2(block[i][0] * scale, 11);
745+ s->c.dc_val[s->c.block_index[i]] = av_clip_uintp2(block[i][0] * scale, 11);
746746 }
747747
748748 if (s->c.avctx->flags & AV_CODEC_FLAG_AC_PRED) {
libavcodec/mpeg_er.c+4−4
@@ -100,7 +100,6 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 99 unmodified lines
100100 {
101101 ERContext *er = &s->er;
102102 int mb_array_size = s->mb_height * s->mb_stride;
103− int i;
104103
105104 er->avctx = s->avctx;
106105
@@ -111,6 +110,10 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 4 unmodified lines
111110 er->mb_stride = s->mb_stride;
112111 er->b8_stride = s->b8_stride;
113112
113+ er->dc_val[0] = s->dc_val;
114+ er->dc_val[1] = er->dc_val[0] + s->b8_stride * 2 * s->buffer_pools.alloc_mb_height + s->mb_stride;
115+ er->dc_val[2] = er->dc_val[1] + s->mb_stride * (s->buffer_pools.alloc_mb_height + 1);
116+
114117 er->er_temp_buffer = av_malloc(s->mb_height * s->mb_stride * (4*sizeof(int) + 1));
115118 er->error_status_table = av_mallocz(mb_array_size);
116119 if (!er->er_temp_buffer || !er->error_status_table)
@@ -119,9 +122,6 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 2 unmodified lines
119122 er->mbskip_table = s->mbskip_table;
120123 er->mbintra_table = s->mbintra_table;
121124
122− for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++)
123− er->dc_val[i] = s->dc_val[i];
124−
125125 er->decode_mb = mpeg_er_decode_mb;
126126 er->opaque = s;
127127
libavcodec/mpegvideo.c+2−4
@@ -351,9 +351,7 @@ av_cold int ff_mpv_init_context_frame(MpegEncContext *s) · 350 unmodified lines
351351 // that we don't need to reinitialize when e.g. h263_aic changes.
352352 if (!FF_ALLOC_TYPED_ARRAY(s->dc_val_base, yc_size))
353353 return AVERROR(ENOMEM);
354− s->dc_val[0] = s->dc_val_base + s->b8_stride + 1;
355− s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1;
356− s->dc_val[2] = s->dc_val[1] + c_size;
354+ s->dc_val = s->dc_val_base + s->b8_stride + 1;
357355 for (i = 0; i < yc_size; i++)
358356 s->dc_val_base[i] = 1024;
359357 }
@@ -486,7 +484,7 @@ void ff_clean_intra_table_entries(MpegEncContext *s) · 126 unmodified lines
486484 /* chroma */
487485 unsigned uxy = s->block_index[4];
488486 unsigned vxy = s->block_index[5];
489− int16_t *dc_val = s->dc_val[0];
487+ int16_t *dc_val = s->dc_val;
490488
491489 AV_WN32A(dc_val + xy, 1024 << 16 | 1024);
492490 AV_WN32 (dc_val + xy + wrap, 1024 << 16 | 1024);
libavcodec/mpegvideo.h+1−1
@@ -141,13 +141,13 @@ typedef struct MpegEncContext { · 140 unmodified lines
141141 int skipped_last_frame;
142142 int last_dc[3]; ///< last DC values for MPEG-1
143143 int16_t *dc_val_base;
144− int16_t *dc_val[3]; ///< used for MPEG-4 DC prediction, all 3 arrays must be continuous
145144 const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table
146145 const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table
147146 const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (H.263)
148147 uint8_t *coded_block_base;
149148 uint8_t *coded_block; ///< used for coded block pattern prediction (msmpeg4v3, wmv1)
150149 int16_t (*ac_val_base)[16];
150+ int16_t *dc_val; ///< used for H.263 AIC/MPEG-4 DC prediction and ER
151151 int16_t (*ac_val)[16]; ///< used for H.263 AIC, MPEG-4 AC prediction
152152 int mb_skipped; ///< MUST BE SET only during DECODING
153153 uint8_t *mbskip_table; /**< used to avoid copy if macroblock skipped (for black regions for example)
libavcodec/mpegvideo_enc.c+3−3
@@ -3316,7 +3316,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 3315 unmodified lines
33163316 int16_t ac[6][16];
33173317 const int mvdir = (best_s.c.mv_dir & MV_DIR_BACKWARD) ? 1 : 0;
33183318 static const int dquant_tab[4]={-1,1,-2,2};
3319− int storecoefs = s->c.mb_intra && s->c.dc_val[0];
3319+ int storecoefs = s->c.mb_intra && s->c.dc_val;
33203320
33213321 av_assert2(backup_s.dquant == 0);
33223322
@@ -3338,7 +3338,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 15 unmodified lines
33383338 backup_s.dquant= dquant;
33393339 if(storecoefs){
33403340 for(i=0; i<6; i++){
3341− dc[i] = s->c.dc_val[0][s->c.block_index[i]];
3341+ dc[i] = s->c.dc_val[s->c.block_index[i]];
33423342 memcpy(ac[i], s->c.ac_val[s->c.block_index[i]], sizeof(*s->c.ac_val));
33433343 }
33443344 }
@@ -3348,7 +3348,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 3 unmodified lines
33483348 if (best_s.c.qscale != qp) {
33493349 if(storecoefs){
33503350 for(i=0; i<6; i++){
3351− s->c.dc_val[0][s->c.block_index[i]] = dc[i];
3351+ s->c.dc_val[s->c.block_index[i]] = dc[i];
33523352 memcpy(s->c.ac_val[s->c.block_index[i]], ac[i], sizeof(*s->c.ac_val));
33533353 }
33543354 }
libavcodec/msmpeg4.c+1−2
@@ -197,7 +197,7 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, · 196 unmodified lines
197197 int16_t **dc_val_ptr, int *dir_ptr)
198198 {
199199 int a, b, c, wrap, pred, scale;
200− int16_t *dc_val;
200+ int16_t *const dc_val = s->dc_val + s->block_index[n];
201201
202202 /* find prediction */
203203 if (n < 4) {
@@ -207,7 +207,6 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, · 3 unmodified lines
207207 }
208208
209209 wrap = s->block_wrap[n];
210− dc_val= s->dc_val[0] + s->block_index[n];
211210
212211 /* B C
213212 * A X
libavcodec/vc1_block.c+18−18
@@ -357,7 +357,7 @@ static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 356 unmodified lines
357357 scale = s->y_dc_scale;
358358
359359 wrap = s->block_wrap[n];
360− dc_val = s->dc_val[0] + s->block_index[n];
360+ dc_val = s->dc_val + s->block_index[n];
361361
362362 /* B A
363363 * C X
@@ -422,7 +422,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 58 unmodified lines
422422 return 0;
423423
424424 wrap = s->block_wrap[n];
425− dc_val = s->dc_val[0] + s->block_index[n];
425+ dc_val = s->dc_val + s->block_index[n];
426426
427427 /* B A
428428 * C X
@@ -1314,7 +1314,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 885 unmodified lines
13141314 if (!s->mb_intra) ff_vc1_mc_1mv(v, 0);
13151315 dst_idx = 0;
13161316 for (i = 0; i < 6; i++) {
1317− s->dc_val[0][s->block_index[i]] = 0;
1317+ s->dc_val[s->block_index[i]] = 0;
13181318 dst_idx += i >> 2;
13191319 val = ((cbp >> (5 - i)) & 1);
13201320 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
@@ -1355,7 +1355,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 34 unmodified lines
13551355 s->mb_intra = 0;
13561356 for (i = 0; i < 6; i++) {
13571357 v->mb_type[0][s->block_index[i]] = 0;
1358− s->dc_val[0][s->block_index[i]] = 0;
1358+ s->dc_val[s->block_index[i]] = 0;
13591359 }
13601360 s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP;
13611361 s->cur_pic.qscale_table[mb_pos] = 0;
@@ -1370,7 +1370,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 8 unmodified lines
13701370 cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc, VC1_CBPCY_P_VLC_BITS, 2);
13711371 for (i = 0; i < 6; i++) {
13721372 val = ((cbp >> (5 - i)) & 1);
1373− s->dc_val[0][s->block_index[i]] = 0;
1373+ s->dc_val[s->block_index[i]] = 0;
13741374 s->mb_intra = 0;
13751375 if (i < 4) {
13761376 dmv_x = dmv_y = 0;
@@ -1463,7 +1463,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 86 unmodified lines
14631463 s->cur_pic.qscale_table[mb_pos] = 0;
14641464 for (i = 0; i < 6; i++) {
14651465 v->mb_type[0][s->block_index[i]] = 0;
1466− s->dc_val[0][s->block_index[i]] = 0;
1466+ s->dc_val[s->block_index[i]] = 0;
14671467 }
14681468 for (i = 0; i < 4; i++) {
14691469 ff_vc1_pred_mv(v, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0], 0, 0);
@@ -1570,7 +1570,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 100 unmodified lines
15701570 for (i = 0; i < 6; i++) {
15711571 v->a_avail = v->c_avail = 0;
15721572 v->mb_type[0][s->block_index[i]] = 1;
1573− s->dc_val[0][s->block_index[i]] = 0;
1573+ s->dc_val[s->block_index[i]] = 0;
15741574 dst_idx += i >> 2;
15751575 val = ((cbp >> (5 - i)) & 1);
15761576 if (i == 2 || i == 3 || !s->first_slice_line)
@@ -1648,7 +1648,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 71 unmodified lines
16481648 if (!v->ttmbf && cbp)
16491649 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index], VC1_TTMB_VLC_BITS, 2);
16501650 for (i = 0; i < 6; i++) {
1651− s->dc_val[0][s->block_index[i]] = 0;
1651+ s->dc_val[s->block_index[i]] = 0;
16521652 dst_idx += i >> 2;
16531653 val = ((cbp >> (5 - i)) & 1);
16541654 if (!fieldtx)
@@ -1673,7 +1673,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 18 unmodified lines
16731673 s->mb_intra = v->is_intra[s->mb_x] = 0;
16741674 for (i = 0; i < 6; i++) {
16751675 v->mb_type[0][s->block_index[i]] = 0;
1676− s->dc_val[0][s->block_index[i]] = 0;
1676+ s->dc_val[s->block_index[i]] = 0;
16771677 }
16781678 s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP;
16791679 s->cur_pic.qscale_table[mb_pos] = 0;
@@ -1736,7 +1736,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) · 56 unmodified lines
17361736 for (i = 0; i < 6; i++) {
17371737 v->a_avail = v->c_avail = 0;
17381738 v->mb_type[0][s->block_index[i]] = 1;
1739− s->dc_val[0][s->block_index[i]] = 0;
1739+ s->dc_val[s->block_index[i]] = 0;
17401740 dst_idx += i >> 2;
17411741 val = ((cbp >> (5 - i)) & 1);
17421742 if (i == 2 || i == 3 || !s->first_slice_line)
@@ -1789,7 +1789,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) · 46 unmodified lines
17891789 }
17901790 dst_idx = 0;
17911791 for (i = 0; i < 6; i++) {
1792− s->dc_val[0][s->block_index[i]] = 0;
1792+ s->dc_val[s->block_index[i]] = 0;
17931793 dst_idx += i >> 2;
17941794 val = ((cbp >> (5 - i)) & 1);
17951795 off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize;
@@ -1854,7 +1854,7 @@ static int vc1_decode_b_mb(VC1Context *v) · 58 unmodified lines
18541854 dmv_x[0] = dmv_x[1] = dmv_y[0] = dmv_y[1] = 0;
18551855 for (i = 0; i < 6; i++) {
18561856 v->mb_type[0][s->block_index[i]] = 0;
1857− s->dc_val[0][s->block_index[i]] = 0;
1857+ s->dc_val[s->block_index[i]] = 0;
18581858 }
18591859 s->cur_pic.qscale_table[mb_pos] = 0;
18601860
@@ -1937,7 +1937,7 @@ static int vc1_decode_b_mb(VC1Context *v) · 76 unmodified lines
19371937 }
19381938 dst_idx = 0;
19391939 for (i = 0; i < 6; i++) {
1940− s->dc_val[0][s->block_index[i]] = 0;
1940+ s->dc_val[s->block_index[i]] = 0;
19411941 dst_idx += i >> 2;
19421942 val = ((cbp >> (5 - i)) & 1);
19431943 off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
@@ -2023,7 +2023,7 @@ static int vc1_decode_b_mb_intfi(VC1Context *v) · 79 unmodified lines
20232023 for (i = 0; i < 6; i++) {
20242024 v->a_avail = v->c_avail = 0;
20252025 v->mb_type[0][s->block_index[i]] = 1;
2026− s->dc_val[0][s->block_index[i]] = 0;
2026+ s->dc_val[s->block_index[i]] = 0;
20272027 dst_idx += i >> 2;
20282028 val = ((cbp >> (5 - i)) & 1);
20292029 if (i == 2 || i == 3 || !s->first_slice_line)
@@ -2124,7 +2124,7 @@ static int vc1_decode_b_mb_intfi(VC1Context *v) · 94 unmodified lines
21242124 }
21252125 dst_idx = 0;
21262126 for (i = 0; i < 6; i++) {
2127− s->dc_val[0][s->block_index[i]] = 0;
2127+ s->dc_val[s->block_index[i]] = 0;
21282128 dst_idx += i >> 2;
21292129 val = ((cbp >> (5 - i)) & 1);
21302130 off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize;
@@ -2219,7 +2219,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 88 unmodified lines
22192219 for (i = 0; i < 6; i++) {
22202220 v->a_avail = v->c_avail = 0;
22212221 v->mb_type[0][s->block_index[i]] = 1;
2222− s->dc_val[0][s->block_index[i]] = 0;
2222+ s->dc_val[s->block_index[i]] = 0;
22232223 dst_idx += i >> 2;
22242224 val = ((cbp >> (5 - i)) & 1);
22252225 if (i == 2 || i == 3 || !s->first_slice_line)
@@ -2422,7 +2422,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 196 unmodified lines
24222422 if (!v->ttmbf && cbp)
24232423 ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index], VC1_TTMB_VLC_BITS, 2);
24242424 for (i = 0; i < 6; i++) {
2425− s->dc_val[0][s->block_index[i]] = 0;
2425+ s->dc_val[s->block_index[i]] = 0;
24262426 dst_idx += i >> 2;
24272427 val = ((cbp >> (5 - i)) & 1);
24282428 if (!fieldtx)
@@ -2447,7 +2447,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 18 unmodified lines
24472447 dir = 0;
24482448 for (i = 0; i < 6; i++) {
24492449 v->mb_type[0][s->block_index[i]] = 0;
2450− s->dc_val[0][s->block_index[i]] = 0;
2450+ s->dc_val[s->block_index[i]] = 0;
24512451 }
24522452 s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP;
24532453 s->cur_pic.qscale_table[mb_pos] = 0;

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