Mercurial > libavcodec.hg
comparison vc1.c @ 4001:34fdffe98bd0 libavcodec
Rename ABS macro to FFABS.
| author | diego |
|---|---|
| date | Wed, 11 Oct 2006 23:17:58 +0000 |
| parents | c8c591fe26f8 |
| children | ec6d49d9c19d |
comparison
equal
deleted
inserted
replaced
| 4000:eeab02251056 | 4001:34fdffe98bd0 |
|---|---|
| 1948 if(qy + py > Y) py = Y - qy; | 1948 if(qy + py > Y) py = Y - qy; |
| 1949 } | 1949 } |
| 1950 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | 1950 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
| 1951 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { | 1951 if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { |
| 1952 if(is_intra[xy - wrap]) | 1952 if(is_intra[xy - wrap]) |
| 1953 sum = ABS(px) + ABS(py); | 1953 sum = FFABS(px) + FFABS(py); |
| 1954 else | 1954 else |
| 1955 sum = ABS(px - A[0]) + ABS(py - A[1]); | 1955 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 1956 if(sum > 32) { | 1956 if(sum > 32) { |
| 1957 if(get_bits1(&s->gb)) { | 1957 if(get_bits1(&s->gb)) { |
| 1958 px = A[0]; | 1958 px = A[0]; |
| 1959 py = A[1]; | 1959 py = A[1]; |
| 1960 } else { | 1960 } else { |
| 1961 px = C[0]; | 1961 px = C[0]; |
| 1962 py = C[1]; | 1962 py = C[1]; |
| 1963 } | 1963 } |
| 1964 } else { | 1964 } else { |
| 1965 if(is_intra[xy - 1]) | 1965 if(is_intra[xy - 1]) |
| 1966 sum = ABS(px) + ABS(py); | 1966 sum = FFABS(px) + FFABS(py); |
| 1967 else | 1967 else |
| 1968 sum = ABS(px - C[0]) + ABS(py - C[1]); | 1968 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 1969 if(sum > 32) { | 1969 if(sum > 32) { |
| 1970 if(get_bits1(&s->gb)) { | 1970 if(get_bits1(&s->gb)) { |
| 1971 px = A[0]; | 1971 px = A[0]; |
| 1972 py = A[1]; | 1972 py = A[1]; |
| 1973 } else { | 1973 } else { |
| 2216 } | 2216 } |
| 2217 } | 2217 } |
| 2218 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | 2218 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
| 2219 if(0 && !s->first_slice_line && s->mb_x) { | 2219 if(0 && !s->first_slice_line && s->mb_x) { |
| 2220 if(is_intra[xy - wrap]) | 2220 if(is_intra[xy - wrap]) |
| 2221 sum = ABS(px) + ABS(py); | 2221 sum = FFABS(px) + FFABS(py); |
| 2222 else | 2222 else |
| 2223 sum = ABS(px - A[0]) + ABS(py - A[1]); | 2223 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 2224 if(sum > 32) { | 2224 if(sum > 32) { |
| 2225 if(get_bits1(&s->gb)) { | 2225 if(get_bits1(&s->gb)) { |
| 2226 px = A[0]; | 2226 px = A[0]; |
| 2227 py = A[1]; | 2227 py = A[1]; |
| 2228 } else { | 2228 } else { |
| 2229 px = C[0]; | 2229 px = C[0]; |
| 2230 py = C[1]; | 2230 py = C[1]; |
| 2231 } | 2231 } |
| 2232 } else { | 2232 } else { |
| 2233 if(is_intra[xy - 2]) | 2233 if(is_intra[xy - 2]) |
| 2234 sum = ABS(px) + ABS(py); | 2234 sum = FFABS(px) + FFABS(py); |
| 2235 else | 2235 else |
| 2236 sum = ABS(px - C[0]) + ABS(py - C[1]); | 2236 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 2237 if(sum > 32) { | 2237 if(sum > 32) { |
| 2238 if(get_bits1(&s->gb)) { | 2238 if(get_bits1(&s->gb)) { |
| 2239 px = A[0]; | 2239 px = A[0]; |
| 2240 py = A[1]; | 2240 py = A[1]; |
| 2241 } else { | 2241 } else { |
| 2293 } | 2293 } |
| 2294 } | 2294 } |
| 2295 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ | 2295 /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ |
| 2296 if(0 && !s->first_slice_line && s->mb_x) { | 2296 if(0 && !s->first_slice_line && s->mb_x) { |
| 2297 if(is_intra[xy - wrap]) | 2297 if(is_intra[xy - wrap]) |
| 2298 sum = ABS(px) + ABS(py); | 2298 sum = FFABS(px) + FFABS(py); |
| 2299 else | 2299 else |
| 2300 sum = ABS(px - A[0]) + ABS(py - A[1]); | 2300 sum = FFABS(px - A[0]) + FFABS(py - A[1]); |
| 2301 if(sum > 32) { | 2301 if(sum > 32) { |
| 2302 if(get_bits1(&s->gb)) { | 2302 if(get_bits1(&s->gb)) { |
| 2303 px = A[0]; | 2303 px = A[0]; |
| 2304 py = A[1]; | 2304 py = A[1]; |
| 2305 } else { | 2305 } else { |
| 2306 px = C[0]; | 2306 px = C[0]; |
| 2307 py = C[1]; | 2307 py = C[1]; |
| 2308 } | 2308 } |
| 2309 } else { | 2309 } else { |
| 2310 if(is_intra[xy - 2]) | 2310 if(is_intra[xy - 2]) |
| 2311 sum = ABS(px) + ABS(py); | 2311 sum = FFABS(px) + FFABS(py); |
| 2312 else | 2312 else |
| 2313 sum = ABS(px - C[0]) + ABS(py - C[1]); | 2313 sum = FFABS(px - C[0]) + FFABS(py - C[1]); |
| 2314 if(sum > 32) { | 2314 if(sum > 32) { |
| 2315 if(get_bits1(&s->gb)) { | 2315 if(get_bits1(&s->gb)) { |
| 2316 px = A[0]; | 2316 px = A[0]; |
| 2317 py = A[1]; | 2317 py = A[1]; |
| 2318 } else { | 2318 } else { |