This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from ea5cdcbe52e3e1ac6189fb6472fafe61fbfdd73c (commit)
- Log -----------------------------------------------------------------
d8a90a3 pulse: even in case of record stream, let's initialize req_bytes to 0
3ecb80e bluetooth: fix typo with service_{read,write}_type
fd32fee bluetooth: don't call pa_sink_render with 0 bytes request
-----------------------------------------------------------------------
Summary of changes:
src/modules/bluetooth/module-bluetooth-device.c | 23 ++++++++++++++---------
src/pulse/stream.c | 2 +-
2 files changed, 15 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
commit fd32fee4488b1e06d0a64079485aa77f0c87164b
Author: Marc-André Lureau <[email protected]>
Date: Mon Jul 6 17:50:51 2009 +0300
bluetooth: don't call pa_sink_render with 0 bytes request
diff --git a/src/modules/bluetooth/module-bluetooth-device.c
b/src/modules/bluetooth/module-bluetooth-device.c
index 93b14a1..d983185 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1319,18 +1319,21 @@ static void thread_func(void *userdata) {
if (u->write_index > 0 && audio_to_send >
MAX_PLAYBACK_CATCH_UP_USEC) {
pa_usec_t skip_usec;
uint64_t skip_bytes;
- pa_memchunk tmp;
skip_usec = audio_to_send -
MAX_PLAYBACK_CATCH_UP_USEC;
skip_bytes = pa_usec_to_bytes(skip_usec,
&u->sample_spec);
- pa_log_warn("Skipping %llu us (= %llu bytes) in
audio stream",
- (unsigned long long) skip_usec,
- (unsigned long long) skip_bytes);
+ if (skip_bytes > 0) {
+ pa_memchunk tmp;
- pa_sink_render_full(u->sink, skip_bytes, &tmp);
- pa_memblock_unref(tmp.memblock);
- u->write_index += skip_bytes;
+ pa_log_warn("Skipping %llu us (= %llu bytes)
in audio stream",
+ (unsigned long long) skip_usec,
+ (unsigned long long) skip_bytes);
+
+ pa_sink_render_full(u->sink, skip_bytes, &tmp);
+ pa_memblock_unref(tmp.memblock);
+ u->write_index += skip_bytes;
+ }
}
do_write = 1;
commit 3ecb80e19ab9aa678b7db6a5068553d956d707fa
Author: Marc-André Lureau <[email protected]>
Date: Mon Jul 20 13:44:27 2009 +0300
bluetooth: fix typo with service_{read,write}_type
diff --git a/src/modules/bluetooth/module-bluetooth-device.c
b/src/modules/bluetooth/module-bluetooth-device.c
index d983185..5f119c7 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1739,7 +1739,8 @@ static void shutdown_bt(struct userdata *u) {
if (u->service_fd >= 0) {
pa_close(u->service_fd);
u->service_fd = -1;
- u->service_write_type = u->service_write_type = 0;
+ u->service_write_type = 0;
+ u->service_read_type = 0;
}
if (u->write_memchunk.memblock) {
@@ -1755,7 +1756,8 @@ static int init_bt(struct userdata *u) {
shutdown_bt(u);
u->stream_write_type = 0;
- u->service_write_type = u->service_write_type = 0;
+ u->service_write_type = 0;
+ u->service_read_type = 0;
if ((u->service_fd = bt_audio_service_open()) < 0) {
pa_log_error("Couldn't connect to bluetooth audio service");
commit d8a90a390041b5603a7caacaaea8296fa76363bc
Author: Marc-André Lureau <[email protected]>
Date: Mon Jul 20 13:53:17 2009 +0300
pulse: even in case of record stream, let's initialize req_bytes to 0
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 72d49e1..2bc2b1e 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -867,7 +867,7 @@ static void automatic_buffer_attr(pa_stream *s,
pa_buffer_attr *attr, const pa_s
void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, uint32_t
tag, pa_tagstruct *t, void *userdata) {
pa_stream *s = userdata;
- uint32_t requested_bytes;
+ uint32_t requested_bytes = 0;
pa_assert(pd);
pa_assert(s);
--
hooks/post-receive
PulseAudio Sound Server
_______________________________________________
pulseaudio-commits mailing list
[email protected]
https://tango.0pointer.de/mailman/listinfo/pulseaudio-commits
