From 6d256d9908e292f6c593bf45e69354f6b613cc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 6 Apr 2017 16:13:41 +0300 Subject: [PATCH] directsoundsrc: Correctly calculate segsize and segtotal segsize should be based on latency-time, and must be a multiple of the frame size. segtotal should be based on buffer-time and segsize. This prevents errors caused by outputting buffers that are not a multiple of the frame size, and actually makes the buffer-time and latency-time properties do what they're supposed to do. --- sys/directsound/gstdirectsoundsrc.c | 30 ++++++++++++++--------------- sys/directsound/gstdirectsoundsrc.h | 2 -- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/sys/directsound/gstdirectsoundsrc.c b/sys/directsound/gstdirectsoundsrc.c index 3977466412..3bb62fdcde 100644 --- a/sys/directsound/gstdirectsoundsrc.c +++ b/sys/directsound/gstdirectsoundsrc.c @@ -564,22 +564,20 @@ gst_directsound_src_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec) GST_WARNING ("buffer-time was less than latency"); } - /* Save the times */ - dsoundsrc->buffer_time = spec->buffer_time; - dsoundsrc->latency_time = spec->latency_time; + spec->segsize = + gst_util_uint64_scale (spec->latency_time, wfx.nAvgBytesPerSec, 1000000); + if (spec->segsize < GST_AUDIO_INFO_BPF (&spec->info)) + spec->segsize = GST_AUDIO_INFO_BPF (&spec->info); + else if (spec->segsize % GST_AUDIO_INFO_BPF (&spec->info) != 0) + spec->segsize = + ((spec->segsize + GST_AUDIO_INFO_BPF (&spec->info) - + 1) / GST_AUDIO_INFO_BPF (&spec->info)) * + GST_AUDIO_INFO_BPF (&spec->info); - dsoundsrc->latency_size = (gint) wfx.nAvgBytesPerSec * - dsoundsrc->latency_time / 1000000.0; - - spec->segsize = (guint) (((double) spec->buffer_time / 1000000.0) * - wfx.nAvgBytesPerSec); - - /* just in case */ - if (spec->segsize < 1) - spec->segsize = 1; - - spec->segtotal = GST_AUDIO_INFO_BPF (&spec->info) * 8 * - (wfx.nAvgBytesPerSec / spec->segsize); + dsoundsrc->latency_time = + gst_util_uint64_scale (spec->segsize, 1000000, + GST_AUDIO_INFO_BPF (&spec->info) * GST_AUDIO_INFO_RATE (&spec->info)); + spec->segtotal = spec->buffer_time / dsoundsrc->latency_time; GST_DEBUG_OBJECT (asrc, "bytes/sec: %lu, buffer size: %d, segsize: %d, segtotal: %d", @@ -818,7 +816,7 @@ gst_directsound_src_mixer_find (GstDirectSoundSrc * dsoundsrc, if (mmres != MMSYSERR_NOERROR) continue; - mmres = mixerGetDevCaps ((UINT_PTR)dsoundsrc->mixer, + mmres = mixerGetDevCaps ((UINT_PTR) dsoundsrc->mixer, mixer_caps, sizeof (MIXERCAPS)); if (mmres != MMSYSERR_NOERROR) { diff --git a/sys/directsound/gstdirectsoundsrc.h b/sys/directsound/gstdirectsoundsrc.h index 9aa225fb3c..31218976dd 100644 --- a/sys/directsound/gstdirectsoundsrc.h +++ b/sys/directsound/gstdirectsoundsrc.h @@ -86,10 +86,8 @@ struct _GstDirectSoundSrc DWORD notifysize; guint buffer_size; - guint latency_size; guint bytes_per_sample; - guint buffer_time; guint latency_time; HMIXER mixer;