diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-11-25 21:16:05 +0530 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2019-11-28 10:43:27 +0000 |
commit | 0ac8ebdcd3a7a43e81c7716dc333f81082e32abb (patch) | |
tree | ca215070ef43c68c851365ed671616aa194fbfaf /sys | |
parent | 96956cf4f2a761fd1de91a953c35147b9d13c62a (diff) | |
download | gstreamer-plugins-bad-0ac8ebdcd3a7a43e81c7716dc333f81082e32abb.tar.gz |
wasapisrc: Clarify that nBlockAlign is actually bpf
bpf = bytes per frame.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/wasapi/gstwasapisrc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/wasapi/gstwasapisrc.c b/sys/wasapi/gstwasapisrc.c index e52ea7e98..d02283584 100644 --- a/sys/wasapi/gstwasapisrc.c +++ b/sys/wasapi/gstwasapisrc.c @@ -557,6 +557,7 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length, HRESULT hr; gint16 *from = NULL; guint wanted = length; + guint bpf; DWORD flags; GST_OBJECT_LOCK (self); @@ -566,6 +567,8 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length, GST_OBJECT_UNLOCK (self); goto err); self->client_needs_restart = FALSE; } + + bpf = self->mix_format->nBlockAlign; GST_OBJECT_UNLOCK (self); while (wanted > 0) { @@ -605,7 +608,7 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length, if (flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) 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 * hope that this is temporary and that things will settle down later. */ @@ -615,14 +618,11 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length, /* Only copy data that will fit into the allocated buffer of size @length */ n_frames = MIN (have_frames, want_frames); - read_len = n_frames * self->mix_format->nBlockAlign; + read_len = n_frames * bpf; - { - guint bpf = self->mix_format->nBlockAlign; - GST_DEBUG_OBJECT (self, "have: %i (%i bytes), can read: %i (%i bytes), " - "will read: %i (%i bytes)", have_frames, have_frames * bpf, - want_frames, wanted, n_frames, read_len); - } + GST_DEBUG_OBJECT (self, "have: %i (%i bytes), can read: %i (%i bytes), " + "will read: %i (%i bytes)", have_frames, have_frames * bpf, + want_frames, wanted, n_frames, read_len); memcpy (data, from, read_len); wanted -= read_len; |