mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-14 06:59:53 -05:00
add new latency argument
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2224 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
0f9e977110
commit
ad18107223
1 changed files with 23 additions and 4 deletions
|
|
@ -71,6 +71,8 @@ static int channel_map_set = 0;
|
||||||
|
|
||||||
static pa_stream_flags_t flags = 0;
|
static pa_stream_flags_t flags = 0;
|
||||||
|
|
||||||
|
static size_t latency = 0;
|
||||||
|
|
||||||
/* A shortcut for terminating the application */
|
/* A shortcut for terminating the application */
|
||||||
static void quit(int ret) {
|
static void quit(int ret) {
|
||||||
assert(mainloop_api);
|
assert(mainloop_api);
|
||||||
|
|
@ -229,6 +231,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
|
||||||
|
|
||||||
case PA_CONTEXT_READY: {
|
case PA_CONTEXT_READY: {
|
||||||
int r;
|
int r;
|
||||||
|
pa_buffer_attr buffer_attr;
|
||||||
|
|
||||||
assert(c);
|
assert(c);
|
||||||
assert(!stream);
|
assert(!stream);
|
||||||
|
|
@ -247,15 +250,21 @@ static void context_state_callback(pa_context *c, void *userdata) {
|
||||||
pa_stream_set_suspended_callback(stream, stream_suspended_callback, NULL);
|
pa_stream_set_suspended_callback(stream, stream_suspended_callback, NULL);
|
||||||
pa_stream_set_moved_callback(stream, stream_moved_callback, NULL);
|
pa_stream_set_moved_callback(stream, stream_moved_callback, NULL);
|
||||||
|
|
||||||
|
if (latency > 0) {
|
||||||
|
memset(&buffer_attr, 0, sizeof(buffer_attr));
|
||||||
|
buffer_attr.tlength = latency;
|
||||||
|
flags |= PA_STREAM_ADJUST_LATENCY;
|
||||||
|
}
|
||||||
|
|
||||||
if (mode == PLAYBACK) {
|
if (mode == PLAYBACK) {
|
||||||
pa_cvolume cv;
|
pa_cvolume cv;
|
||||||
if ((r = pa_stream_connect_playback(stream, device, NULL, flags, pa_cvolume_set(&cv, sample_spec.channels, volume), NULL)) < 0) {
|
if ((r = pa_stream_connect_playback(stream, device, latency > 0 ? &buffer_attr : NULL, flags, pa_cvolume_set(&cv, sample_spec.channels, volume), NULL)) < 0) {
|
||||||
fprintf(stderr, "pa_stream_connect_playback() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
fprintf(stderr, "pa_stream_connect_playback() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if ((r = pa_stream_connect_record(stream, device, NULL, flags)) < 0) {
|
if ((r = pa_stream_connect_record(stream, device, latency > 0 ? &buffer_attr : NULL, flags)) < 0) {
|
||||||
fprintf(stderr, "pa_stream_connect_record() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
fprintf(stderr, "pa_stream_connect_record() failed: %s\n", pa_strerror(pa_context_errno(c)));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
@ -478,6 +487,7 @@ static void help(const char *argv0) {
|
||||||
" from the sink the stream is being connected to.\n"
|
" from the sink the stream is being connected to.\n"
|
||||||
" --no-remix Don't upmix or downmix channels.\n"
|
" --no-remix Don't upmix or downmix channels.\n"
|
||||||
" --no-remap Map channels by index instead of name.\n"
|
" --no-remap Map channels by index instead of name.\n"
|
||||||
|
" --latency=BYTES Request the specified latency in bytes.\n"
|
||||||
,
|
,
|
||||||
argv0);
|
argv0);
|
||||||
}
|
}
|
||||||
|
|
@ -494,7 +504,8 @@ enum {
|
||||||
ARG_FIX_RATE,
|
ARG_FIX_RATE,
|
||||||
ARG_FIX_CHANNELS,
|
ARG_FIX_CHANNELS,
|
||||||
ARG_NO_REMAP,
|
ARG_NO_REMAP,
|
||||||
ARG_NO_REMIX
|
ARG_NO_REMIX,
|
||||||
|
ARG_LATENCY
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
|
|
@ -523,6 +534,7 @@ int main(int argc, char *argv[]) {
|
||||||
{"fix-channels",0, NULL, ARG_FIX_CHANNELS},
|
{"fix-channels",0, NULL, ARG_FIX_CHANNELS},
|
||||||
{"no-remap", 0, NULL, ARG_NO_REMAP},
|
{"no-remap", 0, NULL, ARG_NO_REMAP},
|
||||||
{"no-remix", 0, NULL, ARG_NO_REMIX},
|
{"no-remix", 0, NULL, ARG_NO_REMIX},
|
||||||
|
{"latency", 0, NULL, ARG_LATENCY},
|
||||||
{NULL, 0, NULL, 0}
|
{NULL, 0, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -601,7 +613,7 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
case ARG_CHANNELMAP:
|
case ARG_CHANNELMAP:
|
||||||
if (!pa_channel_map_parse(&channel_map, optarg)) {
|
if (!pa_channel_map_parse(&channel_map, optarg)) {
|
||||||
fprintf(stderr, "Invalid channel map\n");
|
fprintf(stderr, "Invalid channel map '%s'\n", optarg);
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -628,6 +640,13 @@ int main(int argc, char *argv[]) {
|
||||||
flags |= PA_STREAM_NO_REMAP_CHANNELS;
|
flags |= PA_STREAM_NO_REMAP_CHANNELS;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ARG_LATENCY:
|
||||||
|
if (((latency = atoi(optarg))) <= 0) {
|
||||||
|
fprintf(stderr, "Invallid latency specification '%s'\n", optarg);
|
||||||
|
goto quit;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
goto quit;
|
goto quit;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue