mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 19:49:50 +00:00
winegstreamer: Check for unexpected format change in wg_transform_read helpers.
This commit is contained in:
parent
024eef2258
commit
19df4f02de
6 changed files with 8 additions and 14 deletions
|
@ -601,9 +601,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
|
||||||
|
|
||||||
wg_sample_release(wg_sample);
|
wg_sample_release(wg_sample);
|
||||||
|
|
||||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
|
||||||
FIXME("Unexpected stream format change!\n");
|
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -342,8 +342,6 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa
|
||||||
}
|
}
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
|
||||||
FIXME("Unexpected stream format change!\n");
|
|
||||||
IMediaSample_Release(output_sample);
|
IMediaSample_Release(output_sample);
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -571,9 +571,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
|
||||||
|
|
||||||
wg_sample_release(wg_sample);
|
wg_sample_release(wg_sample);
|
||||||
|
|
||||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
|
||||||
FIXME("Unexpected stream format change!\n");
|
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -577,9 +577,6 @@ static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD f
|
||||||
|
|
||||||
wg_sample_release(wg_sample);
|
wg_sample_release(wg_sample);
|
||||||
|
|
||||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
|
||||||
FIXME("Unexpected stream format change!\n");
|
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -291,7 +291,11 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *w
|
||||||
TRACE_(mfplat)("transform %p, wg_sample %p, format %p, flags %p.\n", transform, wg_sample, format, flags);
|
TRACE_(mfplat)("transform %p, wg_sample %p, format %p, flags %p.\n", transform, wg_sample, format, flags);
|
||||||
|
|
||||||
if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format)))
|
if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format)))
|
||||||
|
{
|
||||||
|
if (hr == MF_E_TRANSFORM_STREAM_CHANGE && !format)
|
||||||
|
FIXME("Unexpected stream format change!\n");
|
||||||
return hr;
|
return hr;
|
||||||
|
}
|
||||||
|
|
||||||
if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(sample->u.mf.buffer, wg_sample->size)))
|
if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(sample->u.mf.buffer, wg_sample->size)))
|
||||||
return hr;
|
return hr;
|
||||||
|
@ -349,7 +353,11 @@ HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sampl
|
||||||
TRACE_(mfplat)("transform %p, wg_sample %p.\n", transform, wg_sample);
|
TRACE_(mfplat)("transform %p, wg_sample %p.\n", transform, wg_sample);
|
||||||
|
|
||||||
if (FAILED(hr = wg_transform_read_data(transform, wg_sample, NULL)))
|
if (FAILED(hr = wg_transform_read_data(transform, wg_sample, NULL)))
|
||||||
|
{
|
||||||
|
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
||||||
|
FIXME("Unexpected stream format change!\n");
|
||||||
return hr;
|
return hr;
|
||||||
|
}
|
||||||
|
|
||||||
if (FAILED(hr = IMediaSample_SetActualDataLength(sample->u.quartz.sample, wg_sample->size)))
|
if (FAILED(hr = IMediaSample_SetActualDataLength(sample->u.quartz.sample, wg_sample->size)))
|
||||||
return hr;
|
return hr;
|
||||||
|
|
|
@ -597,9 +597,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
|
||||||
|
|
||||||
wg_sample_release(wg_sample);
|
wg_sample_release(wg_sample);
|
||||||
|
|
||||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE)
|
|
||||||
FIXME("Unexpected stream format change!\n");
|
|
||||||
|
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue