Mercurial > libavcodec.hg
comparison x86/motion_est_mmx.c @ 12456:a5ddb39627fd libavcodec
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
author | stefano |
---|---|
date | Sat, 04 Sep 2010 09:59:08 +0000 |
parents | 3fc4c625b6f3 |
children | 9fef0a8ddd63 |
comparison
equal
deleted
inserted
replaced
12455:14f85520cd02 | 12456:a5ddb39627fd |
---|---|
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 int mm_flags = mm_support(); | 430 int mm_flags = mm_support(); |
431 | 431 |
432 if (mm_flags & FF_MM_MMX) { | 432 if (mm_flags & AV_CPU_FLAG_MMX) { |
433 c->pix_abs[0][0] = sad16_mmx; | 433 c->pix_abs[0][0] = sad16_mmx; |
434 c->pix_abs[0][1] = sad16_x2_mmx; | 434 c->pix_abs[0][1] = sad16_x2_mmx; |
435 c->pix_abs[0][2] = sad16_y2_mmx; | 435 c->pix_abs[0][2] = sad16_y2_mmx; |
436 c->pix_abs[0][3] = sad16_xy2_mmx; | 436 c->pix_abs[0][3] = sad16_xy2_mmx; |
437 c->pix_abs[1][0] = sad8_mmx; | 437 c->pix_abs[1][0] = sad8_mmx; |
440 c->pix_abs[1][3] = sad8_xy2_mmx; | 440 c->pix_abs[1][3] = sad8_xy2_mmx; |
441 | 441 |
442 c->sad[0]= sad16_mmx; | 442 c->sad[0]= sad16_mmx; |
443 c->sad[1]= sad8_mmx; | 443 c->sad[1]= sad8_mmx; |
444 } | 444 } |
445 if (mm_flags & FF_MM_MMX2) { | 445 if (mm_flags & AV_CPU_FLAG_MMX2) { |
446 c->pix_abs[0][0] = sad16_mmx2; | 446 c->pix_abs[0][0] = sad16_mmx2; |
447 c->pix_abs[1][0] = sad8_mmx2; | 447 c->pix_abs[1][0] = sad8_mmx2; |
448 | 448 |
449 c->sad[0]= sad16_mmx2; | 449 c->sad[0]= sad16_mmx2; |
450 c->sad[1]= sad8_mmx2; | 450 c->sad[1]= sad8_mmx2; |
456 c->pix_abs[1][1] = sad8_x2_mmx2; | 456 c->pix_abs[1][1] = sad8_x2_mmx2; |
457 c->pix_abs[1][2] = sad8_y2_mmx2; | 457 c->pix_abs[1][2] = sad8_y2_mmx2; |
458 c->pix_abs[1][3] = sad8_xy2_mmx2; | 458 c->pix_abs[1][3] = sad8_xy2_mmx2; |
459 } | 459 } |
460 } | 460 } |
461 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) && avctx->codec_id != CODEC_ID_SNOW) { |
462 c->sad[0]= sad16_sse2; | 462 c->sad[0]= sad16_sse2; |
463 } | 463 } |
464 } | 464 } |