system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 22:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfreadwrite: Update source reader MF_SOURCE_READER_ANY_STREAM behavior based on tests.

Browse source 
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
This commit is contained in:
Derek Lesho 2022-06-08 13:15:39 +02:00 committed by Alexandre Julliard
parent 35f9b6f0b1
commit 474d1824c4
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/mfreadwrite/reader.c
View file

@ -92,6 +92,7 @@ struct media_stream
unsigned int flags; unsigned int flags;
unsigned int requests; unsigned int requests;
unsigned int responses; unsigned int responses;
LONGLONG last_sample_ts;
struct source_reader *reader; struct source_reader *reader;
}; };
@ -160,7 +161,6 @@ struct source_reader
IUnknown *device_manager; IUnknown *device_manager;
unsigned int first_audio_stream_index; unsigned int first_audio_stream_index;
unsigned int first_video_stream_index; unsigned int first_video_stream_index;
unsigned int last_read_index;
DWORD stream_count; DWORD stream_count;
unsigned int flags; unsigned int flags;
DWORD queue; DWORD queue;
@ -459,6 +459,8 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct
source_reader_response_ready(reader, response); source_reader_response_ready(reader, response);
stream->last_sample_ts = timestamp;
return S_OK; return S_OK;
} }
@ -1101,10 +1103,11 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m
static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index)
{ {
unsigned int i, first_selected = ~0u, requests = ~0u; unsigned int i, first_selected = ~0u;
BOOL selected, stream_drained; BOOL selected, stream_drained;
LONGLONG min_ts = MAXLONGLONG;
for (i = (reader->last_read_index + 1) % reader->stream_count; ; i = (i + 1) % reader->stream_count) for (i = 0; i < reader->stream_count; ++i)
{ {
stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses;
selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected;
@ -1114,24 +1117,20 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read
if (first_selected == ~0u) if (first_selected == ~0u)
first_selected = i; first_selected = i;
/* Try to balance pending reads. */ /* Pick the stream whose last sample had the lowest timestamp. */
if (!stream_drained && reader->streams[i].requests < requests) if (!stream_drained && reader->streams[i].last_sample_ts < min_ts)
{ {
requests = reader->streams[i].requests; min_ts = reader->streams[i].last_sample_ts;
*stream_index = i; *stream_index = i;
} }
} }
if (i == reader->last_read_index)
break;
} }
/* If all selected streams reached EOS, use first selected. */ /* If all selected streams reached EOS, use first selected. */
if (first_selected != ~0u) if (first_selected != ~0u)
{ {
if (requests == ~0u) if (min_ts == MAXLONGLONG)
*stream_index = first_selected; *stream_index = first_selected;
reader->last_read_index = *stream_index;
} }
return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK;
@ -1499,7 +1498,12 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR
} }
if (selection_changed) if (selection_changed)
reader->last_read_index = reader->stream_count - 1; {
for (i = 0; i < reader->stream_count; ++i)
{
reader->streams[i].last_sample_ts = 0;
}
}
LeaveCriticalSection(&reader->cs); LeaveCriticalSection(&reader->cs);
@ -1911,6 +1915,11 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
for (i = 0; i < reader->stream_count; ++i)
{
reader->streams[i].last_sample_ts = 0;
}
if (reader->async_callback) if (reader->async_callback)
{ {
if (SUCCEEDED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_SEEK, &command))) if (SUCCEEDED(hr = source_reader_create_async_op(SOURCE_READER_ASYNC_SEEK, &command)))
@ -2357,7 +2366,6 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri
/* At least one major type has to be set. */ /* At least one major type has to be set. */
object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio);
object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video);
object->last_read_index = object->stream_count - 1;
if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX &&
object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX)

5
dlls/mfreadwrite/tests/mfplat.c
View file

@ -994,7 +994,7 @@ static void test_source_reader_from_media_source(void)
/* Once the last read sample of all streams has the same timestamp value, the reader will /* Once the last read sample of all streams has the same timestamp value, the reader will
continue reading from the first stream until its timestamp increases. */ continue reading from the first stream until its timestamp increases. */
todo_wine ok(!actual_index, "%d: Unexpected stream index %lu.\n", TEST_SOURCE_NUM_STREAMS + 1, actual_index); ok(!actual_index, "%d: Unexpected stream index %lu.\n", TEST_SOURCE_NUM_STREAMS + 1, actual_index);
IMFSample_Release(sample); IMFSample_Release(sample);
@ -1231,8 +1231,7 @@ static void test_source_reader_from_media_source(void)
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags);
ok(!!sample, "Expected sample object.\n"); ok(!!sample, "Expected sample object.\n");
todo_wine_if (actual_index != expected_sample_order[i]) ok (actual_index == expected_sample_order[i], "Got sample %u from unexpected stream %lu, expected %lu.\n",
ok (actual_index == expected_sample_order[i], "Got sample %u from unexpected stream %lu, expected %lu.\n",
i, actual_index, expected_sample_order[i]); i, actual_index, expected_sample_order[i]);
IMFSample_Release(sample); IMFSample_Release(sample);
} }