parent
bdd2676a67
commit
da987a3219
@ -372,7 +372,7 @@ gst_curl_base_sink_render (GstBaseSink * bsink, GstBuffer * buf)
|
|||||||
|
|
||||||
/* wait for the transfer thread to send the data. This will be notified
|
/* wait for the transfer thread to send the data. This will be notified
|
||||||
* either when transfer is completed by the curl read callback or by
|
* either when transfer is completed by the curl read callback or by
|
||||||
* the thread function if an error has occured. */
|
* the thread function if an error has occurred. */
|
||||||
gst_curl_base_sink_wait_for_transfer_thread_to_send_unlocked (sink);
|
gst_curl_base_sink_wait_for_transfer_thread_to_send_unlocked (sink);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
@ -603,7 +603,7 @@ gst_curl_base_sink_transfer_set_common_options_unlocked (GstCurlBaseSink * sink)
|
|||||||
|
|
||||||
curl_easy_setopt (sink->curl, CURLOPT_CONNECTTIMEOUT, sink->timeout);
|
curl_easy_setopt (sink->curl, CURLOPT_CONNECTTIMEOUT, sink->timeout);
|
||||||
|
|
||||||
/* using signals in a multithreaded application is dangeous */
|
/* using signals in a multi-threaded application is dangerous */
|
||||||
curl_easy_setopt (sink->curl, CURLOPT_NOSIGNAL, 1);
|
curl_easy_setopt (sink->curl, CURLOPT_NOSIGNAL, 1);
|
||||||
|
|
||||||
/* socket settings */
|
/* socket settings */
|
||||||
@ -978,7 +978,7 @@ gst_curl_base_sink_transfer_thread_func (gpointer data)
|
|||||||
sink->new_file = FALSE;
|
sink->new_file = FALSE;
|
||||||
|
|
||||||
/* wait for data to arrive for this new file, if we get a new file name
|
/* wait for data to arrive for this new file, if we get a new file name
|
||||||
* again before getting data we will simply skip transfering anything
|
* again before getting data we will simply skip transferring anything
|
||||||
* for this file and go directly to the new file */
|
* for this file and go directly to the new file */
|
||||||
data_available = gst_curl_base_sink_wait_for_data_unlocked (sink);
|
data_available = gst_curl_base_sink_wait_for_data_unlocked (sink);
|
||||||
if (data_available) {
|
if (data_available) {
|
||||||
@ -1068,7 +1068,7 @@ gst_curl_base_sink_transfer_setup_unlocked (GstCurlBaseSink * sink)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* init a multi stack (non-blocking interface to liburl) */
|
/* init a multi stack (non-blocking interface to libcurl) */
|
||||||
if (sink->multi_handle == NULL) {
|
if (sink->multi_handle == NULL) {
|
||||||
if ((sink->multi_handle = curl_multi_init ()) == NULL) {
|
if ((sink->multi_handle = curl_multi_init ()) == NULL) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@ -1133,7 +1133,7 @@ static void
|
|||||||
GST_LOG ("waiting for buffer send to complete");
|
GST_LOG ("waiting for buffer send to complete");
|
||||||
|
|
||||||
/* this function should not check if the transfer thread is set to be closed
|
/* this function should not check if the transfer thread is set to be closed
|
||||||
* since that flag only can be set by the EoS event (by the pipeline thread).
|
* since that flag only can be set by the EOS event (by the pipeline thread).
|
||||||
* This can therefore never happen while this function is running since this
|
* This can therefore never happen while this function is running since this
|
||||||
* function also is called by the pipeline thread (in the render function) */
|
* function also is called by the pipeline thread (in the render function) */
|
||||||
while (!sink->transfer_cond->data_sent) {
|
while (!sink->transfer_cond->data_sent) {
|
||||||
|
@ -125,7 +125,7 @@ gst_curl_tls_sink_class_init (GstCurlTlsSinkClass * klass)
|
|||||||
g_object_class_install_property (gobject_class, PROP_CRYPTO_ENGINE,
|
g_object_class_install_property (gobject_class, PROP_CRYPTO_ENGINE,
|
||||||
g_param_spec_string ("crypto-engine",
|
g_param_spec_string ("crypto-engine",
|
||||||
"OpenSSL crypto engine",
|
"OpenSSL crypto engine",
|
||||||
"OpenSSL crytpo engine to use for cipher operations",
|
"OpenSSL crypto engine to use for cipher operations",
|
||||||
NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||||
g_object_class_install_property (gobject_class, PROP_INSECURE,
|
g_object_class_install_property (gobject_class, PROP_INSECURE,
|
||||||
g_param_spec_boolean ("insecure",
|
g_param_spec_boolean ("insecure",
|
||||||
@ -254,7 +254,7 @@ gst_curl_tls_sink_set_options_unlocked (GstCurlBaseSink * bcsink)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* note that, using ca-path can allow libcurl to make SSL-connections much
|
/* note that, using ca-path can allow libcurl to make SSL-connections much
|
||||||
* more efficiently than using ca-cert if the ca-cert ile contains many CA
|
* more efficiently than using ca-cert if the ca-cert file contains many CA
|
||||||
* certificates. */
|
* certificates. */
|
||||||
if (sink->ca_cert != NULL && strlen (sink->ca_cert)) {
|
if (sink->ca_cert != NULL && strlen (sink->ca_cert)) {
|
||||||
GST_DEBUG ("setting ca cert");
|
GST_DEBUG ("setting ca cert");
|
||||||
|
@ -19,7 +19,7 @@ static GstElement *sink;
|
|||||||
static GstElement *
|
static GstElement *
|
||||||
setup_curlfilesink (void)
|
setup_curlfilesink (void)
|
||||||
{
|
{
|
||||||
GST_DEBUG ("setup_curlfielsink");
|
GST_DEBUG ("setup_curlfilesink");
|
||||||
sink = gst_check_setup_element ("curlfilesink");
|
sink = gst_check_setup_element ("curlfilesink");
|
||||||
srcpad = gst_check_setup_src_pad (sink, &srctemplate);
|
srcpad = gst_check_setup_src_pad (sink, &srctemplate);
|
||||||
gst_pad_set_active (srcpad, TRUE);
|
gst_pad_set_active (srcpad, TRUE);
|
||||||
@ -152,7 +152,7 @@ GST_START_TEST (test_properties)
|
|||||||
g_object_set (G_OBJECT (sink), "location", "newlocation", NULL);
|
g_object_set (G_OBJECT (sink), "location", "newlocation", NULL);
|
||||||
g_object_get (sink, "location", &res_location, NULL);
|
g_object_get (sink, "location", &res_location, NULL);
|
||||||
|
|
||||||
/* verify that locaiton has not been altered */
|
/* verify that location has not been altered */
|
||||||
fail_unless (strncmp (res_location, location, strlen (location))
|
fail_unless (strncmp (res_location, location, strlen (location))
|
||||||
== 0);
|
== 0);
|
||||||
g_free (res_location);
|
g_free (res_location);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user