From 043d2ff2673933c0ac8995b74c76973bd93cdd3e Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Mon, 7 Feb 2011 21:15:45 -0500 Subject: Deprecate avcodec_thread_init() As a side effect of the last commit, avcodec_open() now calls it automatically, so there is no longer any need for clients to call it. Instead they should set AVCodecContext.thread_count. avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the next MAJOR libavcodec bump. Rename the functions to ff_thread_init/free, since they are now internal. Wrappers are provided to maintain API compatibility. Signed-off-by: Ronald S. Bultje (cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6) --- libavcodec/avcodec.h | 8 +++++++- libavcodec/pthread.c | 6 +++--- libavcodec/thread.h | 3 +++ libavcodec/utils.c | 20 +++++++++++++++++--- libavcodec/w32thread.c | 8 ++++---- 5 files changed, 34 insertions(+), 11 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 90446cd6d7..850e3e7d84 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -32,7 +32,7 @@ #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 111 +#define LIBAVCODEC_VERSION_MINOR 112 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -3656,8 +3656,14 @@ int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h); enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt); +#if LIBAVCODEC_VERSION_MAJOR < 53 +/** + * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this. + */ +attribute_deprecated int avcodec_thread_init(AVCodecContext *s, int thread_count); void avcodec_thread_free(AVCodecContext *s); +#endif int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 00e419bf0c..0e033d37c0 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -256,7 +256,7 @@ static int thread_init(AVCodecContext *avctx) if(pthread_create(&c->workers[i], NULL, worker, avctx)) { avctx->thread_count = i; pthread_mutex_unlock(&c->current_job_lock); - avcodec_thread_free(avctx); + ff_thread_free(avctx); return -1; } } @@ -870,7 +870,7 @@ static void validate_thread_parameters(AVCodecContext *avctx) } } -int avcodec_thread_init(AVCodecContext *avctx, int thread_count) +int ff_thread_init(AVCodecContext *avctx, int thread_count) { if (avctx->thread_opaque) { av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n"); @@ -891,7 +891,7 @@ int avcodec_thread_init(AVCodecContext *avctx, int thread_count) return 0; } -void avcodec_thread_free(AVCodecContext *avctx) +void ff_thread_free(AVCodecContext *avctx) { if (avctx->active_thread_type&FF_THREAD_FRAME) frame_thread_free(avctx, avctx->thread_count); diff --git a/libavcodec/thread.h b/libavcodec/thread.h index d9186d6850..485f4ec188 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -108,4 +108,7 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f); */ void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f); +int ff_thread_init(AVCodecContext *s, int thread_count); +void ff_thread_free(AVCodecContext *s); + #endif /* AVCODEC_THREAD_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 790d182559..04f511fc75 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -540,7 +540,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) avctx->frame_number = 0; if (HAVE_THREADS && !avctx->thread_opaque) { - ret = avcodec_thread_init(avctx, avctx->thread_count); + ret = ff_thread_init(avctx, avctx->thread_count); if (ret < 0) { goto free_and_end; } @@ -819,7 +819,7 @@ av_cold int avcodec_close(AVCodecContext *avctx) } if (HAVE_THREADS && avctx->thread_opaque) - avcodec_thread_free(avctx); + ff_thread_free(avctx); if (avctx->codec && avctx->codec->close) avctx->codec->close(avctx); avcodec_default_free_buffers(avctx); @@ -1180,7 +1180,7 @@ int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) { #endif #if !HAVE_THREADS -int avcodec_thread_init(AVCodecContext *s, int thread_count){ +int ff_thread_init(AVCodecContext *s, int thread_count){ s->thread_count = thread_count; return -1; } @@ -1319,3 +1319,17 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field) } #endif + +#if LIBAVCODEC_VERSION_MAJOR < 53 + +int avcodec_thread_init(AVCodecContext *s, int thread_count) +{ + return ff_thread_init(s, thread_count); +} + +void avcodec_thread_free(AVCodecContext *s) +{ + return ff_thread_free(s); +} + +#endif diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c index 007508e409..1659fd3031 100644 --- a/libavcodec/w32thread.c +++ b/libavcodec/w32thread.c @@ -69,10 +69,10 @@ static unsigned WINAPI attribute_align_arg thread_func(void *v){ } /** - * Free what has been allocated by avcodec_thread_init(). + * Free what has been allocated by ff_thread_init(). * Must be called after decoding has finished, especially do not call while avcodec_thread_execute() is running. */ -void avcodec_thread_free(AVCodecContext *s){ +void ff_thread_free(AVCodecContext *s){ ThreadContext *c= s->thread_opaque; int i; @@ -124,7 +124,7 @@ static int avcodec_thread_execute2(AVCodecContext *s, int (*func)(AVCodecContext avcodec_thread_execute(s, NULL, arg, ret, count, 0); } -int avcodec_thread_init(AVCodecContext *s, int thread_count){ +int ff_thread_init(AVCodecContext *s, int thread_count){ int i; ThreadContext *c; uint32_t threadid; @@ -169,6 +169,6 @@ int avcodec_thread_init(AVCodecContext *s, int thread_count){ return 0; fail: - avcodec_thread_free(s); + ff_thread_free(s); return -1; } -- cgit v1.2.3