These are already mostly unused; not using them here is in preparation for removing them altogether. Use block_index[4..5] instead for addressing.
Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -492,22 +492,23 @@ void ff_clean_intra_table_entries(MpegEncContext *s) · 491 unmodified lines | |||
| 492 | { | 492 | { |
| 493 | int wrap = s->b8_stride; | 493 | int wrap = s->b8_stride; |
| 494 | int xy = s->block_index[0]; | 494 | int xy = s->block_index[0]; |
| 495 | /* chroma */ | ||
| 496 | unsigned uxy = s->block_index[4]; | ||
| 497 | unsigned vxy = s->block_index[5]; | ||
| 498 | int16_t *dc_val = s->dc_val[0]; | ||
| 495 | 499 | ||
| 496 | s->dc_val[0][xy ] = | 500 | s->dc_val[0][xy ] = |
| 497 | s->dc_val[0][xy + 1 ] = | 501 | s->dc_val[0][xy + 1 ] = |
| 498 | s->dc_val[0][xy + wrap] = | 502 | s->dc_val[0][xy + wrap] = |
| 499 | s->dc_val[0][xy + 1 + wrap] = 1024; | 503 | s->dc_val[0][xy + 1 + wrap] = 1024; |
| 504 | dc_val[uxy] = | ||
| 505 | dc_val[vxy] = 1024; | ||
| 500 | /* ac pred */ | 506 | /* ac pred */ |
| 501 | memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); | 507 | memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
| 502 | memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | 508 | memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); |
| 503 | /* chroma */ | ||
| 504 | wrap = s->mb_stride; | ||
| 505 | xy = s->mb_x + s->mb_y * wrap; | ||
| 506 | s->dc_val[1][xy] = | ||
| 507 | s->dc_val[2][xy] = 1024; | ||
| 508 | /* ac pred */ | 509 | /* ac pred */ |
| 509 | memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); | 510 | memset(s->ac_val[0][uxy], 0, 16 * sizeof(int16_t)); |
| 510 | memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | 511 | memset(s->ac_val[0][vxy], 0, 16 * sizeof(int16_t)); |
| 511 | } | 512 | } |
| 512 | 513 | ||
| 513 | void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename | 514 | void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |