comparison vp3.c @ 3499:28e8b0fe4f3e libavcodec

iabs -> ABS
author michael
date Wed, 19 Jul 2006 21:05:42 +0000
parents 4b040103da35
children 2ff5efa33e3a
comparison
equal deleted inserted replaced
3498:4b040103da35 3499:28e8b0fe4f3e
1350 */ 1350 */
1351 #define COMPATIBLE_FRAME(x) \ 1351 #define COMPATIBLE_FRAME(x) \
1352 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type) 1352 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
1353 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY) 1353 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY)
1354 #define DC_COEFF(u) (s->coeffs[u].index ? 0 : s->coeffs[u].coeff) //FIXME do somethin to simplify this 1354 #define DC_COEFF(u) (s->coeffs[u].index ? 0 : s->coeffs[u].coeff) //FIXME do somethin to simplify this
1355 static inline int iabs (int x) { return ((x < 0) ? -x : x); }
1356 1355
1357 static void reverse_dc_prediction(Vp3DecodeContext *s, 1356 static void reverse_dc_prediction(Vp3DecodeContext *s,
1358 int first_fragment, 1357 int first_fragment,
1359 int fragment_width, 1358 int fragment_width,
1360 int fragment_height) 1359 int fragment_height)
1596 } 1595 }
1597 1596
1598 /* check for outranging on the [ul u l] and 1597 /* check for outranging on the [ul u l] and
1599 * [ul u ur l] predictors */ 1598 * [ul u ur l] predictors */
1600 if ((transform == 13) || (transform == 15)) { 1599 if ((transform == 13) || (transform == 15)) {
1601 if (iabs(predicted_dc - vu) > 128) 1600 if (ABS(predicted_dc - vu) > 128)
1602 predicted_dc = vu; 1601 predicted_dc = vu;
1603 else if (iabs(predicted_dc - vl) > 128) 1602 else if (ABS(predicted_dc - vl) > 128)
1604 predicted_dc = vl; 1603 predicted_dc = vl;
1605 else if (iabs(predicted_dc - vul) > 128) 1604 else if (ABS(predicted_dc - vul) > 128)
1606 predicted_dc = vul; 1605 predicted_dc = vul;
1607 } 1606 }
1608 1607
1609 debug_dc_pred("from pred DC = %d\n", 1608 debug_dc_pred("from pred DC = %d\n",
1610 DC_COEFF(i)); 1609 DC_COEFF(i));