Mercurial > libavcodec.hg
changeset 266:252444e5259b libavcodec
optimization
| author | michaelni |
|---|---|
| date | Fri, 15 Mar 2002 14:57:17 +0000 |
| parents | 4e9e728021d8 |
| children | e10840e4f773 |
| files | h263.c h263dec.c mpegvideo.c mpegvideo.h |
| diffstat | 4 files changed, 63 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Fri Mar 15 04:10:53 2002 +0000 +++ b/h263.c Fri Mar 15 14:57:17 2002 +0000 @@ -208,24 +208,12 @@ int i, n; for(n=0; n<6; n++){ - int x, y, wrap; INT16 *ac_val, *ac_val1; - if (n < 4) { - x = 2 * s->mb_x + 1 + (n & 1); - y = 2 * s->mb_y + 1 + (n >> 1); - wrap = s->mb_width * 2 + 2; - ac_val = s->ac_val[0][0]; - } else { - x = s->mb_x + 1; - y = s->mb_y + 1; - wrap = s->mb_width + 2; - ac_val = s->ac_val[n - 4 + 1][0]; - } - ac_val += ((y) * wrap + (x)) * 16; + ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val1= ac_val; if(dir[n]){ - ac_val-= wrap*16; + ac_val-= s->block_wrap[n]*16; for(i=1; i<8; i++){ const int level= block[n][block_permute_op(i )]; score0+= ABS(level); @@ -357,21 +345,9 @@ if(s->ac_pred){ for(i=0; i<6; i++){ int j; - int x, y, wrap; INT16 *ac_val; - if (i < 4) { - x = 2 * s->mb_x + 1 + (i & 1); - y = 2 * s->mb_y + 1 + (i >> 1); - wrap = s->mb_width * 2 + 2; - ac_val = s->ac_val[0][0]; - } else { - x = s->mb_x + 1; - y = s->mb_y + 1; - wrap = s->mb_width + 2; - ac_val = s->ac_val[i - 4 + 1][0]; - } - ac_val += ((y) * wrap + (x)) * 16; + ac_val = s->ac_val[0][0] + s->block_index[i] * 16; if(dir[i]){ for(j=1; j<8; j++) @@ -569,19 +545,17 @@ INT16 *h263_pred_motion(MpegEncContext * s, int block, int *px, int *py) { - int xy, y, wrap; + int xy, wrap; INT16 *A, *B, *C, *mot_val; static const int off[4]= {2, 1, 1, -1}; - wrap = 2 * s->mb_width + 2; - y = xy = 2 * s->mb_y + 1 + (block >> 1); // y - xy *= wrap; // y * wrap - xy += 2 * s->mb_x + 1 + (block & 1); // x + y * wrap + wrap = s->block_wrap[0]; + xy = s->block_index[block]; mot_val = s->motion_val[xy]; /* special case for first line */ - if (y == 1 || s->first_slice_line || s->first_gob_line) { + if (s->mb_y == 0 || s->first_slice_line || s->first_gob_line) { A = s->motion_val[xy - 1]; *px = A[0]; *py = A[1]; @@ -890,33 +864,25 @@ static inline int mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr) { - int a, b, c, xy, wrap, pred, scale; + int a, b, c, wrap, pred, scale; UINT16 *dc_val; int dummy; /* find prediction */ if (n < 4) { - wrap = s->mb_width * 2 + 2; - xy = 2 * s->mb_y + 1 + (n >> 1); - xy *= wrap; - xy += 2 * s->mb_x + 1 + (n & 1); - dc_val = s->dc_val[0]; scale = s->y_dc_scale; } else { - wrap = s->mb_width + 2; - xy = s->mb_y + 1; - xy *= wrap; - xy += s->mb_x + 1; - dc_val = s->dc_val[n - 4 + 1]; scale = s->c_dc_scale; } + wrap= s->block_wrap[n]; + dc_val = s->dc_val[0] + s->block_index[n]; /* B C * A X */ - a = dc_val[xy - 1]; - b = dc_val[xy - 1 - wrap]; - c = dc_val[xy - wrap]; + a = dc_val[ - 1]; + b = dc_val[ - 1 - wrap]; + c = dc_val[ - wrap]; if (abs(a - b) < abs(b - c)) { pred = c; @@ -938,7 +904,7 @@ #endif /* prepare address for prediction update */ - *dc_val_ptr = &dc_val[xy]; + *dc_val_ptr = &dc_val[0]; return pred; } @@ -946,22 +912,11 @@ void mpeg4_pred_ac(MpegEncContext * s, INT16 *block, int n, int dir) { - int x, y, wrap, i; + int i; INT16 *ac_val, *ac_val1; /* find prediction */ - if (n < 4) { - x = 2 * s->mb_x + 1 + (n & 1); - y = 2 * s->mb_y + 1 + (n >> 1); - wrap = s->mb_width * 2 + 2; - ac_val = s->ac_val[0][0]; - } else { - x = s->mb_x + 1; - y = s->mb_y + 1; - wrap = s->mb_width + 2; - ac_val = s->ac_val[n - 4 + 1][0]; - } - ac_val += ((y) * wrap + (x)) * 16; + ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val1 = ac_val; if (s->ac_pred) { if (dir == 0) { @@ -972,7 +927,7 @@ } } else { /* top prediction */ - ac_val -= 16 * wrap; + ac_val -= 16 * s->block_wrap[n]; for(i=1;i<8;i++) { block[block_permute_op(i)] += ac_val[i + 8]; } @@ -989,22 +944,11 @@ static void mpeg4_inv_pred_ac(MpegEncContext * s, INT16 *block, int n, int dir) { - int x, y, wrap, i; + int i; INT16 *ac_val; /* find prediction */ - if (n < 4) { - x = 2 * s->mb_x + 1 + (n & 1); - y = 2 * s->mb_y + 1 + (n >> 1); - wrap = s->mb_width * 2 + 2; - ac_val = s->ac_val[0][0]; - } else { - x = s->mb_x + 1; - y = s->mb_y + 1; - wrap = s->mb_width + 2; - ac_val = s->ac_val[n - 4 + 1][0]; - } - ac_val += ((y) * wrap + (x)) * 16; + ac_val = s->ac_val[0][0] + s->block_index[n] * 16; if (dir == 0) { /* left prediction */ @@ -1014,7 +958,7 @@ } } else { /* top prediction */ - ac_val -= 16 * wrap; + ac_val -= 16 * s->block_wrap[n]; for(i=1;i<8;i++) { block[block_permute_op(i)] -= ac_val[i + 8]; } @@ -1448,7 +1392,7 @@ my = h263_decode_motion(s, 0, 1); case 4: s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; - xy= (2*s->mb_width + 2)*(2*s->mb_y + 1) + 2*s->mb_x + 1; + xy= s->block_index[0]; time_pp= s->last_non_b_time[0] - s->last_non_b_time[1]; time_pb= s->time - s->last_non_b_time[1]; //if(time_pp>3000 )printf("%d %d ", time_pp, time_pb);
--- a/h263dec.c Fri Mar 15 04:10:53 2002 +0000 +++ b/h263dec.c Fri Mar 15 14:57:17 2002 +0000 @@ -140,6 +140,12 @@ #endif /* decode each macroblock */ + s->block_wrap[0]= + s->block_wrap[1]= + s->block_wrap[2]= + s->block_wrap[3]= s->mb_width*2 + 2; + s->block_wrap[4]= + s->block_wrap[5]= s->mb_width + 2; for(s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) { /* Check for GOB headers on H.263 */ /* FIXME: In the future H.263+ will have intra prediction */ @@ -147,7 +153,19 @@ if (s->mb_y && !s->h263_pred) { s->first_gob_line = h263_decode_gob_header(s); } + s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1; + s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1); + s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1; + s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2); + s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2); + s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2); for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { + s->block_index[0]+=2; + s->block_index[1]+=2; + s->block_index[2]+=2; + s->block_index[3]+=2; + s->block_index[4]++; + s->block_index[5]++; #ifdef DEBUG printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y); #endif
--- a/mpegvideo.c Fri Mar 15 04:10:53 2002 +0000 +++ b/mpegvideo.c Fri Mar 15 14:57:17 2002 +0000 @@ -1123,6 +1123,12 @@ s->avg_mb_var = s->avg_mb_var / s->mb_num; + s->block_wrap[0]= + s->block_wrap[1]= + s->block_wrap[2]= + s->block_wrap[3]= s->mb_width*2 + 2; + s->block_wrap[4]= + s->block_wrap[5]= s->mb_width + 2; for(mb_y=0; mb_y < s->mb_height; mb_y++) { /* Put GOB header based on RTP MTU */ /* TODO: Put all this stuff in a separate generic function */ @@ -1138,10 +1144,22 @@ } } + s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1; + s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1); + s->block_index[2]= s->block_wrap[0]*(mb_y*2 + 2) - 1; + s->block_index[3]= s->block_wrap[0]*(mb_y*2 + 2); + s->block_index[4]= s->block_wrap[4]*(mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2); + s->block_index[5]= s->block_wrap[4]*(mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2); for(mb_x=0; mb_x < s->mb_width; mb_x++) { s->mb_x = mb_x; s->mb_y = mb_y; + s->block_index[0]+=2; + s->block_index[1]+=2; + s->block_index[2]+=2; + s->block_index[3]+=2; + s->block_index[4]++; + s->block_index[5]++; #if 0 /* compute motion vector and macro block type (intra or non intra) */ motion_x = 0;
--- a/mpegvideo.h Fri Mar 15 04:10:53 2002 +0000 +++ b/mpegvideo.h Fri Mar 15 14:57:17 2002 +0000 @@ -72,10 +72,10 @@ UINT8 *aux_picture_base[3]; /* real start of the picture */ UINT8 *current_picture[3]; /* buffer to store the decompressed current picture */ int last_dc[3]; /* last DC values for MPEG1 */ - INT16 *dc_val[3]; /* used for mpeg4 DC prediction */ + INT16 *dc_val[3]; /* used for mpeg4 DC prediction, all 3 arrays must be continuous */ int y_dc_scale, c_dc_scale; UINT8 *coded_block; /* used for coded block pattern prediction */ - INT16 (*ac_val[3])[16]; /* used for for mpeg4 AC prediction */ + INT16 (*ac_val[3])[16]; /* used for for mpeg4 AC prediction, all 3 arrays must be continuous */ int ac_pred; int mb_skiped; /* MUST BE SET only during DECODING */ UINT8 *mbskip_table; /* used to avoid copy if macroblock @@ -123,7 +123,10 @@ int mb_intra; INT16 *mb_var; /* Table for MB variances */ char *mb_type; /* Table for MB type */ - + + int block_index[6]; + int block_wrap[6]; + /* matrix transmitted in the bitstream */ UINT16 intra_matrix[64]; UINT16 chroma_intra_matrix[64];