From: Charlotte Pabst cpabst@codeweavers.com
--- dlls/mfsrcsnk/tests/mfsrcsnk.c | 6 ------ dlls/winegstreamer/wg_parser.c | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/dlls/mfsrcsnk/tests/mfsrcsnk.c b/dlls/mfsrcsnk/tests/mfsrcsnk.c index 41fc652c77d..7f27214d586 100644 --- a/dlls/mfsrcsnk/tests/mfsrcsnk.c +++ b/dlls/mfsrcsnk/tests/mfsrcsnk.c @@ -889,7 +889,6 @@ static HRESULT WINAPI bufsize_test_byte_stream_GetCurrentPosition(IMFByteStream
static HRESULT WINAPI bufsize_test_byte_stream_SetCurrentPosition(IMFByteStream *iface, QWORD qwPosition) { - todo_wine_if(!(qwPosition % 0x40000 == 0)) ok(qwPosition % 0x40000 == 0, "IMFByteStream::SetCurrentPosition pos=%lld should be aligned on 0x40000 boundary.\n", qwPosition); return IMFByteStream_SetCurrentPosition(bufsize_test_byte_stream_from_iface(iface)->inner, qwPosition); } @@ -903,9 +902,7 @@ static HRESULT WINAPI bufsize_test_byte_stream_Read(IMFByteStream *iface, BYTE* { QWORD current = 0; IMFByteStream_GetCurrentPosition(bufsize_test_byte_stream_from_iface(iface)->inner, ¤t); - todo_wine_if(!(current % 0x40000 == 0)) ok(current % 0x40000 == 0, "IMFByteStream::Read pos=%lld should be aligned on 0x40000 boundary.\n", current); - todo_wine_if(!(cb <= 0x40000)) ok(cb <= 0x40000, "IMFByteStream::BeginRead size=%lu should not be larger than 0x40000.\n", cb); return IMFByteStream_Read(bufsize_test_byte_stream_from_iface(iface)->inner, pb, cb, pcbRead); } @@ -914,9 +911,7 @@ static HRESULT WINAPI bufsize_test_byte_stream_BeginRead(IMFByteStream *iface, B { QWORD current = 0; IMFByteStream_GetCurrentPosition(bufsize_test_byte_stream_from_iface(iface)->inner, ¤t); - todo_wine_if(!(current % 0x40000 == 0)) ok(current % 0x40000 == 0, "IMFByteStream::BeginRead pos=%lld should be aligned on 0x40000 boundary.\n", current); - todo_wine_if(!(cb <= 0x40000)) ok(cb <= 0x40000, "IMFByteStream::BeginRead size=%lu should not be larger than 0x40000.\n", cb); return IMFByteStream_BeginRead(bufsize_test_byte_stream_from_iface(iface)->inner, pb, cb, pCallback, punkState); } @@ -947,7 +942,6 @@ static HRESULT WINAPI bufsize_test_byte_stream_Seek(IMFByteStream *iface, MFBYTE
QWORD current = 0; IMFByteStream_GetCurrentPosition(bufsize_test_byte_stream_from_iface(iface)->inner, ¤t); - todo_wine_if(!(current % 0x40000 == 0)) ok(current % 0x40000 == 0, "IMFByteStream::Seek pos=%lld should be aligned on 0x40000 boundary.\n", current); return hr; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 1a29015356e..6880cfd410e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -97,7 +97,7 @@ struct wg_parser
struct input_cache_chunk input_cache_chunks[4]; }; -static const unsigned int input_cache_chunk_size = 512 << 10; +static const unsigned int input_cache_chunk_size = 256 << 10;
struct wg_parser_stream { @@ -1245,9 +1245,6 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, return GST_FLOW_OK; }
- if (size >= input_cache_chunk_size || sizeof(void*) == 4) - return issue_read_request(parser, offset, size, buffer); - if (offset >= parser->file_size) return GST_FLOW_EOS;