comparison error_resilience.c @ 847:f3c369b8ddca libavcodec

reversing header game MIN/MAX -> FFMIN/FFMAX
author michaelni
date Sun, 10 Nov 2002 11:46:59 +0000
parents 25d7fb7c89be
children eacc2dd8fd9d
comparison
equal deleted inserted replaced
846:ade627a74709 847:f3c369b8ddca
207 a= dst[offset + 7 + y*stride] - dst[offset + 6 + y*stride]; 207 a= dst[offset + 7 + y*stride] - dst[offset + 6 + y*stride];
208 b= dst[offset + 8 + y*stride] - dst[offset + 7 + y*stride]; 208 b= dst[offset + 8 + y*stride] - dst[offset + 7 + y*stride];
209 c= dst[offset + 9 + y*stride] - dst[offset + 8 + y*stride]; 209 c= dst[offset + 9 + y*stride] - dst[offset + 8 + y*stride];
210 210
211 d= ABS(b) - ((ABS(a) + ABS(c) + 1)>>1); 211 d= ABS(b) - ((ABS(a) + ABS(c) + 1)>>1);
212 d= MAX(d, 0); 212 d= FFMAX(d, 0);
213 if(b<0) d= -d; 213 if(b<0) d= -d;
214 214
215 if(d==0) continue; 215 if(d==0) continue;
216 216
217 if(!(left_damage && right_damage)) 217 if(!(left_damage && right_damage))
267 a= dst[offset + x + 7*stride] - dst[offset + x + 6*stride]; 267 a= dst[offset + x + 7*stride] - dst[offset + x + 6*stride];
268 b= dst[offset + x + 8*stride] - dst[offset + x + 7*stride]; 268 b= dst[offset + x + 8*stride] - dst[offset + x + 7*stride];
269 c= dst[offset + x + 9*stride] - dst[offset + x + 8*stride]; 269 c= dst[offset + x + 9*stride] - dst[offset + x + 8*stride];
270 270
271 d= ABS(b) - ((ABS(a) + ABS(c)+1)>>1); 271 d= ABS(b) - ((ABS(a) + ABS(c)+1)>>1);
272 d= MAX(d, 0); 272 d= FFMAX(d, 0);
273 if(b<0) d= -d; 273 if(b<0) d= -d;
274 274
275 if(d==0) continue; 275 if(d==0) continue;
276 276
277 if(!(top_damage && bottom_damage)) 277 if(!(top_damage && bottom_damage))
428 max_y= max_x=-99999; 428 max_y= max_x=-99999;
429 }else{ 429 }else{
430 min_x=min_y=max_x=max_y=0; 430 min_x=min_y=max_x=max_y=0;
431 } 431 }
432 for(j=0; j<pred_count; j++){ 432 for(j=0; j<pred_count; j++){
433 max_x= MAX(max_x, mv_predictor[j][0]); 433 max_x= FFMAX(max_x, mv_predictor[j][0]);
434 max_y= MAX(max_y, mv_predictor[j][1]); 434 max_y= FFMAX(max_y, mv_predictor[j][1]);
435 min_x= MIN(min_x, mv_predictor[j][0]); 435 min_x= FFMIN(min_x, mv_predictor[j][0]);
436 min_y= MIN(min_y, mv_predictor[j][1]); 436 min_y= FFMIN(min_y, mv_predictor[j][1]);
437 } 437 }
438 mv_predictor[pred_count+1][0] = sum_x - max_x - min_x; 438 mv_predictor[pred_count+1][0] = sum_x - max_x - min_x;
439 mv_predictor[pred_count+1][1] = sum_y - max_y - min_y; 439 mv_predictor[pred_count+1][1] = sum_y - max_y - min_y;
440 440
441 if(pred_count==4){ 441 if(pred_count==4){
536 undamaged_count++; 536 undamaged_count++;
537 } 537 }
538 538
539 if(undamaged_count < 5) return 0; //allmost all MBs damaged -> use temporal prediction 539 if(undamaged_count < 5) return 0; //allmost all MBs damaged -> use temporal prediction
540 540
541 skip_amount= MAX(undamaged_count/50, 1); //check only upto 50 MBs 541 skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs
542 is_intra_likely=0; 542 is_intra_likely=0;
543 543
544 j=0; 544 j=0;
545 i=-1; 545 i=-1;
546 for(mb_y= 0; mb_y<s->mb_height-1; mb_y++){ 546 for(mb_y= 0; mb_y<s->mb_height-1; mb_y++){