mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 00:32:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

dshowdecwrapper: Fix COM initialization

Browse source 
Fixes bug #625190.
This commit is contained in:
Julien MOUTTE 2011-05-30 08:43:59 +02:00 committed by Sebastian Dröge
parent 378a8d94dc
commit efd840bbb7
4 changed files with 138 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
sys/dshowdecwrapper/gstdshowaudiodec.cpp
View file

@ -365,12 +365,48 @@ gst_dshowaudiodec_class_init (GstDshowAudioDecClass * klass)
parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
}
static void
gst_dshowaudiodec_com_thread (GstDshowAudioDec * adec)
{
HRESULT res;
g_mutex_lock (adec->com_init_lock);
/* Initialize COM with a MTA for this process. This thread will
* be the first one to enter the apartement and the last one to leave
* it, unitializing COM properly */
res = CoInitializeEx (0, COINIT_MULTITHREADED);
if (res == S_FALSE)
GST_WARNING_OBJECT (adec, "COM has been already initialized in the same process");
else if (res == RPC_E_CHANGED_MODE)
GST_WARNING_OBJECT (adec, "The concurrency model of COM has changed.");
else
GST_INFO_OBJECT (adec, "COM intialized succesfully");
adec->comInitialized = TRUE;
/* Signal other threads waiting on this condition that COM was initialized */
g_cond_signal (adec->com_initialized);
g_mutex_unlock (adec->com_init_lock);
/* Wait until the unitialize condition is met to leave the COM apartement */
g_mutex_lock (adec->com_deinit_lock);
g_cond_wait (adec->com_uninitialize, adec->com_deinit_lock);
CoUninitialize ();
GST_INFO_OBJECT (adec, "COM unintialized succesfully");
adec->comInitialized = FALSE;
g_cond_signal (adec->com_uninitialized);
g_mutex_unlock (adec->com_deinit_lock);
}
static void
gst_dshowaudiodec_init (GstDshowAudioDec * adec,
GstDshowAudioDecClass * adec_class)
{
GstElementClass *element_class = GST_ELEMENT_GET_CLASS (adec);
HRESULT hr;
/* setup pads */
adec->sinkpad =
@ -407,10 +443,21 @@ gst_dshowaudiodec_init (GstDshowAudioDec * adec,
adec->last_ret = GST_FLOW_OK;
hr = CoInitialize (0);
if (SUCCEEDED(hr)) {
adec->comInitialized = TRUE;
}
adec->com_init_lock = g_mutex_new();
adec->com_deinit_lock = g_mutex_new();
adec->com_initialized = g_cond_new();
adec->com_uninitialize = g_cond_new();
adec->com_uninitialized = g_cond_new();
g_mutex_lock (adec->com_init_lock);
/* create the COM initialization thread */
g_thread_create ((GThreadFunc)gst_dshowaudiodec_com_thread,
adec, FALSE, NULL);
/* wait until the COM thread signals that COM has been initialized */
g_cond_wait (adec->com_initialized, adec->com_init_lock);
g_mutex_unlock (adec->com_init_lock);
}
static void
@ -428,11 +475,20 @@ gst_dshowaudiodec_dispose (GObject * object)
adec->codec_data = NULL;
}
/* signal the COM thread that it sould uninitialize COM */
if (adec->comInitialized) {
CoUninitialize ();
adec->comInitialized = FALSE;
g_mutex_lock (adec->com_deinit_lock);
g_cond_signal (adec->com_uninitialize);
g_cond_wait (adec->com_uninitialized, adec->com_deinit_lock);
g_mutex_unlock (adec->com_deinit_lock);
}
g_mutex_free (adec->com_init_lock);
g_mutex_free (adec->com_deinit_lock);
g_cond_free (adec->com_initialized);
g_cond_free (adec->com_uninitialize);
g_cond_free (adec->com_uninitialized);
G_OBJECT_CLASS (parent_class)->dispose (object);
}

7
sys/dshowdecwrapper/gstdshowaudiodec.h
View file

@ -1,6 +1,6 @@
/*
* GStreamer DirectShow codecs wrapper
* Copyright <2006, 2007, 2008> Fluendo <gstreamer@fluendo.com>
* Copyright <2006, 2007, 2008, 2009, 2010> Fluendo <support@fluendo.com>
* Copyright <2006, 2007, 2008> Pioneers of the Inevitable <songbird@songbirdnest.com>
* Copyright <2007,2008> Sebastien Moutte <sebastien@moutte.net>
*
@ -113,6 +113,11 @@ struct _GstDshowAudioDec
GstClockTime timestamp;
gboolean comInitialized;
GMutex *com_init_lock;
GMutex *com_deinit_lock;
GCond *com_initialized;
GCond *com_uninitialize;
GCond *com_uninitialized;
};
struct _GstDshowAudioDecClass

70
sys/dshowdecwrapper/gstdshowvideodec.cpp
View file

@ -417,12 +417,48 @@ gst_dshowvideodec_class_init (GstDshowVideoDecClass * klass)
parent_class = (GstElementClass *) g_type_class_peek_parent (klass);
}
static void
gst_dshowvideodec_com_thread (GstDshowVideoDec * vdec)
{
HRESULT res;
g_mutex_lock (vdec->com_init_lock);
/* Initialize COM with a MTA for this process. This thread will
* be the first one to enter the apartement and the last one to leave
* it, unitializing COM properly */
res = CoInitializeEx (0, COINIT_MULTITHREADED);
if (res == S_FALSE)
GST_WARNING_OBJECT (vdec, "COM has been already initialized in the same process");
else if (res == RPC_E_CHANGED_MODE)
GST_WARNING_OBJECT (vdec, "The concurrency model of COM has changed.");
else
GST_INFO_OBJECT (vdec, "COM intialized succesfully");
vdec->comInitialized = TRUE;
/* Signal other threads waiting on this condition that COM was initialized */
g_cond_signal (vdec->com_initialized);
g_mutex_unlock (vdec->com_init_lock);
/* Wait until the unitialize condition is met to leave the COM apartement */
g_mutex_lock (vdec->com_deinit_lock);
g_cond_wait (vdec->com_uninitialize, vdec->com_deinit_lock);
CoUninitialize ();
GST_INFO_OBJECT (vdec, "COM unintialized succesfully");
vdec->comInitialized = FALSE;
g_cond_signal (vdec->com_uninitialized);
g_mutex_unlock (vdec->com_deinit_lock);
}
static void
gst_dshowvideodec_init (GstDshowVideoDec * vdec,
GstDshowVideoDecClass * vdec_class)
{
GstElementClass *element_class = GST_ELEMENT_GET_CLASS (vdec);
HRESULT hr;
/* setup pads */
vdec->sinkpad =
@ -455,10 +491,21 @@ gst_dshowvideodec_init (GstDshowVideoDec * vdec,
vdec->setup = FALSE;
hr = CoInitialize (0);
if (SUCCEEDED(hr)) {
vdec->comInitialized = TRUE;
}
vdec->com_init_lock = g_mutex_new();
vdec->com_deinit_lock = g_mutex_new();
vdec->com_initialized = g_cond_new();
vdec->com_uninitialize = g_cond_new();
vdec->com_uninitialized = g_cond_new();
g_mutex_lock (vdec->com_init_lock);
/* create the COM initialization thread */
g_thread_create ((GThreadFunc)gst_dshowvideodec_com_thread,
vdec, FALSE, NULL);
/* wait until the COM thread signals that COM has been initialized */
g_cond_wait (vdec->com_initialized, vdec->com_init_lock);
g_mutex_unlock (vdec->com_init_lock);
}
static void
@ -471,11 +518,20 @@ gst_dshowvideodec_dispose (GObject * object)
vdec->segment = NULL;
}
/* signal the COM thread that it sould uninitialize COM */
if (vdec->comInitialized) {
CoUninitialize ();
vdec->comInitialized = FALSE;
g_mutex_lock (vdec->com_deinit_lock);
g_cond_signal (vdec->com_uninitialize);
g_cond_wait (vdec->com_uninitialized, vdec->com_deinit_lock);
g_mutex_unlock (vdec->com_deinit_lock);
}
g_mutex_free (vdec->com_init_lock);
g_mutex_free (vdec->com_deinit_lock);
g_cond_free (vdec->com_initialized);
g_cond_free (vdec->com_uninitialize);
g_cond_free (vdec->com_uninitialized);
G_OBJECT_CLASS (parent_class)->dispose (object);
}

7
sys/dshowdecwrapper/gstdshowvideodec.h
View file

@ -1,6 +1,6 @@
/*
* GStreamer DirectShow codecs wrapper
* Copyright <2006, 2007, 2008> Fluendo <gstreamer@fluendo.com>
* Copyright <2006, 2007, 2008, 2009, 2010> Fluendo <support@fluendo.com>
* Copyright <2006, 2007, 2008> Pioneers of the Inevitable <songbird@songbirdnest.com>
* Copyright <2007,2008> Sebastien Moutte <sebastien@moutte.net>
*
@ -113,6 +113,11 @@ struct _GstDshowVideoDec
gboolean setup;
gboolean comInitialized;
GMutex *com_init_lock;
GMutex *com_deinit_lock;
GCond *com_initialized;
GCond *com_uninitialize;
GCond *com_uninitialized;
};
struct _GstDshowVideoDecClass