X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/382b8294e3e0b2f708ee59c2023f133f7bfbd2f6..91224484b16b1643d75e4a0f6ceb69eae1bf6023:/src/pulsecore/protocol-native.c diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 21a9fe2e..606bf25c 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -555,8 +555,11 @@ static void fix_record_buffer_attr_pre(record_stream *s) { if (s->early_requests) { /* In early request mode we need to emulate the classic - * fragment-based playback model. We do this setting the source - * latency to the fragment size. */ + * fragment-based playback model. Unfortunately we have no + * mechanism to tell the source how often we want it to send us + * data. The next best thing we can do is to set the source's + * total buffer (i.e. its latency) to the fragment size. That + * way it will have to send data at least that often. */ source_usec = fragsize_usec; @@ -584,10 +587,12 @@ static void fix_record_buffer_attr_pre(record_stream *s) { if (s->early_requests) { - /* Ok, we didn't necessarily get what we were asking for, so - * let's tell the user */ + /* Ok, we didn't necessarily get what we were asking for. We + * might still get the proper fragment interval, we just can't + * guarantee it. */ - fragsize_usec = s->configured_source_latency; + if (fragsize_usec != s->configured_source_latency) + pa_log_debug("Could not configure a sufficiently low latency. Early requests might not be satisifed."); } else if (s->adjust_latency) { @@ -963,8 +968,11 @@ static void fix_playback_buffer_attr(playback_stream *s) { if (s->early_requests) { /* In early request mode we need to emulate the classic - * fragment-based playback model. We do this setting the sink - * latency to the fragment size. */ + * fragment-based playback model. Unfortunately we have no + * mechanism to tell the sink how often we want to be queried + * for data. The next best thing we can do is to set the sink's + * total buffer (i.e. its latency) to the fragment size. That + * way it will have to query us at least that often. */ sink_usec = minreq_usec; pa_log_debug("Early requests mode enabled, configuring sink latency to minreq."); @@ -1013,10 +1021,12 @@ static void fix_playback_buffer_attr(playback_stream *s) { if (s->early_requests) { - /* Ok, we didn't necessarily get what we were asking for, so - * let's tell the user */ + /* Ok, we didn't necessarily get what we were asking for. We + * might still get the proper fragment interval, we just can't + * guarantee it. */ - minreq_usec = s->configured_sink_latency; + if (minreq_usec != s->configured_sink_latency) + pa_log_debug("Could not configure a sufficiently low latency. Early requests might not be satisifed."); } else if (s->adjust_latency) { @@ -3366,7 +3376,7 @@ static void sink_input_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_tagstruct_puts(t, pa_resample_method_to_string(pa_sink_input_get_resample_method(s))); pa_tagstruct_puts(t, s->driver); if (c->version >= 11) - pa_tagstruct_put_boolean(t, pa_sink_input_get_mute(s)); + pa_tagstruct_put_boolean(t, s->muted); if (c->version >= 13) pa_tagstruct_put_proplist(t, s->proplist); if (c->version >= 19) @@ -3413,7 +3423,7 @@ static void source_output_fill_tagstruct(pa_native_connection *c, pa_tagstruct * pa_tagstruct_put_boolean(t, (pa_source_output_get_state(s) == PA_SOURCE_OUTPUT_CORKED)); if (c->version >= 22) { pa_tagstruct_put_cvolume(t, &v); - pa_tagstruct_put_boolean(t, pa_source_output_get_mute(s)); + pa_tagstruct_put_boolean(t, s->muted); pa_tagstruct_put_boolean(t, has_volume); pa_tagstruct_put_boolean(t, s->volume_writable); pa_tagstruct_put_format_info(t, s->format); @@ -3491,7 +3501,6 @@ static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, p command == PA_COMMAND_GET_SOURCE_INFO || (idx != PA_INVALID_INDEX || name), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); if (command == PA_COMMAND_GET_SINK_INFO) { if (idx != PA_INVALID_INDEX) @@ -3786,6 +3795,7 @@ static void command_set_volume( pa_strnull(pa_proplist_gets(si->proplist, PA_PROP_MEDIA_NAME))); pa_sink_input_set_volume(si, &volume, true, true); } else if (so) { + CHECK_VALIDITY(c->pstream, so->volume_writable, tag, PA_ERR_BADSTATE); CHECK_VALIDITY(c->pstream, volume.channels == 1 || pa_cvolume_compatible(&volume, &so->sample_spec), tag, PA_ERR_INVALID); pa_log_debug("Client %s changes volume of source output %s.", @@ -4113,7 +4123,7 @@ static void command_update_stream_sample_rate(pa_pdispatch *pd, uint32_t command } CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); - CHECK_VALIDITY(c->pstream, rate > 0 && rate <= PA_RATE_MAX, tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, pa_sample_rate_valid(rate), tag, PA_ERR_INVALID); if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE) { playback_stream *s; @@ -4667,8 +4677,9 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { pa_native_connection *c = PA_NATIVE_CONNECTION(userdata); uint32_t idx = PA_INVALID_INDEX; - const char *name = NULL, *profile = NULL; + const char *name = NULL, *profile_name = NULL; pa_card *card = NULL; + pa_card_profile *profile; int ret; pa_native_connection_assert_ref(c); @@ -4676,7 +4687,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ if (pa_tagstruct_getu32(t, &idx) < 0 || pa_tagstruct_gets(t, &name) < 0 || - pa_tagstruct_gets(t, &profile) < 0 || + pa_tagstruct_gets(t, &profile_name) < 0 || !pa_tagstruct_eof(t)) { protocol_error(c); return; @@ -4685,6 +4696,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); CHECK_VALIDITY(c->pstream, (idx != PA_INVALID_INDEX) ^ (name != NULL), tag, PA_ERR_INVALID); + CHECK_VALIDITY(c->pstream, profile_name, tag, PA_ERR_INVALID); if (idx != PA_INVALID_INDEX) card = pa_idxset_get_by_index(c->protocol->core->cards, idx); @@ -4693,6 +4705,10 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_ CHECK_VALIDITY(c->pstream, card, tag, PA_ERR_NOENTITY); + profile = pa_hashmap_get(card->profiles, profile_name); + + CHECK_VALIDITY(c->pstream, profile, tag, PA_ERR_NOENTITY); + if ((ret = pa_card_set_profile(card, profile, true)) < 0) { pa_pstream_send_error(c->pstream, tag, -ret); return; @@ -4740,7 +4756,7 @@ static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, } else { pa_source *source; - pa_assert(command = PA_COMMAND_SET_SOURCE_PORT); + pa_assert(command == PA_COMMAND_SET_SOURCE_PORT); if (idx != PA_INVALID_INDEX) source = pa_idxset_get_by_index(c->protocol->core->sources, idx); @@ -4775,6 +4791,7 @@ static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command, pa_tagstruct_gets64(t, &offset) < 0 || !pa_tagstruct_eof(t)) { protocol_error(c); + return; } CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS);