[PATCH v2 5/8] winegstreamer: Implement WMA decoder ProcessInput error checks.
Rémi Bernon
rbernon at codeweavers.com
Wed Feb 23 08:46:36 CST 2022
Checking that WMA decoder ignores any incorrectly sized input sample.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/mf/tests/mf.c | 4 +---
dlls/winegstreamer/wma_decoder.c | 24 +++++++++++++++++++++++-
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 1f31eab60bc..f3c0db7a2c6 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -5997,13 +5997,11 @@ static void test_wma_decoder(void)
sample = create_sample(wma_encoded_data, wma_block_size / 2);
hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
- todo_wine
ok(hr == S_OK, "ProcessInput returned %#x\n", hr);
ret = IMFSample_Release(sample);
ok(ret == 0, "Release returned %u\n", ret);
- sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2);
+ sample = create_sample(wma_encoded_data, wma_block_size + 1);
hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
- todo_wine
ok(hr == S_OK, "ProcessInput returned %#x\n", hr);
ret = IMFSample_Release(sample);
ok(ret == 0, "Release returned %u\n", ret);
diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c
index ffd05520f8c..354f363bedf 100644
--- a/dlls/winegstreamer/wma_decoder.c
+++ b/dlls/winegstreamer/wma_decoder.c
@@ -520,8 +520,30 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
{
+ struct wma_decoder *decoder = impl_from_IMFTransform(iface);
+ struct wg_sample *wg_sample;
+ MFT_INPUT_STREAM_INFO info;
+ HRESULT hr;
+
FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags);
- return E_NOTIMPL;
+
+ if (!decoder->wg_transform)
+ return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+ if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info)))
+ return hr;
+
+ if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample)))
+ return hr;
+
+ /* WMA transform uses fixed size input samples and ignores samples with invalid sizes */
+ if (wg_sample->size % info.cbSize)
+ hr = S_OK;
+ else
+ hr = E_NOTIMPL;
+
+ mf_destroy_wg_sample(wg_sample);
+ return hr;
}
static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
--
2.34.1
More information about the wine-devel
mailing list