winegstreamer: Implement H264 decoder Process(Input|Output).
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b5d6c59920
commit
ebd2b7d704
|
@ -6822,7 +6822,6 @@ static void test_h264_decoder(void)
|
|||
status = 0;
|
||||
memset(&output, 0, sizeof(output));
|
||||
hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status);
|
||||
todo_wine
|
||||
ok(hr == E_INVALIDARG || hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr);
|
||||
ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID);
|
||||
ok(!output.pSample, "got pSample %p\n", output.pSample);
|
||||
|
@ -6850,14 +6849,12 @@ static void test_h264_decoder(void)
|
|||
ok(ret == 0, "Release returned %lu\n", ret);
|
||||
|
||||
hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
|
||||
todo_wine
|
||||
ok(hr == S_OK, "ProcessInput returned %#lx\n", hr);
|
||||
ret = IMFSample_Release(sample);
|
||||
ok(ret <= 1, "Release returned %lu\n", ret);
|
||||
sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len);
|
||||
|
||||
hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
|
||||
todo_wine
|
||||
ok(hr == S_OK, "ProcessInput returned %#lx\n", hr);
|
||||
ret = IMFSample_Release(sample);
|
||||
ok(ret <= 1, "Release returned %lu\n", ret);
|
||||
|
@ -6883,7 +6880,8 @@ static void test_h264_decoder(void)
|
|||
todo_wine
|
||||
ok(status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS,
|
||||
"got status %#lx\n", status);
|
||||
check_sample(output.pSample, NULL, 0, NULL);
|
||||
if (status == MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS)
|
||||
check_sample(output.pSample, NULL, 0, NULL);
|
||||
ret = IMFSample_Release(output.pSample);
|
||||
ok(ret == 0, "Release returned %lu\n", ret);
|
||||
|
||||
|
|
|
@ -496,15 +496,61 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_
|
|||
|
||||
static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)
|
||||
{
|
||||
FIXME("iface %p, id %#lx, sample %p, flags %#lx stub!\n", iface, id, sample, flags);
|
||||
return E_NOTIMPL;
|
||||
struct h264_decoder *decoder = impl_from_IMFTransform(iface);
|
||||
struct wg_sample *wg_sample;
|
||||
MFT_INPUT_STREAM_INFO info;
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags);
|
||||
|
||||
if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info)))
|
||||
return hr;
|
||||
|
||||
if (!decoder->wg_transform)
|
||||
return MF_E_TRANSFORM_TYPE_NOT_SET;
|
||||
|
||||
if (FAILED(hr = mf_create_wg_sample(sample, &wg_sample)))
|
||||
return hr;
|
||||
|
||||
hr = wg_transform_push_data(decoder->wg_transform, wg_sample);
|
||||
|
||||
mf_destroy_wg_sample(wg_sample);
|
||||
return hr;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
|
||||
MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
|
||||
{
|
||||
FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status);
|
||||
return E_NOTIMPL;
|
||||
struct h264_decoder *decoder = impl_from_IMFTransform(iface);
|
||||
MFT_OUTPUT_STREAM_INFO info;
|
||||
struct wg_sample *wg_sample;
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status);
|
||||
|
||||
if (count != 1)
|
||||
return E_INVALIDARG;
|
||||
|
||||
if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info)))
|
||||
return hr;
|
||||
|
||||
if (!decoder->wg_transform)
|
||||
return MF_E_TRANSFORM_TYPE_NOT_SET;
|
||||
|
||||
*status = 0;
|
||||
samples[0].dwStatus = 0;
|
||||
if (!samples[0].pSample) return E_INVALIDARG;
|
||||
|
||||
if (FAILED(hr = mf_create_wg_sample(samples[0].pSample, &wg_sample)))
|
||||
return hr;
|
||||
|
||||
if (wg_sample->max_size < info.cbSize)
|
||||
hr = MF_E_BUFFERTOOSMALL;
|
||||
else
|
||||
hr = wg_transform_read_data(decoder->wg_transform, wg_sample);
|
||||
|
||||
mf_destroy_wg_sample(wg_sample);
|
||||
return hr;
|
||||
}
|
||||
|
||||
static const IMFTransformVtbl transform_vtbl =
|
||||
|
|
Loading…
Reference in New Issue