libavcodec.hg: i386/dsputil

comparison i386/dsputil_mmx.c @ 4197:bbe0bc387a19 libavcodec

revert bad checkin

author	mru
date	Tue, 14 Nov 2006 03:18:09 +0000
parents	fbac0859753d
children	d3e389536b0a

comparison

equal deleted inserted replaced

-:fbac0859753d
+:bbe0bc387a19
 //#include <assert.h>
 extern void ff_idct_xvid_mmx(short *block);
 extern void ff_idct_xvid_mmx2(short *block);
-int ff_mm_flags; /* multimedia extension flags */
+int mm_flags; /* multimedia extension flags */
 /* pixel operations */
 static const uint64_t mm_bone attribute_used __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
 static const uint64_t mm_wone attribute_used __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
 static const uint64_t mm_wtwo attribute_used __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
 int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8);
 #endif
 void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
 {
-ff_mm_flags = mm_support();
+mm_flags = mm_support();
 if (avctx->dsp_mask) {
 if (avctx->dsp_mask & FF_MM_FORCE)
-ff_mm_flags |= (avctx->dsp_mask & 0xffff);
+mm_flags |= (avctx->dsp_mask & 0xffff);
 else
-ff_mm_flags &= ~(avctx->dsp_mask & 0xffff);
+mm_flags &= ~(avctx->dsp_mask & 0xffff);
 }
 #if 0
 av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:");
-if (ff_mm_flags & MM_MMX)
+if (mm_flags & MM_MMX)
 av_log(avctx, AV_LOG_INFO, " mmx");
-if (ff_mm_flags & MM_MMXEXT)
+if (mm_flags & MM_MMXEXT)
 av_log(avctx, AV_LOG_INFO, " mmxext");
-if (ff_mm_flags & MM_3DNOW)
+if (mm_flags & MM_3DNOW)
 av_log(avctx, AV_LOG_INFO, " 3dnow");
-if (ff_mm_flags & MM_SSE)
+if (mm_flags & MM_SSE)
 av_log(avctx, AV_LOG_INFO, " sse");
-if (ff_mm_flags & MM_SSE2)
+if (mm_flags & MM_SSE2)
 av_log(avctx, AV_LOG_INFO, " sse2");
 av_log(avctx, AV_LOG_INFO, "\n");
 #endif
-if (ff_mm_flags & MM_MMX) {
+if (mm_flags & MM_MMX) {
 const int idct_algo= avctx->idct_algo;
 #ifdef CONFIG_ENCODERS
 const int dct_algo = avctx->dct_algo;
 if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
-if(ff_mm_flags & MM_SSE2){
+if(mm_flags & MM_SSE2){
 c->fdct = ff_fdct_sse2;
-}else if(ff_mm_flags & MM_MMXEXT){
+}else if(mm_flags & MM_MMXEXT){
 c->fdct = ff_fdct_mmx2;
 }else{
 c->fdct = ff_fdct_mmx;
 }
 }
 c->idct_add= ff_simple_idct_add_mmx;
 c->idct    = ff_simple_idct_mmx;
 c->idct_permutation_type= FF_SIMPLE_IDCT_PERM;
 #ifdef CONFIG_GPL
 }else if(idct_algo==FF_IDCT_LIBMPEG2MMX){
-if(ff_mm_flags & MM_MMXEXT){
+if(mm_flags & MM_MMXEXT){
 c->idct_put= ff_libmpeg2mmx2_idct_put;
 c->idct_add= ff_libmpeg2mmx2_idct_add;
 c->idct    = ff_mmxext_idct;
 }else{
 c->idct_put= ff_libmpeg2mmx_idct_put;
 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
 #endif
 }else if(idct_algo==FF_IDCT_VP3 &&
 avctx->codec->id!=CODEC_ID_THEORA &&
 !(avctx->flags & CODEC_FLAG_BITEXACT)){
-if(ff_mm_flags & MM_SSE2){
+if(mm_flags & MM_SSE2){
 c->idct_put= ff_vp3_idct_put_sse2;
 c->idct_add= ff_vp3_idct_add_sse2;
 c->idct    = ff_vp3_idct_sse2;
 c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM;
 }else{
 c->idct_permutation_type= FF_PARTTRANS_IDCT_PERM;
 }
 }else if(idct_algo==FF_IDCT_CAVS){
 c->idct_permutation_type= FF_TRANSPOSE_IDCT_PERM;
 }else if(idct_algo==FF_IDCT_XVIDMMX){
-if(ff_mm_flags & MM_MMXEXT){
+if(mm_flags & MM_MMXEXT){
 c->idct_put= ff_idct_xvid_mmx2_put;
 c->idct_add= ff_idct_xvid_mmx2_add;
 c->idct    = ff_idct_xvid_mmx2;
 }else{
 c->idct_put= ff_idct_xvid_mmx_put;
 c->hadamard8_diff[0]= hadamard8_diff16_mmx;
 c->hadamard8_diff[1]= hadamard8_diff_mmx;
 c->pix_norm1 = pix_norm1_mmx;
-c->sse[0] = (ff_mm_flags & MM_SSE2) ? sse16_sse2 : sse16_mmx;
+c->sse[0] = (mm_flags & MM_SSE2) ? sse16_sse2 : sse16_mmx;
 c->sse[1] = sse8_mmx;
 c->vsad[4]= vsad_intra16_mmx;
 c->nsse[0] = nsse16_mmx;
 c->nsse[1] = nsse8_mmx;
 c->h264_idct_dc_add=
 c->h264_idct_add= ff_h264_idct_add_mmx;
 c->h264_idct8_dc_add=
 c->h264_idct8_add= ff_h264_idct8_add_mmx;
-if (ff_mm_flags & MM_MMXEXT) {
+if (mm_flags & MM_MMXEXT) {
 c->prefetch = prefetch_mmx2;
 c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2;
 c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2;
 #endif
 #ifdef CONFIG_ENCODERS
 c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2;
 #endif //CONFIG_ENCODERS
-} else if (ff_mm_flags & MM_3DNOW) {
+} else if (mm_flags & MM_3DNOW) {
 c->prefetch = prefetch_3dnow;
 c->put_pixels_tab[0][1] = put_pixels16_x2_3dnow;
 c->put_pixels_tab[0][2] = put_pixels16_y2_3dnow;
 c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_3dnow;
 c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
 }
 #ifdef CONFIG_SNOW_ENCODER
-if(ff_mm_flags & MM_SSE2){
+if(mm_flags & MM_SSE2){
 c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
 c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
 c->inner_add_yblock = ff_snow_inner_add_yblock_sse2;
 }
 else{
 c->vertical_compose97i = ff_snow_vertical_compose97i_mmx;
 c->inner_add_yblock = ff_snow_inner_add_yblock_mmx;
 }
 #endif
-if(ff_mm_flags & MM_3DNOW){
+if(mm_flags & MM_3DNOW){
 c->vorbis_inverse_coupling = vorbis_inverse_coupling_3dnow;
 c->vector_fmul = vector_fmul_3dnow;
 if(!(avctx->flags & CODEC_FLAG_BITEXACT))
 c->float_to_int16 = float_to_int16_3dnow;
 }
-if(ff_mm_flags & MM_3DNOWEXT)
+if(mm_flags & MM_3DNOWEXT)
 c->vector_fmul_reverse = vector_fmul_reverse_3dnow2;
-if(ff_mm_flags & MM_SSE){
+if(mm_flags & MM_SSE){
 c->vorbis_inverse_coupling = vorbis_inverse_coupling_sse;
 c->vector_fmul = vector_fmul_sse;
 c->float_to_int16 = float_to_int16_sse;
 c->vector_fmul_reverse = vector_fmul_reverse_sse;
 c->vector_fmul_add_add = vector_fmul_add_add_sse;
 }
-if(ff_mm_flags & MM_3DNOW)
+if(mm_flags & MM_3DNOW)
 c->vector_fmul_add_add = vector_fmul_add_add_3dnow; // faster than sse
 }
 #ifdef CONFIG_ENCODERS
 dsputil_init_pix_mmx(c, avctx);

Mercurial > libavcodec.hg

comparison i386/dsputil_mmx.c @ 4197:bbe0bc387a19 libavcodec