--- mbtransquant.c 2002/03/28 20:57:25 1.3 +++ mbtransquant.c 2002/03/29 00:38:29 1.4 @@ -42,6 +42,8 @@ * * * Revision history: * * * + * 29.03.2002 interlacing speedup - used transfer strides instead of + * manual field-to-frame conversion * 26.03.2002 interlacing support - moved transfers outside loops * 22.12.2001 get_dc_scaler() moved to common.h * 19.11.2001 introduced coefficient thresholding (Isibaar) * @@ -80,22 +82,24 @@ { - const uint32_t stride = pParam->edged_width; + uint32_t stride = pParam->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; uint32_t i; uint32_t iQuant = pParam->quant; uint8_t *pY_Cur, *pU_Cur, *pV_Cur; pY_Cur = pCurrent->y + (y_pos << 4) * stride + (x_pos << 4); - pU_Cur = pCurrent->u + (y_pos << 3) * (stride >> 1) + (x_pos << 3); - pV_Cur = pCurrent->v + (y_pos << 3) * (stride >> 1) + (x_pos << 3); + pU_Cur = pCurrent->u + (y_pos << 3) * stride2 + (x_pos << 3); + pV_Cur = pCurrent->v + (y_pos << 3) * stride2 + (x_pos << 3); start_timer(); - transfer_8to16copy(&data[0*64], pY_Cur, stride); - transfer_8to16copy(&data[1*64], pY_Cur + 8, stride); - transfer_8to16copy(&data[2*64], pY_Cur + 8 * stride, stride); - transfer_8to16copy(&data[3*64], pY_Cur + 8 * stride + 8, stride); - transfer_8to16copy(&data[4*64], pU_Cur, stride / 2); - transfer_8to16copy(&data[5*64], pV_Cur, stride / 2); + transfer_8to16copy(&data[0*64], pY_Cur, stride); + transfer_8to16copy(&data[1*64], pY_Cur + 8, stride); + transfer_8to16copy(&data[2*64], pY_Cur + next_block, stride); + transfer_8to16copy(&data[3*64], pY_Cur + next_block + 8,stride); + transfer_8to16copy(&data[4*64], pU_Cur, stride2); + transfer_8to16copy(&data[5*64], pV_Cur, stride2); stop_transfer_timer(); start_timer(); @@ -140,20 +144,19 @@ stop_idct_timer(); } - start_timer(); if (pMB->field_dct) { - MBFieldToFrame(data); + next_block = stride; + stride *= 2; } - stop_interlacing_timer(); start_timer(); transfer_16to8copy(pY_Cur, &data[0*64], stride); transfer_16to8copy(pY_Cur + 8, &data[1*64], stride); - transfer_16to8copy(pY_Cur + 8 * stride, &data[2*64], stride); - transfer_16to8copy(pY_Cur + 8 + 8 * stride, &data[3*64], stride); - transfer_16to8copy(pU_Cur, &data[4*64], stride / 2); - transfer_16to8copy(pV_Cur, &data[5*64], stride / 2); + transfer_16to8copy(pY_Cur + next_block, &data[2*64], stride); + transfer_16to8copy(pY_Cur + next_block + 8, &data[3*64], stride); + transfer_16to8copy(pU_Cur, &data[4*64], stride2); + transfer_16to8copy(pV_Cur, &data[5*64], stride2); stop_transfer_timer(); } @@ -168,7 +171,9 @@ { - const uint32_t stride = pParam->edged_width; + uint32_t stride = pParam->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; uint32_t i; uint32_t iQuant = pParam->quant; uint8_t *pY_Cur, *pU_Cur, *pV_Cur; @@ -176,8 +181,8 @@ uint32_t sum; pY_Cur = pCurrent->y + (y_pos << 4) * stride + (x_pos << 4); - pU_Cur = pCurrent->u + (y_pos << 3) * (stride >> 1) + (x_pos << 3); - pV_Cur = pCurrent->v + (y_pos << 3) * (stride >> 1) + (x_pos << 3); + pU_Cur = pCurrent->u + (y_pos << 3) * stride2 + (x_pos << 3); + pV_Cur = pCurrent->v + (y_pos << 3) * stride2 + (x_pos << 3); start_timer(); pMB->field_dct = 0; @@ -233,12 +238,11 @@ } } - start_timer(); if (pMB->field_dct) { - MBFieldToFrame(data); + next_block = stride; + stride *= 2; } - stop_interlacing_timer(); start_timer(); if (cbp & 32) @@ -246,13 +250,13 @@ if (cbp & 16) transfer_16to8add(pY_Cur + 8, &data[1*64], stride); if (cbp & 8) - transfer_16to8add(pY_Cur + 8 * stride, &data[2*64], stride); + transfer_16to8add(pY_Cur + next_block, &data[2*64], stride); if (cbp & 4) - transfer_16to8add(pY_Cur + 8 + 8 * stride, &data[3*64], stride); + transfer_16to8add(pY_Cur + next_block + 8, &data[3*64], stride); if (cbp & 2) - transfer_16to8add(pU_Cur, &data[4*64], stride / 2); + transfer_16to8add(pU_Cur, &data[4*64], stride2); if (cbp & 1) - transfer_16to8add(pV_Cur, &data[5*64], stride / 2); + transfer_16to8add(pV_Cur, &data[5*64], stride2); stop_transfer_timer(); return cbp; @@ -367,67 +371,3 @@ MOVLINE(LINE(3,5), LINE(3,3)); MOVLINE(LINE(3,3), tmp); } - - -/* interlace Y blocks vertically */ - -void MBFieldToFrame(int16_t data[6*64]) -{ - uint16_t tmp[8]; - - /* left blocks */ - - // 1=8, 8=4, 4=2, 2=1 - MOVLINE(tmp, LINE(0,1)); - MOVLINE(LINE(0,1), LINE(2,0)); - MOVLINE(LINE(2,0), LINE(0,4)); - MOVLINE(LINE(0,4), LINE(0,2)); - MOVLINE(LINE(0,2), tmp); - - // 3=9, 9=12, 12=6, 6=3 - MOVLINE(tmp, LINE(0,3)); - MOVLINE(LINE(0,3), LINE(2,1)); - MOVLINE(LINE(2,1), LINE(2,4)); - MOVLINE(LINE(2,4), LINE(0,6)); - MOVLINE(LINE(0,6), tmp); - - // 5=10, 10=5 - MOVLINE(tmp, LINE(0,5)); - MOVLINE(LINE(0,5), LINE(2,2)); - MOVLINE(LINE(2,2), tmp); - - // 7=11, 11=13, 13=14, 14=7 - MOVLINE(tmp, LINE(0,7)); - MOVLINE(LINE(0,7), LINE(2,3)); - MOVLINE(LINE(2,3), LINE(2,5)); - MOVLINE(LINE(2,5), LINE(2,6)); - MOVLINE(LINE(2,6), tmp); - - /* right blocks */ - - // 1=8, 8=4, 4=2, 2=1 - MOVLINE(tmp, LINE(1,1)); - MOVLINE(LINE(1,1), LINE(3,0)); - MOVLINE(LINE(3,0), LINE(1,4)); - MOVLINE(LINE(1,4), LINE(1,2)); - MOVLINE(LINE(1,2), tmp); - - // 3=9, 9=12, 12=6, 6=3 - MOVLINE(tmp, LINE(1,3)); - MOVLINE(LINE(1,3), LINE(3,1)); - MOVLINE(LINE(3,1), LINE(3,4)); - MOVLINE(LINE(3,4), LINE(1,6)); - MOVLINE(LINE(1,6), tmp); - - // 5=10, 10=5 - MOVLINE(tmp, LINE(1,5)); - MOVLINE(LINE(1,5), LINE(3,2)); - MOVLINE(LINE(3,2), tmp); - - // 7=11, 11=13, 13=14, 14=7 - MOVLINE(tmp, LINE(1,7)); - MOVLINE(LINE(1,7), LINE(3,3)); - MOVLINE(LINE(3,3), LINE(3,5)); - MOVLINE(LINE(3,5), LINE(3,6)); - MOVLINE(LINE(3,6), tmp); -}