virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

* simplified indexing

Browse Source 
Originally committed as revision 306 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac 2002-02-18 09:32:11 +00:00
parent 8257bf0534
commit af8793ae75
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libavcodec/h263.c
View File

@ -276,16 +276,15 @@ void h263_encode_mb(MpegEncContext * s,
static inline int mid_pred(int a, int b, int c) static inline int mid_pred(int a, int b, int c)
{ {
int vmin, vmax; int vmin, vmax;
vmin = a; vmax = vmin = a;
if (b < vmin) if (b < vmin)
vmin = b; vmin = b;
else
vmax = b;
if (c < vmin) if (c < vmin)
vmin = c; vmin = c;
else if (c > vmax)
vmax = a;
if (b > vmax)
vmax = b;
if (c > vmax)
vmax = c; vmax = c;
return a + b + c - vmin - vmax; return a + b + c - vmin - vmax;
@ -294,38 +293,39 @@ static inline int mid_pred(int a, int b, int c)
INT16 *h263_pred_motion(MpegEncContext * s, int block, INT16 *h263_pred_motion(MpegEncContext * s, int block,
int *px, int *py) int *px, int *py)
{ {
int x, y, wrap; int xy, y, wrap;
INT16 *A, *B, *C, *mot_val; INT16 *A, *B, *C, *mot_val;
x = 2 * s->mb_x + 1 + (block & 1);
y = 2 * s->mb_y + 1 + ((block >> 1) & 1);
wrap = 2 * s->mb_width + 2; wrap = 2 * s->mb_width + 2;
y = xy = 2 * s->mb_y + 1 + ((block >> 1) & 1); // y
xy *= wrap; // y * wrap
xy += 2 * s->mb_x + 1 + (block & 1); // x + y * wrap
mot_val = s->motion_val[(x) + (y) * wrap]; mot_val = s->motion_val[xy];
/* special case for first line */ /* special case for first line */
if (y == 1 || s->first_slice_line || s->first_gob_line) { if (y == 1 || s->first_slice_line || s->first_gob_line) {
A = s->motion_val[(x-1) + (y) * wrap]; A = s->motion_val[xy - 1];
*px = A[0]; *px = A[0];
*py = A[1]; *py = A[1];
} else { } else {
switch(block) { switch(block) {
default: default:
case 0: case 0:
A = s->motion_val[(x-1) + (y) * wrap]; A = s->motion_val[xy - 1];
B = s->motion_val[(x) + (y-1) * wrap]; B = s->motion_val[xy - wrap];
C = s->motion_val[(x+2) + (y-1) * wrap]; C = s->motion_val[xy + 2 - wrap];
break; break;
case 1: case 1:
case 2: case 2:
A = s->motion_val[(x-1) + (y) * wrap]; A = s->motion_val[xy - 1];
B = s->motion_val[(x) + (y-1) * wrap]; B = s->motion_val[xy - wrap];
C = s->motion_val[(x+1) + (y-1) * wrap]; C = s->motion_val[xy + 1 - wrap];
break; break;
case 3: case 3:
A = s->motion_val[(x-1) + (y) * wrap]; A = s->motion_val[xy - 1];
B = s->motion_val[(x-1) + (y-1) * wrap]; B = s->motion_val[xy - 1 - wrap];
C = s->motion_val[(x) + (y-1) * wrap]; C = s->motion_val[xy - wrap];
break; break;
} }
*px = mid_pred(A[0], B[0], C[0]); *px = mid_pred(A[0], B[0], C[0]);
@ -538,20 +538,22 @@ void h263_dc_scale(MpegEncContext * s)
static int mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr) static int mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *dir_ptr)
{ {
int a, b, c, x, y, wrap, pred, scale; int a, b, c, xy, wrap, pred, scale;
UINT16 *dc_val; UINT16 *dc_val;
/* find prediction */ /* find prediction */
if (n < 4) { if (n < 4) {
x = 2 * s->mb_x + 1 + (n & 1);
y = 2 * s->mb_y + 1 + ((n & 2) >> 1);
wrap = s->mb_width * 2 + 2; wrap = s->mb_width * 2 + 2;
xy = 2 * s->mb_y + 1 + ((n & 2) >> 1);
xy *= wrap;
xy += 2 * s->mb_x + 1 + (n & 1);
dc_val = s->dc_val[0]; dc_val = s->dc_val[0];
scale = s->y_dc_scale; scale = s->y_dc_scale;
} else { } else {
x = s->mb_x + 1;
y = s->mb_y + 1;
wrap = s->mb_width + 2; 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]; dc_val = s->dc_val[n - 4 + 1];
scale = s->c_dc_scale; scale = s->c_dc_scale;
} }
@ -559,9 +561,9 @@ static int mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *di
/* B C /* B C
* A X * A X
*/ */
a = dc_val[(x - 1) + (y) * wrap]; a = dc_val[xy - 1];
b = dc_val[(x - 1) + (y - 1) * wrap]; b = dc_val[xy - 1 - wrap];
c = dc_val[(x) + (y - 1) * wrap]; c = dc_val[xy - wrap];
if (abs(a - b) < abs(b - c)) { if (abs(a - b) < abs(b - c)) {
pred = c; pred = c;
@ -574,7 +576,7 @@ static int mpeg4_pred_dc(MpegEncContext * s, int n, UINT16 **dc_val_ptr, int *di
pred = (pred + (scale >> 1)) / scale; pred = (pred + (scale >> 1)) / scale;
/* prepare address for prediction update */ /* prepare address for prediction update */
*dc_val_ptr = &dc_val[(x) + (y) * wrap]; *dc_val_ptr = &dc_val[xy];
return pred; return pred;
} }