diff options
author | Alexander Strange <astrange@ithinksw.com> | 2011-03-30 01:18:21 +0400 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2011-04-05 18:53:26 +0400 |
commit | ba9ef8d04ecd009036b7c380e71bac081c56c53e (patch) | |
tree | 64992160a7850a4be6ce614caa706ae1a6d852e8 | |
parent | d6f66edd65992c1275f8e4271be212e1a4808425 (diff) |
Remove unnecessary parameter from ff_thread_init() and fix behavior
thread_count passed to ff_thread_init() is only used to set AVCodecContext.
thread_count, and can be removed. Instead move it to the legacy implementation
of avcodec_thread_init().
This also fixes the problem that calling avcodec_thread_init() with pthreads
enabled did not set it since ff1efc524cb3c60f2f746e3b4550bb1a86c65316.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
-rw-r--r-- | libavcodec/pthread.c | 2 | ||||
-rw-r--r-- | libavcodec/thread.h | 2 | ||||
-rw-r--r-- | libavcodec/utils.c | 8 | ||||
-rw-r--r-- | libavcodec/w32thread.c | 9 |
4 files changed, 10 insertions, 11 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index c40fde3a02..70845f0ba0 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -882,7 +882,7 @@ static void validate_thread_parameters(AVCodecContext *avctx) } } -int ff_thread_init(AVCodecContext *avctx, int thread_count) +int ff_thread_init(AVCodecContext *avctx) { if (avctx->thread_opaque) { av_log(avctx, AV_LOG_ERROR, "avcodec_thread_init is ignored after avcodec_open\n"); diff --git a/libavcodec/thread.h b/libavcodec/thread.h index e63c10a5e4..401c4d25a8 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -108,7 +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); +int ff_thread_init(AVCodecContext *s); void ff_thread_free(AVCodecContext *s); #endif /* AVCODEC_THREAD_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bf6baf4e78..12561d0e32 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -539,7 +539,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) avctx->frame_number = 0; if (HAVE_THREADS && !avctx->thread_opaque) { - ret = ff_thread_init(avctx, avctx->thread_count); + ret = ff_thread_init(avctx); if (ret < 0) { goto free_and_end; } @@ -1147,8 +1147,7 @@ int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) { #endif #if !HAVE_THREADS -int ff_thread_init(AVCodecContext *s, int thread_count){ - s->thread_count = thread_count; +int ff_thread_init(AVCodecContext *s){ return -1; } #endif @@ -1291,7 +1290,8 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field) int avcodec_thread_init(AVCodecContext *s, int thread_count) { - return ff_thread_init(s, thread_count); + s->thread_count = thread_count; + return ff_thread_init(s); } void avcodec_thread_free(AVCodecContext *s) diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c index 27a928e855..023be0e663 100644 --- a/libavcodec/w32thread.c +++ b/libavcodec/w32thread.c @@ -125,7 +125,7 @@ static int avcodec_thread_execute2(AVCodecContext *s, int (*func)(AVCodecContext avcodec_thread_execute(s, NULL, arg, ret, count, 0); } -int ff_thread_init(AVCodecContext *s, int thread_count){ +int ff_thread_init(AVCodecContext *s){ int i; ThreadContext *c; uint32_t threadid; @@ -135,14 +135,13 @@ int ff_thread_init(AVCodecContext *s, int thread_count){ return 0; } - s->thread_count= thread_count; s->active_thread_type= FF_THREAD_SLICE; - if (thread_count <= 1) + if (s->thread_count <= 1) return 0; assert(!s->thread_opaque); - c= av_mallocz(sizeof(ThreadContext)*thread_count); + c= av_mallocz(sizeof(ThreadContext)*s->thread_count); s->thread_opaque= c; if(!(c[0].work_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL))) goto fail; @@ -151,7 +150,7 @@ int ff_thread_init(AVCodecContext *s, int thread_count){ if(!(c[0].done_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL))) goto fail; - for(i=0; i<thread_count; i++){ + for(i=0; i<s->thread_count; i++){ //printf("init semaphors %d\n", i); fflush(stdout); c[i].avctx= s; c[i].work_sem = c[0].work_sem; |