mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-10 13:29:58 -05:00
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am
This commit is contained in:
commit
7bc8a793b8
11 changed files with 1028 additions and 46 deletions
|
|
@ -157,6 +157,17 @@ static inline size_t PA_PAGE_ALIGN(size_t l) {
|
|||
#define PA_ROUND_DOWN(a, b) (((a) / (b)) * (b))
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define PA_CLIP_SUB(a, b) \
|
||||
__extension__ ({ \
|
||||
typeof(a) _a = (a); \
|
||||
typeof(b) _b = (b); \
|
||||
_a > _b ? _a - _b : 0; \
|
||||
})
|
||||
#else
|
||||
#define PA_CLIP_SUB(a, b) ((a) > (b) ? (a) - (b) : 0)
|
||||
#endif
|
||||
|
||||
/* This type is not intended to be used in exported APIs! Use classic "int" there! */
|
||||
#ifdef HAVE_STD_BOOL
|
||||
typedef _Bool pa_bool_t;
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@
|
|||
"4: \n\t" \
|
||||
" emms \n\t"
|
||||
|
||||
#if defined (__i386__) || defined (__amd64__)
|
||||
static void remap_mono_to_stereo_mmx (pa_remap_t *m, void *dst, const void *src, unsigned n) {
|
||||
pa_reg_x86 temp;
|
||||
|
||||
|
|
@ -138,6 +139,7 @@ static void init_remap_mmx (pa_remap_t *m) {
|
|||
pa_log_info("Using MMX mono to stereo remapping");
|
||||
}
|
||||
}
|
||||
#endif /* defined (__i386__) || defined (__amd64__) */
|
||||
|
||||
void pa_remap_func_init_mmx (pa_cpu_x86_flag_t flags) {
|
||||
#if defined (__i386__) || defined (__amd64__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue