| OLD | NEW |
| 1 /* | 1 /* |
| 2 * MMX optimized motion estimation | 2 * MMX optimized motion estimation |
| 3 * Copyright (c) 2001 Fabrice Bellard | 3 * Copyright (c) 2001 Fabrice Bellard |
| 4 * Copyright (c) 2002-2004 Michael Niedermayer | 4 * Copyright (c) 2002-2004 Michael Niedermayer |
| 5 * | 5 * |
| 6 * mostly by Michael Niedermayer <michaelni@gmx.at> | 6 * mostly by Michael Niedermayer <michaelni@gmx.at> |
| 7 * | 7 * |
| 8 * This file is part of FFmpeg. | 8 * This file is part of FFmpeg. |
| 9 * | 9 * |
| 10 * FFmpeg is free software; you can redistribute it and/or | 10 * FFmpeg is free software; you can redistribute it and/or |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 sad8_4_ ## suf(blk1+8, blk2+8, stride, h);\ | 420 sad8_4_ ## suf(blk1+8, blk2+8, stride, h);\ |
| 421 \ | 421 \ |
| 422 return sum_ ## suf();\ | 422 return sum_ ## suf();\ |
| 423 }\ | 423 }\ |
| 424 | 424 |
| 425 PIX_SAD(mmx) | 425 PIX_SAD(mmx) |
| 426 PIX_SAD(mmx2) | 426 PIX_SAD(mmx2) |
| 427 | 427 |
| 428 void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) | 428 void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) |
| 429 { | 429 { |
| 430 if (mm_flags & FF_MM_MMX) { | 430 int mm_flags = av_get_cpu_flags(); |
| 431 |
| 432 if (mm_flags & AV_CPU_FLAG_MMX) { |
| 431 c->pix_abs[0][0] = sad16_mmx; | 433 c->pix_abs[0][0] = sad16_mmx; |
| 432 c->pix_abs[0][1] = sad16_x2_mmx; | 434 c->pix_abs[0][1] = sad16_x2_mmx; |
| 433 c->pix_abs[0][2] = sad16_y2_mmx; | 435 c->pix_abs[0][2] = sad16_y2_mmx; |
| 434 c->pix_abs[0][3] = sad16_xy2_mmx; | 436 c->pix_abs[0][3] = sad16_xy2_mmx; |
| 435 c->pix_abs[1][0] = sad8_mmx; | 437 c->pix_abs[1][0] = sad8_mmx; |
| 436 c->pix_abs[1][1] = sad8_x2_mmx; | 438 c->pix_abs[1][1] = sad8_x2_mmx; |
| 437 c->pix_abs[1][2] = sad8_y2_mmx; | 439 c->pix_abs[1][2] = sad8_y2_mmx; |
| 438 c->pix_abs[1][3] = sad8_xy2_mmx; | 440 c->pix_abs[1][3] = sad8_xy2_mmx; |
| 439 | 441 |
| 440 c->sad[0]= sad16_mmx; | 442 c->sad[0]= sad16_mmx; |
| 441 c->sad[1]= sad8_mmx; | 443 c->sad[1]= sad8_mmx; |
| 442 } | 444 } |
| 443 if (mm_flags & FF_MM_MMX2) { | 445 if (mm_flags & AV_CPU_FLAG_MMX2) { |
| 444 c->pix_abs[0][0] = sad16_mmx2; | 446 c->pix_abs[0][0] = sad16_mmx2; |
| 445 c->pix_abs[1][0] = sad8_mmx2; | 447 c->pix_abs[1][0] = sad8_mmx2; |
| 446 | 448 |
| 447 c->sad[0]= sad16_mmx2; | 449 c->sad[0]= sad16_mmx2; |
| 448 c->sad[1]= sad8_mmx2; | 450 c->sad[1]= sad8_mmx2; |
| 449 | 451 |
| 450 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ | 452 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ |
| 451 c->pix_abs[0][1] = sad16_x2_mmx2; | 453 c->pix_abs[0][1] = sad16_x2_mmx2; |
| 452 c->pix_abs[0][2] = sad16_y2_mmx2; | 454 c->pix_abs[0][2] = sad16_y2_mmx2; |
| 453 c->pix_abs[0][3] = sad16_xy2_mmx2; | 455 c->pix_abs[0][3] = sad16_xy2_mmx2; |
| 454 c->pix_abs[1][1] = sad8_x2_mmx2; | 456 c->pix_abs[1][1] = sad8_x2_mmx2; |
| 455 c->pix_abs[1][2] = sad8_y2_mmx2; | 457 c->pix_abs[1][2] = sad8_y2_mmx2; |
| 456 c->pix_abs[1][3] = sad8_xy2_mmx2; | 458 c->pix_abs[1][3] = sad8_xy2_mmx2; |
| 457 } | 459 } |
| 458 } | 460 } |
| 459 if ((mm_flags & FF_MM_SSE2) && !(mm_flags & FF_MM_3DNOW) && avctx->codec_id
!= CODEC_ID_SNOW) { | 461 if ((mm_flags & AV_CPU_FLAG_SSE2) && !(mm_flags & AV_CPU_FLAG_3DNOW) && avct
x->codec_id != CODEC_ID_SNOW) { |
| 460 c->sad[0]= sad16_sse2; | 462 c->sad[0]= sad16_sse2; |
| 461 } | 463 } |
| 462 } | 464 } |
| OLD | NEW |