mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

wasapisrc: Clarify that nBlockAlign is actually bpf

Browse source 
bpf = bytes per frame.
This commit is contained in:
Nirbheek Chauhan 2019-11-25 21:16:05 +05:30 committed by GStreamer Merge Bot
parent 6d27c0ac08
commit 5d9c060ca7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/wasapi/gstwasapisrc.c
View file

@ -555,6 +555,7 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length,
HRESULT hr; HRESULT hr;
gint16 *from = NULL; gint16 *from = NULL;
guint wanted = length; guint wanted = length;
guint bpf;
DWORD flags; DWORD flags;
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
@ -564,6 +565,8 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length,
GST_OBJECT_UNLOCK (self); goto err); GST_OBJECT_UNLOCK (self); goto err);
self->client_needs_restart = FALSE; self->client_needs_restart = FALSE;
} }
bpf = self->mix_format->nBlockAlign;
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
while (wanted > 0) { while (wanted > 0) {
@ -603,7 +606,7 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length,
if (flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) if (flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)
GST_WARNING_OBJECT (self, "WASAPI reported glitch in buffer"); GST_WARNING_OBJECT (self, "WASAPI reported glitch in buffer");
want_frames = wanted / self->mix_format->nBlockAlign; want_frames = wanted / bpf;
/* If GetBuffer is returning more frames than we can handle, all we can do is /* If GetBuffer is returning more frames than we can handle, all we can do is
* hope that this is temporary and that things will settle down later. */ * hope that this is temporary and that things will settle down later. */
@ -613,14 +616,11 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length,
/* Only copy data that will fit into the allocated buffer of size @length */ /* Only copy data that will fit into the allocated buffer of size @length */
n_frames = MIN (have_frames, want_frames); n_frames = MIN (have_frames, want_frames);
read_len = n_frames * self->mix_format->nBlockAlign; read_len = n_frames * bpf;
{ GST_DEBUG_OBJECT (self, "have: %i (%i bytes), can read: %i (%i bytes), "
guint bpf = self->mix_format->nBlockAlign; "will read: %i (%i bytes)", have_frames, have_frames * bpf,
GST_DEBUG_OBJECT (self, "have: %i (%i bytes), can read: %i (%i bytes), " want_frames, wanted, n_frames, read_len);
"will read: %i (%i bytes)", have_frames, have_frames * bpf,
want_frames, wanted, n_frames, read_len);
}
memcpy (data, from, read_len); memcpy (data, from, read_len);
wanted -= read_len; wanted -= read_len;