comparison dsputil.h @ 8104:0d108ec85620 libavcodec

Remove duplicated MM_* macros for CPU capabilities from dsputil.h. Add missing one for FF_MM_ALTIVEC to avcodec.h. Rename all the occurences of MM_* to the corresponding FF_MM_*.
author rathann
date Mon, 03 Nov 2008 18:08:00 +0000
parents eebc7209c47f
children 520a6e56b8c0
comparison
equal deleted inserted replaced
8103:069d7a8e2e75 8104:0d108ec85620
560 560
561 #if defined(HAVE_MMX) 561 #if defined(HAVE_MMX)
562 562
563 #undef emms_c 563 #undef emms_c
564 564
565 #define MM_MMX 0x0001 /* standard MMX */
566 #define MM_3DNOW 0x0004 /* AMD 3DNOW */
567 #define MM_MMXEXT 0x0002 /* SSE integer functions or AMD MMX ext */
568 #define MM_SSE 0x0008 /* SSE functions */
569 #define MM_SSE2 0x0010 /* PIV SSE2 functions */
570 #define MM_3DNOWEXT 0x0020 /* AMD 3DNowExt */
571 #define MM_SSE3 0x0040 /* Prescott SSE3 functions */
572 #define MM_SSSE3 0x0080 /* Conroe SSSE3 functions */
573
574 extern int mm_flags; 565 extern int mm_flags;
575 566
576 void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); 567 void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
577 void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); 568 void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
578 void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); 569 void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
583 } 574 }
584 575
585 576
586 #define emms_c() \ 577 #define emms_c() \
587 {\ 578 {\
588 if (mm_flags & MM_MMX)\ 579 if (mm_flags & FF_MM_MMX)\
589 emms();\ 580 emms();\
590 } 581 }
591 582
592 void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); 583 void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
593 584
594 #elif defined(ARCH_ARMV4L) 585 #elif defined(ARCH_ARMV4L)
595
596 #define MM_IWMMXT 0x0100 /* XScale IWMMXT */
597 586
598 extern int mm_flags; 587 extern int mm_flags;
599 588
600 #ifdef HAVE_NEON 589 #ifdef HAVE_NEON
601 # define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) 590 # define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v)
602 # define STRIDE_ALIGN 16 591 # define STRIDE_ALIGN 16
603 #endif 592 #endif
604 593
605 #elif defined(ARCH_POWERPC) 594 #elif defined(ARCH_POWERPC)
606
607 #define MM_ALTIVEC 0x0001 /* standard AltiVec */
608 595
609 extern int mm_flags; 596 extern int mm_flags;
610 597
611 #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) 598 #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v)
612 #define STRIDE_ALIGN 16 599 #define STRIDE_ALIGN 16