avformat: Add ff_tls_init()/deinit() that initialize OpenSSL

If the application hasn't set up mutex callbacks, we set up
our own using pthreads (or w32pthreads).

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/libavformat/network.c b/libavformat/network.c
index f694614e8bef622c8a633b46b3a18916ed16a6eb..6ef609f2ed87d197a8146c1ad9dc449087181ebb 100644 (file)
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -19,6 +19,85 @@
  */
 
 #include "network.h"
+#include "libavcodec/internal.h"
+
+#define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__)))
+
+#if THREADS
+#if HAVE_PTHREADS
+#include <pthread.h>
+#else
+#include "libavcodec/w32pthreads.h"
+#endif
+#endif
+
+#if CONFIG_OPENSSL
+#include <openssl/ssl.h>
+static int openssl_init;
+#if THREADS
+#include <openssl/crypto.h>
+#include "libavutil/avutil.h"
+pthread_mutex_t *openssl_mutexes;
+static void openssl_lock(int mode, int type, const char *file, int line)
+{
+    if (mode & CRYPTO_LOCK)
+        pthread_mutex_lock(&openssl_mutexes[type]);
+    else
+        pthread_mutex_unlock(&openssl_mutexes[type]);
+}
+#ifndef WIN32
+static unsigned long openssl_thread_id(void)
+{
+    return (intptr_t) pthread_self();
+}
+#endif
+#endif
+#endif
+
+void ff_tls_init(void)
+{
+    avpriv_lock_avformat();
+#if CONFIG_OPENSSL
+    if (!openssl_init) {
+        SSL_library_init();
+        SSL_load_error_strings();
+#if THREADS
+        if (!CRYPTO_get_locking_callback()) {
+            int i;
+            openssl_mutexes = av_malloc(sizeof(pthread_mutex_t) * CRYPTO_num_locks());
+            for (i = 0; i < CRYPTO_num_locks(); i++)
+                pthread_mutex_init(&openssl_mutexes[i], NULL);
+            CRYPTO_set_locking_callback(openssl_lock);
+#ifndef WIN32
+            CRYPTO_set_id_callback(openssl_thread_id);
+#endif
+        }
+#endif
+    }
+    openssl_init++;
+#endif
+    avpriv_unlock_avformat();
+}
+
+void ff_tls_deinit(void)
+{
+    avpriv_lock_avformat();
+#if CONFIG_OPENSSL
+    openssl_init--;
+    if (!openssl_init) {
+#if THREADS
+        if (CRYPTO_get_locking_callback() == openssl_lock) {
+            int i;
+            CRYPTO_set_locking_callback(NULL);
+            for (i = 0; i < CRYPTO_num_locks(); i++)
+                pthread_mutex_destroy(&openssl_mutexes[i]);
+            av_free(openssl_mutexes);
+        }
+#endif
+    }
+#endif
+    avpriv_unlock_avformat();
+}
 
 int ff_network_init(void)
 {

diff --git a/libavformat/network.h b/libavformat/network.h
index 00daed8759261429fc47b9540c30448c016859f9..df79f4598f570d5cedca946a9a986bcb406175a1 100644 (file)
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -59,6 +59,9 @@ int ff_socket_nonblock(int socket, int enable);
 int ff_network_init(void);
 void ff_network_close(void);
 
+void ff_tls_init(void);
+void ff_tls_deinit(void);
+
 int ff_network_wait_fd(int fd, int write);
 
 int ff_inet_aton (const char * str, struct in_addr * add);