RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 12:17:12 +00:00
Code Issues Releases Wiki Activity

ao/avfoundation: optimise preprocessors for included coreaudio code

Browse Source
This commit is contained in:
Robert Kopaczewski 2024-04-18 21:10:33 +02:00 committed by der richter
parent 578b9dade2
commit e7b0d6b38b
5 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/out/ao_coreaudio_chmap.c
View File

@ -195,7 +195,7 @@ AudioChannelLabel mp_speaker_id_to_ca_label(int speaker_id)
return -1; // kAudioChannelLabel_Unknown return -1; // kAudioChannelLabel_Unknown
} }
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
void ca_log_layout(struct ao *ao, int l, AudioChannelLayout *layout) void ca_log_layout(struct ao *ao, int l, AudioChannelLayout *layout)
{ {
if (!mp_msg_test(ao->log, l)) if (!mp_msg_test(ao->log, l))

7
audio/out/ao_coreaudio_chmap.h
View File

@ -21,17 +21,12 @@
#include "config.h" #include "config.h"
#include <AudioToolbox/AudioToolbox.h> #include <AudioToolbox/AudioToolbox.h>
#if HAVE_AVFOUNDATION
#undef HAVE_COREAUDIO
#define HAVE_COREAUDIO 1
#endif
struct mp_chmap; struct mp_chmap;
int ca_label_to_mp_speaker_id(AudioChannelLabel label); int ca_label_to_mp_speaker_id(AudioChannelLabel label);
AudioChannelLabel mp_speaker_id_to_ca_label(int speaker_id); AudioChannelLabel mp_speaker_id_to_ca_label(int speaker_id);
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
AudioChannelLayout *ca_find_standard_layout(void *talloc_ctx, AudioChannelLayout *l); AudioChannelLayout *ca_find_standard_layout(void *talloc_ctx, AudioChannelLayout *l);
void ca_log_layout(struct ao *ao, int l, AudioChannelLayout *layout); void ca_log_layout(struct ao *ao, int l, AudioChannelLayout *layout);
bool ca_init_chmap(struct ao *ao, AudioDeviceID device); bool ca_init_chmap(struct ao *ao, AudioDeviceID device);

5
audio/out/ao_coreaudio_properties.h
View File

@ -23,11 +23,6 @@
#include "internal.h" #include "internal.h"
#if HAVE_AVFOUNDATION
#undef HAVE_COREAUDIO
#define HAVE_COREAUDIO 1
#endif
// CoreAudio names are way too verbose // CoreAudio names are way too verbose
#define ca_sel AudioObjectPropertySelector #define ca_sel AudioObjectPropertySelector
#define ca_scope AudioObjectPropertyScope #define ca_scope AudioObjectPropertyScope

8
audio/out/ao_coreaudio_utils.c
View File

@ -28,14 +28,14 @@
#include "osdep/semaphore.h" #include "osdep/semaphore.h"
#include "audio/format.h" #include "audio/format.h"
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
#include "audio/out/ao_coreaudio_properties.h" #include "audio/out/ao_coreaudio_properties.h"
#include <CoreAudio/HostTime.h> #include <CoreAudio/HostTime.h>
#else #else
#include <mach/mach_time.h> #include <mach/mach_time.h>
#endif #endif
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
static bool ca_is_output_device(struct ao *ao, AudioDeviceID dev) static bool ca_is_output_device(struct ao *ao, AudioDeviceID dev)
{ {
size_t n_buffers; size_t n_buffers;
@ -300,7 +300,7 @@ int64_t ca_frames_to_ns(struct ao *ao, uint32_t frames)
int64_t ca_get_latency(const AudioTimeStamp *ts) int64_t ca_get_latency(const AudioTimeStamp *ts)
{ {
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
uint64_t out = AudioConvertHostTimeToNanos(ts->mHostTime); uint64_t out = AudioConvertHostTimeToNanos(ts->mHostTime);
uint64_t now = AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()); uint64_t now = AudioConvertHostTimeToNanos(AudioGetCurrentHostTime());
@ -323,7 +323,7 @@ int64_t ca_get_latency(const AudioTimeStamp *ts)
#endif #endif
} }
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
bool ca_stream_supports_compressed(struct ao *ao, AudioStreamID stream) bool ca_stream_supports_compressed(struct ao *ao, AudioStreamID stream)
{ {
AudioStreamRangedDescription *formats = NULL; AudioStreamRangedDescription *formats = NULL;

9
audio/out/ao_coreaudio_utils.h
View File

@ -29,11 +29,6 @@
#include "internal.h" #include "internal.h"
#include "osdep/utils-mac.h" #include "osdep/utils-mac.h"
#if HAVE_AVFOUNDATION
#undef HAVE_COREAUDIO
#define HAVE_COREAUDIO 1
#endif
bool check_ca_st(struct ao *ao, int level, OSStatus code, const char *message); bool check_ca_st(struct ao *ao, int level, OSStatus code, const char *message);
#define CHECK_CA_ERROR_L(label, message) \ #define CHECK_CA_ERROR_L(label, message) \
@ -52,7 +47,7 @@ bool check_ca_st(struct ao *ao, int level, OSStatus code, const char *message);
} while (0) } while (0)
void ca_get_device_list(struct ao *ao, struct ao_device_list *list); void ca_get_device_list(struct ao *ao, struct ao_device_list *list);
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
OSStatus ca_select_device(struct ao *ao, char* name, AudioDeviceID *device); OSStatus ca_select_device(struct ao *ao, char* name, AudioDeviceID *device);
#endif #endif
@ -70,7 +65,7 @@ bool ca_asbd_is_better(AudioStreamBasicDescription *req,
int64_t ca_frames_to_ns(struct ao *ao, uint32_t frames); int64_t ca_frames_to_ns(struct ao *ao, uint32_t frames);
int64_t ca_get_latency(const AudioTimeStamp *ts); int64_t ca_get_latency(const AudioTimeStamp *ts);
#if HAVE_COREAUDIO #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
bool ca_stream_supports_compressed(struct ao *ao, AudioStreamID stream); bool ca_stream_supports_compressed(struct ao *ao, AudioStreamID stream);
OSStatus ca_lock_device(AudioDeviceID device, pid_t *pid); OSStatus ca_lock_device(AudioDeviceID device, pid_t *pid);
OSStatus ca_unlock_device(AudioDeviceID device, pid_t *pid); OSStatus ca_unlock_device(AudioDeviceID device, pid_t *pid);