mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

opensles: produces expected output until ringbuffer wraps

Browse source 
Add some log messages.
Fixed a bit the _player_cb function and properly advance reding in the
ringbuffer.
Still produces noise when the ringbuffer wraps.
This commit is contained in:
Josep Torra 2012-09-20 10:41:50 +02:00 committed by Sebastian Dröge
parent f6aa2f29bc
commit 805a010dc9
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/opensles/openslesringbuffer.c
View file

@ -297,7 +297,8 @@ _opensles_player_cb (SLAndroidSimpleBufferQueueItf bufferQueue, void *context)
} }
/* Enqueue a buffer */ /* Enqueue a buffer */
GST_LOG_OBJECT (thiz, "enqueue: %p size %d", readptr, len); GST_LOG_OBJECT (thiz, "enqueue: %p size %d segment: %d",
readptr, len, readseg);
result = (*thiz->bufferQueue)->Enqueue (thiz->bufferQueue, readptr, len); result = (*thiz->bufferQueue)->Enqueue (thiz->bufferQueue, readptr, len);
if (result != SL_RESULT_SUCCESS) { if (result != SL_RESULT_SUCCESS) {
@ -306,15 +307,14 @@ _opensles_player_cb (SLAndroidSimpleBufferQueueItf bufferQueue, void *context)
return; return;
} }
if (thiz->last_readseg != readseg) { if (thiz->last_readseg >= 0) {
if (thiz->last_readseg >= 0) { GST_LOG_OBJECT (thiz, "clear segment %d", thiz->last_readseg);
/* Clear written samples */ /* Clear written samples */
gst_ring_buffer_clear (rb, readseg); gst_ring_buffer_clear (rb, thiz->last_readseg);
/* We wrote one segment */ /* We wrote one segment */
gst_ring_buffer_advance (rb, 1);
}
thiz->last_readseg = readseg;
} }
gst_ring_buffer_advance (rb, 1);
thiz->last_readseg = readseg;
} }
static gboolean static gboolean
@ -326,7 +326,7 @@ _opensles_player_acquire (GstRingBuffer * rb, guint nbuffers,
/* Configure audio source */ /* Configure audio source */
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = SLDataLocator_AndroidSimpleBufferQueue loc_bufq =
{ SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, nbuffers }; { SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2 };
SLDataSource audioSrc = { &loc_bufq, format }; SLDataSource audioSrc = { &loc_bufq, format };
/* Configure audio sink */ /* Configure audio sink */
@ -578,7 +578,7 @@ gst_opensles_ringbuffer_acquire (GstRingBuffer * rb, GstRingBufferSpec * spec)
spec->segsize = spec->segsize =
(spec->latency_time * spec->rate / G_USEC_PER_SEC) * (spec->latency_time * spec->rate / G_USEC_PER_SEC) *
spec->bytes_per_sample; spec->bytes_per_sample;
spec->segtotal = MAX (2, spec->buffer_time / spec->latency_time); spec->segtotal = (spec->buffer_time / spec->latency_time) << 4;
thiz->last_readseg = -1; thiz->last_readseg = -1;
/* Define the format in OpenSL ES terms */ /* Define the format in OpenSL ES terms */