← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libswscale/x86/yuv2rgb.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswscale/x86/yuv2rgb.c
53
53
#undef RENAME
54
54
#undef COMPILE_TEMPLATE_MMXEXT
55
55
#define COMPILE_TEMPLATE_MMXEXT 0
56
 
#define RENAME(a) a ## _MMX
 
56
#define RENAME(a) a ## _mmx
57
57
#include "yuv2rgb_template.c"
58
58
#endif /* HAVE_MMX_INLINE */
59
59
 
62
62
#undef RENAME
63
63
#undef COMPILE_TEMPLATE_MMXEXT
64
64
#define COMPILE_TEMPLATE_MMXEXT 1
65
 
#define RENAME(a) a ## _MMXEXT
 
65
#define RENAME(a) a ## _mmxext
66
66
#include "yuv2rgb_template.c"
67
67
#endif /* HAVE_MMXEXT_INLINE */
68
68
 
77
77
    if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
78
78
        switch (c->dstFormat) {
79
79
        case AV_PIX_FMT_RGB24:
80
 
            return yuv420_rgb24_MMXEXT;
 
80
            return yuv420_rgb24_mmxext;
81
81
        case AV_PIX_FMT_BGR24:
82
 
            return yuv420_bgr24_MMXEXT;
 
82
            return yuv420_bgr24_mmxext;
83
83
        }
84
84
    }
85
85
#endif
89
89
            case AV_PIX_FMT_RGB32:
90
90
                if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
91
91
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
92
 
                    return yuva420_rgb32_MMX;
 
92
                    return yuva420_rgb32_mmx;
93
93
#endif
94
94
                    break;
95
 
                } else return yuv420_rgb32_MMX;
 
95
                } else
 
96
                    return yuv420_rgb32_mmx;
96
97
            case AV_PIX_FMT_BGR32:
97
98
                if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
98
99
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
99
 
                    return yuva420_bgr32_MMX;
 
100
                    return yuva420_bgr32_mmx;
100
101
#endif
101
102
                    break;
102
 
                } else return yuv420_bgr32_MMX;
103
 
            case AV_PIX_FMT_RGB24:  return yuv420_rgb24_MMX;
104
 
            case AV_PIX_FMT_BGR24:  return yuv420_bgr24_MMX;
105
 
            case AV_PIX_FMT_RGB565: return yuv420_rgb16_MMX;
106
 
            case AV_PIX_FMT_RGB555: return yuv420_rgb15_MMX;
 
103
                } else
 
104
                    return yuv420_bgr32_mmx;
 
105
            case AV_PIX_FMT_RGB24:
 
106
                return yuv420_rgb24_mmx;
 
107
            case AV_PIX_FMT_BGR24:
 
108
                return yuv420_bgr24_mmx;
 
109
            case AV_PIX_FMT_RGB565:
 
110
                return yuv420_rgb16_mmx;
 
111
            case AV_PIX_FMT_RGB555:
 
112
                return yuv420_rgb15_mmx;
107
113
        }
108
114
    }
109
115
#endif /* HAVE_MMX_INLINE */