diff options
author | Martin Storsjö <martin@martin.st> | 2011-02-05 00:25:07 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2011-11-05 12:08:59 +0200 |
commit | 48e59ad8e776546d172c4628223fcb6b0695f9f2 (patch) | |
tree | 6268f6b08f0e70bddbf340813c43c3f47b7a9f6b /libavformat | |
parent | a060866fd769dde9e8681b7fad1b24eb97d27e18 (diff) | |
download | ffmpeg-48e59ad8e776546d172c4628223fcb6b0695f9f2.tar.gz |
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>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/network.c | 79 | ||||
-rw-r--r-- | libavformat/network.h | 3 |
2 files changed, 82 insertions, 0 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index f694614e8b..6ef609f2ed 100644 --- 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 00daed8759..df79f4598f 100644 --- 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); |