ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegstreamer: Send EOS on exiting thread.

This commit is contained in:
Maarten Lankhorst 2010-11-07 16:13:55 +01:00 committed by Alexandre Julliard
parent 6c35f1356b
commit ccc8141b82
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/winegstreamer/gstdemux.c
View File

@ -411,11 +411,13 @@ static void release_sample(void *data) {
} }
static DWORD CALLBACK push_data(LPVOID iface) { static DWORD CALLBACK push_data(LPVOID iface) {
LONGLONG maxlen, curlen;
GSTImpl *This = iface; GSTImpl *This = iface;
IMediaSample *buf; IMediaSample *buf;
DWORD_PTR user; DWORD_PTR user;
HRESULT hr; HRESULT hr;
IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen);
TRACE("Starting..\n"); TRACE("Starting..\n");
for (;;) { for (;;) {
REFERENCE_TIME tStart, tStop; REFERENCE_TIME tStart, tStop;
@ -428,7 +430,11 @@ static DWORD CALLBACK push_data(LPVOID iface) {
if (FAILED(hr)) if (FAILED(hr))
break; break;
if (This->nextofs >= maxlen)
break;
len = IMediaSample_GetSize(buf); len = IMediaSample_GetSize(buf);
if (This->nextofs + len > maxlen)
len = maxlen - This->nextofs;
tStart = MEDIATIME_FROM_BYTES(This->nextofs); tStart = MEDIATIME_FROM_BYTES(This->nextofs);
tStop = tStart + MEDIATIME_FROM_BYTES(len); tStop = tStart + MEDIATIME_FROM_BYTES(len);
@ -451,7 +457,7 @@ static DWORD CALLBACK push_data(LPVOID iface) {
gstbuf = gst_app_buffer_new(data, IMediaSample_GetActualDataLength(buf), release_sample, buf); gstbuf = gst_app_buffer_new(data, IMediaSample_GetActualDataLength(buf), release_sample, buf);
if (!gstbuf) { if (!gstbuf) {
IMediaSample_Release(buf); IMediaSample_Release(buf);
return S_OK; break;
} }
gstbuf->duration = gstbuf->timestamp = -1; gstbuf->duration = gstbuf->timestamp = -1;
ret = gst_pad_push(This->my_src, gstbuf); ret = gst_pad_push(This->my_src, gstbuf);
@ -469,6 +475,8 @@ static DWORD CALLBACK push_data(LPVOID iface) {
break; break;
} }
gst_pad_push_event(This->my_src, gst_event_new_eos());
TRACE("Almost stopping.. %08x\n", hr); TRACE("Almost stopping.. %08x\n", hr);
do { do {
IAsyncReader_WaitForNext(This->pInputPin.pReader, 0, &buf, &user); IAsyncReader_WaitForNext(This->pInputPin.pReader, 0, &buf, &user);
@ -1447,6 +1455,8 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) {
GSTOutPin **ppOldPins = This->ppPins; GSTOutPin **ppOldPins = This->ppPins;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if (!This->gstfilter)
return S_OK;
gst_element_set_state(This->gstfilter, GST_STATE_NULL); gst_element_set_state(This->gstfilter, GST_STATE_NULL);
gst_pad_unlink(This->my_src, This->their_sink); gst_pad_unlink(This->my_src, This->their_sink);
This->my_src = This->their_sink = NULL; This->my_src = This->their_sink = NULL;