FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ext/faad/gstfaad.c: Don't take STREAM_LOCK in sink event handlers any more.

Browse Source 
Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_event):
Don't take STREAM_LOCK in sink event handlers any more.
This commit is contained in:
Michael Smith 2005-11-21 18:45:54 +00:00
parent e8b4130a36
commit ba572e2d2c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-21 Michael Smith <msmith@fluendo.com>
* ext/faad/gstfaad.c: (gst_faad_setcaps), (gst_faad_event):
Don't take STREAM_LOCK in sink event handlers any more.
2005-11-21 Wim Taymans <wim@fluendo.com> 2005-11-21 Wim Taymans <wim@fluendo.com>
* ext/faac/gstfaac.c: (gst_faac_sink_event): * ext/faac/gstfaac.c: (gst_faac_sink_event):

8
ext/faad/gstfaad.c
View File

@ -37,8 +37,8 @@
* but not all, hence this Truly Evil Hack. This hack will need updating if * but not all, hence this Truly Evil Hack. This hack will need updating if
* upstream ever releases something with the new API. * upstream ever releases something with the new API.
*/ */
#define faacDecInit faadDecInit_no_definition #define faacDecInit faacDecInit_no_definition
#define faacDecInit2 faadDecInit2_no_definition #define faacDecInit2 faacDecInit2_no_definition
#include "gstfaad.h" #include "gstfaad.h"
#undef faacDecInit #undef faacDecInit
#undef faacDecInit2 #undef faacDecInit2
@ -647,13 +647,11 @@ gst_faad_event (GstPad * pad, GstEvent * event)
* (when our newsegment was in BYTES) */ * (when our newsegment was in BYTES) */
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS: case GST_EVENT_EOS:
GST_STREAM_LOCK (pad);
if (faad->tempbuf != NULL) { if (faad->tempbuf != NULL) {
gst_buffer_unref (faad->tempbuf); gst_buffer_unref (faad->tempbuf);
faad->tempbuf = NULL; faad->tempbuf = NULL;
} }
res = gst_pad_push_event (faad->srcpad, event); res = gst_pad_push_event (faad->srcpad, event);
GST_STREAM_UNLOCK (pad);
break; break;
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT:
{ {
@ -696,9 +694,7 @@ gst_faad_event (GstPad * pad, GstEvent * event)
GST_TIME_ARGS (new_end)); GST_TIME_ARGS (new_end));
} }
GST_STREAM_LOCK (pad);
res = gst_pad_push_event (faad->srcpad, event); res = gst_pad_push_event (faad->srcpad, event);
GST_STREAM_UNLOCK (pad);
break; break;
} }
default: default: