mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-31 11:08:52 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef foosinkinputhfoo
|
||||
#define foosinkinputhfoo
|
||||
#ifndef foopulsesinkinputhfoo
|
||||
#define foopulsesinkinputhfoo
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
|
|
@ -39,20 +39,32 @@ typedef struct pa_sink_input pa_sink_input;
|
|||
#include <pulsecore/core.h>
|
||||
|
||||
typedef enum pa_sink_input_state {
|
||||
PA_SINK_INPUT_RUNNING, /*< The stream is alive and kicking */
|
||||
PA_SINK_INPUT_INIT, /*< The stream is not active yet, because pa_sink_put() has not been called yet */
|
||||
PA_SINK_INPUT_DRAINED, /*< The stream stopped playing because there was no data to play */
|
||||
PA_SINK_INPUT_RUNNING, /*< The stream is alive and kicking */
|
||||
PA_SINK_INPUT_CORKED, /*< The stream was corked on user request */
|
||||
PA_SINK_INPUT_DISCONNECTED /*< The stream is dead */
|
||||
PA_SINK_INPUT_UNLINKED /*< The stream is dead */
|
||||
} pa_sink_input_state_t;
|
||||
|
||||
static inline pa_bool_t PA_SINK_INPUT_LINKED(pa_sink_input_state_t x) {
|
||||
return x == PA_SINK_INPUT_DRAINED || x == PA_SINK_INPUT_RUNNING || x == PA_SINK_INPUT_CORKED;
|
||||
}
|
||||
|
||||
typedef enum pa_sink_input_flags {
|
||||
PA_SINK_INPUT_VARIABLE_RATE = 1,
|
||||
PA_SINK_INPUT_NO_HOOKS = 2
|
||||
PA_SINK_INPUT_DONT_MOVE = 2,
|
||||
PA_SINK_INPUT_START_CORKED = 4
|
||||
} pa_sink_input_flags_t;
|
||||
|
||||
struct pa_sink_input {
|
||||
int ref;
|
||||
pa_msgobject parent;
|
||||
|
||||
uint32_t index;
|
||||
pa_core *core;
|
||||
|
||||
/* Please note that this state should only be read with
|
||||
* pa_sink_input_get_state(). That function will transparently
|
||||
* merge the thread_info.drained value in. */
|
||||
pa_sink_input_state_t state;
|
||||
pa_sink_input_flags_t flags;
|
||||
|
||||
|
|
@ -64,27 +76,87 @@ struct pa_sink_input {
|
|||
|
||||
pa_sample_spec sample_spec;
|
||||
pa_channel_map channel_map;
|
||||
|
||||
pa_sink_input *sync_prev, *sync_next;
|
||||
|
||||
pa_cvolume volume;
|
||||
pa_bool_t muted;
|
||||
|
||||
/* Some silence to play before the actual data. This is used to
|
||||
* compensate for latency differences when moving a sink input
|
||||
* "hot" between sinks. */
|
||||
size_t move_silence;
|
||||
/* Returns the chunk of audio data (but doesn't drop it
|
||||
* yet!). Returns -1 on failure. Called from IO thread context. If
|
||||
* data needs to be generated from scratch then please in the
|
||||
* specified length. This is an optimization only. If less data is
|
||||
* available, it's fine to return a smaller block. If more data is
|
||||
* already ready, it is better to return the full block.*/
|
||||
int (*peek) (pa_sink_input *i, size_t length, pa_memchunk *chunk);
|
||||
|
||||
int (*peek) (pa_sink_input *i, pa_memchunk *chunk);
|
||||
void (*drop) (pa_sink_input *i, const pa_memchunk *chunk, size_t length);
|
||||
/* Drops the specified number of bytes, usually called right after
|
||||
* peek(), but not necessarily. Called from IO thread context. */
|
||||
void (*drop) (pa_sink_input *i, size_t length);
|
||||
|
||||
/* If non-NULL this function is called when the input is first
|
||||
* connected to a sink or when the rtpoll/asyncmsgq fields
|
||||
* change. You usually don't need to implement this function
|
||||
* unless you rewrite a sink that is piggy-backed onto
|
||||
* another. Called from IO thread context */
|
||||
void (*attach) (pa_sink_input *i); /* may be NULL */
|
||||
|
||||
/* If non-NULL this function is called when the output is
|
||||
* disconnected from its sink. Called from IO thread context */
|
||||
void (*detach) (pa_sink_input *i); /* may be NULL */
|
||||
|
||||
/* If non-NULL called whenever the the sink this input is attached
|
||||
* to suspends or resumes. Called from main context */
|
||||
void (*suspend) (pa_sink_input *i, int b); /* may be NULL */
|
||||
|
||||
/* Supposed to unlink and destroy this stream. Called from main
|
||||
* context. */
|
||||
void (*kill) (pa_sink_input *i); /* may be NULL */
|
||||
|
||||
/* Return the current latency (i.e. length of bufferd audio) of
|
||||
this stream. Called from main context. If NULL a
|
||||
PA_SINK_INPUT_MESSAGE_GET_LATENCY message is sent to the IO thread
|
||||
instead. */
|
||||
pa_usec_t (*get_latency) (pa_sink_input *i); /* may be NULL */
|
||||
void (*underrun) (pa_sink_input *i); /* may be NULL */
|
||||
|
||||
void *userdata;
|
||||
|
||||
pa_memchunk resampled_chunk;
|
||||
pa_resampler *resampler; /* may be NULL */
|
||||
|
||||
pa_resample_method_t resample_method;
|
||||
|
||||
pa_memblock *silence_memblock; /* may be NULL */
|
||||
struct {
|
||||
pa_sink_input_state_t state;
|
||||
pa_atomic_t drained;
|
||||
|
||||
pa_bool_t attached; /* True only between ->attach() and ->detach() calls */
|
||||
|
||||
pa_sample_spec sample_spec;
|
||||
|
||||
pa_memchunk resampled_chunk;
|
||||
pa_resampler *resampler; /* may be NULL */
|
||||
|
||||
/* Some silence to play before the actual data. This is used to
|
||||
* compensate for latency differences when moving a sink input
|
||||
* "hot" between sinks. */
|
||||
size_t move_silence;
|
||||
pa_memblock *silence_memblock; /* may be NULL */
|
||||
|
||||
pa_sink_input *sync_prev, *sync_next;
|
||||
|
||||
pa_cvolume volume;
|
||||
pa_bool_t muted;
|
||||
} thread_info;
|
||||
|
||||
void *userdata;
|
||||
};
|
||||
|
||||
PA_DECLARE_CLASS(pa_sink_input);
|
||||
#define PA_SINK_INPUT(o) pa_sink_input_cast(o)
|
||||
|
||||
enum {
|
||||
PA_SINK_INPUT_MESSAGE_SET_VOLUME,
|
||||
PA_SINK_INPUT_MESSAGE_SET_MUTE,
|
||||
PA_SINK_INPUT_MESSAGE_GET_LATENCY,
|
||||
PA_SINK_INPUT_MESSAGE_SET_RATE,
|
||||
PA_SINK_INPUT_MESSAGE_SET_STATE,
|
||||
PA_SINK_INPUT_MESSAGE_MAX
|
||||
};
|
||||
|
||||
typedef struct pa_sink_input_new_data {
|
||||
|
|
@ -95,50 +167,71 @@ typedef struct pa_sink_input_new_data {
|
|||
pa_sink *sink;
|
||||
|
||||
pa_sample_spec sample_spec;
|
||||
int sample_spec_is_set;
|
||||
pa_bool_t sample_spec_is_set;
|
||||
pa_channel_map channel_map;
|
||||
int channel_map_is_set;
|
||||
pa_bool_t channel_map_is_set;
|
||||
|
||||
pa_cvolume volume;
|
||||
int volume_is_set;
|
||||
pa_bool_t volume_is_set;
|
||||
pa_bool_t muted;
|
||||
pa_bool_t muted_is_set;
|
||||
|
||||
pa_resample_method_t resample_method;
|
||||
|
||||
pa_sink_input *sync_base;
|
||||
} pa_sink_input_new_data;
|
||||
|
||||
pa_sink_input_new_data* pa_sink_input_new_data_init(pa_sink_input_new_data *data);
|
||||
void pa_sink_input_new_data_set_sample_spec(pa_sink_input_new_data *data, const pa_sample_spec *spec);
|
||||
void pa_sink_input_new_data_set_channel_map(pa_sink_input_new_data *data, const pa_channel_map *map);
|
||||
void pa_sink_input_new_data_set_volume(pa_sink_input_new_data *data, const pa_cvolume *volume);
|
||||
void pa_sink_input_new_data_set_muted(pa_sink_input_new_data *data, pa_bool_t mute);
|
||||
|
||||
/* To be called by the implementing module only */
|
||||
|
||||
pa_sink_input* pa_sink_input_new(
|
||||
pa_core *core,
|
||||
pa_sink_input_new_data *data,
|
||||
pa_sink_input_flags_t flags);
|
||||
|
||||
void pa_sink_input_unref(pa_sink_input* i);
|
||||
pa_sink_input* pa_sink_input_ref(pa_sink_input* i);
|
||||
void pa_sink_input_put(pa_sink_input *i);
|
||||
void pa_sink_input_unlink(pa_sink_input* i);
|
||||
|
||||
/* To be called by the implementing module only */
|
||||
void pa_sink_input_disconnect(pa_sink_input* i);
|
||||
void pa_sink_input_set_name(pa_sink_input *i, const char *name);
|
||||
|
||||
/* External code may request disconnection with this funcion */
|
||||
/* Callable by everyone */
|
||||
|
||||
/* External code may request disconnection with this function */
|
||||
void pa_sink_input_kill(pa_sink_input*i);
|
||||
|
||||
pa_usec_t pa_sink_input_get_latency(pa_sink_input *i);
|
||||
|
||||
int pa_sink_input_peek(pa_sink_input *i, pa_memchunk *chunk, pa_cvolume *volume);
|
||||
void pa_sink_input_drop(pa_sink_input *i, const pa_memchunk *chunk, size_t length);
|
||||
|
||||
void pa_sink_input_set_volume(pa_sink_input *i, const pa_cvolume *volume);
|
||||
const pa_cvolume * pa_sink_input_get_volume(pa_sink_input *i);
|
||||
const pa_cvolume *pa_sink_input_get_volume(pa_sink_input *i);
|
||||
void pa_sink_input_set_mute(pa_sink_input *i, pa_bool_t mute);
|
||||
int pa_sink_input_get_mute(pa_sink_input *i);
|
||||
|
||||
void pa_sink_input_cork(pa_sink_input *i, int b);
|
||||
void pa_sink_input_cork(pa_sink_input *i, pa_bool_t b);
|
||||
|
||||
void pa_sink_input_set_rate(pa_sink_input *i, uint32_t rate);
|
||||
|
||||
void pa_sink_input_set_name(pa_sink_input *i, const char *name);
|
||||
int pa_sink_input_set_rate(pa_sink_input *i, uint32_t rate);
|
||||
|
||||
pa_resample_method_t pa_sink_input_get_resample_method(pa_sink_input *i);
|
||||
|
||||
int pa_sink_input_move_to(pa_sink_input *i, pa_sink *dest, int immediately);
|
||||
|
||||
pa_sink_input_state_t pa_sink_input_get_state(pa_sink_input *i);
|
||||
|
||||
/* To be used exclusively by the sink driver thread */
|
||||
|
||||
int pa_sink_input_peek(pa_sink_input *i, size_t length, pa_memchunk *chunk, pa_cvolume *volume);
|
||||
void pa_sink_input_drop(pa_sink_input *i, size_t length);
|
||||
int pa_sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk);
|
||||
|
||||
typedef struct pa_sink_input_move_info {
|
||||
pa_sink_input *sink_input;
|
||||
pa_sink_input *ghost_sink_input;
|
||||
pa_memblockq *buffer;
|
||||
size_t buffer_bytes;
|
||||
} pa_sink_input_move_info;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue