On Tue, Mar 29, 2011 at 5:23 PM, Alexander Strange
<astra...@ithinksw.com> wrote:
> 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.
Can someone test that w32threads behaves the same after this? I can't build it.
> ---
> libavcodec/pthread.c | 2 +-
> libavcodec/thread.h | 2 +-
> libavcodec/utils.c | 8 ++++----
> libavcodec/w32thread.c | 3 +--
> 4 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
> index d6086d6..d6b8fb2 100644
> --- a/libavcodec/pthread.c
> +++ b/libavcodec/pthread.c
> @@ -880,7 +880,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 e63c10a..401c4d2 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 bf6baf4..12561d0 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 27a928e..1ca8559 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,7 +135,6 @@ 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)
> --
> 1.7.4.1
>
>
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
