winegstreamer: Move the EOS handling from read_buffer() to the Unix library.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e9800b1cbc
commit
491945ee41
|
@ -794,14 +794,6 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs
|
|||
|
||||
TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer);
|
||||
|
||||
if (ofs >= This->file_size)
|
||||
{
|
||||
WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len);
|
||||
return GST_FLOW_EOS;
|
||||
}
|
||||
if (len + ofs > This->file_size)
|
||||
len = This->file_size - ofs;
|
||||
|
||||
gst_buffer_map(buffer, &info, GST_MAP_WRITE);
|
||||
hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data);
|
||||
gst_buffer_unmap(buffer, &info);
|
||||
|
|
|
@ -992,6 +992,10 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64
|
|||
if (offset == GST_BUFFER_OFFSET_NONE)
|
||||
offset = parser->next_pull_offset;
|
||||
parser->next_pull_offset = offset + size;
|
||||
if (offset >= parser->file_size)
|
||||
return GST_FLOW_EOS;
|
||||
if (offset + size >= parser->file_size)
|
||||
size = parser->file_size - offset;
|
||||
|
||||
if (!*buffer)
|
||||
*buffer = new_buffer = gst_buffer_new_and_alloc(size);
|
||||
|
|
Loading…
Reference in New Issue