diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-05-27 14:31:55 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-02 16:57:35 +0530 |
| commit | f06c2fe05102419bd70c64e93880e37b7319313a (patch) | |
| tree | 7c0791705ff9edbeee7ae1546017571cb096db71 | |
| parent | 8c48ccab9711a19a647814ab57c00736ae80ffc1 (diff) | |
| download | gstreamer-plugins-bad-f06c2fe05102419bd70c64e93880e37b7319313a.tar.gz | |
wasapisink: fix regression in shared mode segment size
In commit fd806628a8 (839cc3926 in the stable branch) I changed the
segment size to match exactly the buffer size. I missed that this is
only valid in exclusive mode and in shared mode the buffer size is
a multiple of the device period.
Revert the logic for the shared mode.
https://bugzilla.gnome.org/show_bug.cgi?id=796354
https://bugzilla.gnome.org/show_bug.cgi?id=796858
| -rw-r--r-- | sys/wasapi/gstwasapiutil.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/wasapi/gstwasapiutil.c b/sys/wasapi/gstwasapiutil.c index e09d1364e..02b976347 100644 --- a/sys/wasapi/gstwasapiutil.c +++ b/sys/wasapi/gstwasapiutil.c @@ -896,10 +896,16 @@ gst_wasapi_util_initialize_audioclient (GstElement * self, } HR_FAILED_RET (hr, IAudioClient::Initialize, FALSE); - hr = IAudioClient_GetBufferSize (client, &n_frames); - HR_FAILED_RET (hr, IAudioClient::GetBufferSize, FALSE); + if (sharemode == AUDCLNT_SHAREMODE_EXCLUSIVE) { + /* We use the device period for the segment size and that needs to match + * the buffer size exactly when we write into it */ + hr = IAudioClient_GetBufferSize (client, &n_frames); + HR_FAILED_RET (hr, IAudioClient::GetBufferSize, FALSE); - *ret_devicep_frames = n_frames; + *ret_devicep_frames = n_frames; + } else { + *ret_devicep_frames = (rate * device_period * 100) / GST_SECOND; + } return TRUE; } |