Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Browse Source 
It's a private field, it should not be visible to callers.

Deprecate AVCodecContext.thread_opaque
pull/45/head
Anton Khirnov 11 years ago
parent daa7a1d443
commit 38ecc3702d
7 changed files with 38 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libavcodec/avcodec.h
  2. 2
      libavcodec/internal.h
  3. 1
      libavcodec/options.c
  4. 43
      libavcodec/pthread_frame.c
  5. 12
      libavcodec/pthread_slice.c
  6. 2
      libavcodec/utils.c
  7. 3
      libavcodec/version.h

8
libavcodec/avcodec.h
Unescape View File

@ -2532,13 +2532,13 @@ typedef struct AVCodecContext {
*/ */
int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
#if FF_API_THREAD_OPAQUE
/** /**
* thread opaque * @deprecated this field should not be used from outside of lavc
* Can be used by execute() to store some per AVCodecContext stuff.
* - encoding: set by execute()
* - decoding: set by execute()
*/ */
attribute_deprecated
void *thread_opaque; void *thread_opaque;
#endif
/** /**
* noise vs. sse weight for the nsse comparsion function * noise vs. sse weight for the nsse comparsion function

2
libavcodec/internal.h
Unescape View File

@ -86,6 +86,8 @@ typedef struct AVCodecInternal {
AVFrame to_free; AVFrame to_free;
FramePool *pool; FramePool *pool;
void *thread_ctx;
} AVCodecInternal; } AVCodecInternal;
struct AVCodecDefault { struct AVCodecDefault {

1
libavcodec/options.c
Unescape View File

@ -150,7 +150,6 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->codec = NULL; dest->codec = NULL;
dest->slice_offset = NULL; dest->slice_offset = NULL;
dest->hwaccel = NULL; dest->hwaccel = NULL;
dest->thread_opaque = NULL;
dest->internal = NULL; dest->internal = NULL;
/* reallocate values that should be allocated separately */ /* reallocate values that should be allocated separately */

43
libavcodec/pthread_frame.c
Unescape View File

@ -46,7 +46,7 @@
#include "libavutil/mem.h" #include "libavutil/mem.h"
/** /**
* Context used by codec threads and stored in their AVCodecContext thread_opaque. * Context used by codec threads and stored in their AVCodecInternal thread_ctx.
*/ */
typedef struct PerThreadContext { typedef struct PerThreadContext {
struct FrameThreadContext *parent; struct FrameThreadContext *parent;
@ -93,7 +93,7 @@ typedef struct PerThreadContext {
} PerThreadContext; } PerThreadContext;
/** /**
* Context stored in the client AVCodecContext thread_opaque. * Context stored in the client AVCodecInternal thread_ctx.
*/ */
typedef struct FrameThreadContext { typedef struct FrameThreadContext {
PerThreadContext *threads; ///< The contexts for each thread. PerThreadContext *threads; ///< The contexts for each thread.
@ -365,7 +365,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
AVFrame *picture, int *got_picture_ptr, AVFrame *picture, int *got_picture_ptr,
AVPacket *avpkt) AVPacket *avpkt)
{ {
FrameThreadContext *fctx = avctx->thread_opaque; FrameThreadContext *fctx = avctx->internal->thread_ctx;
int finished = fctx->next_finished; int finished = fctx->next_finished;
PerThreadContext *p; PerThreadContext *p;
int err; int err;
@ -441,7 +441,7 @@ void ff_thread_report_progress(ThreadFrame *f, int n, int field)
if (!progress || progress[field] >= n) return; if (!progress || progress[field] >= n) return;
p = f->owner->thread_opaque; p = f->owner->internal->thread_ctx;
if (f->owner->debug&FF_DEBUG_THREADS) if (f->owner->debug&FF_DEBUG_THREADS)
av_log(f->owner, AV_LOG_DEBUG, "%p finished %d field %d\n", progress, n, field); av_log(f->owner, AV_LOG_DEBUG, "%p finished %d field %d\n", progress, n, field);
@ -459,7 +459,7 @@ void ff_thread_await_progress(ThreadFrame *f, int n, int field)
if (!progress || progress[field] >= n) return; if (!progress || progress[field] >= n) return;
p = f->owner->thread_opaque; p = f->owner->internal->thread_ctx;
if (f->owner->debug&FF_DEBUG_THREADS) if (f->owner->debug&FF_DEBUG_THREADS)
av_log(f->owner, AV_LOG_DEBUG, "thread awaiting %d field %d from %p\n", n, field, progress); av_log(f->owner, AV_LOG_DEBUG, "thread awaiting %d field %d from %p\n", n, field, progress);
@ -471,7 +471,7 @@ void ff_thread_await_progress(ThreadFrame *f, int n, int field)
} }
void ff_thread_finish_setup(AVCodecContext *avctx) { void ff_thread_finish_setup(AVCodecContext *avctx) {
PerThreadContext *p = avctx->thread_opaque; PerThreadContext *p = avctx->internal->thread_ctx;
if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return; if (!(avctx->active_thread_type&FF_THREAD_FRAME)) return;
@ -500,7 +500,7 @@ static void park_frame_worker_threads(FrameThreadContext *fctx, int thread_count
void ff_frame_thread_free(AVCodecContext *avctx, int thread_count) void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
{ {
FrameThreadContext *fctx = avctx->thread_opaque; FrameThreadContext *fctx = avctx->internal->thread_ctx;
const AVCodec *codec = avctx->codec; const AVCodec *codec = avctx->codec;
int i; int i;
@ -544,16 +544,16 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
if (i) { if (i) {
av_freep(&p->avctx->priv_data); av_freep(&p->avctx->priv_data);
av_freep(&p->avctx->internal);
av_freep(&p->avctx->slice_offset); av_freep(&p->avctx->slice_offset);
} }
av_freep(&p->avctx->internal);
av_freep(&p->avctx); av_freep(&p->avctx);
} }
av_freep(&fctx->threads); av_freep(&fctx->threads);
pthread_mutex_destroy(&fctx->buffer_mutex); pthread_mutex_destroy(&fctx->buffer_mutex);
av_freep(&avctx->thread_opaque); av_freep(&avctx->internal->thread_ctx);
} }
int ff_frame_thread_init(AVCodecContext *avctx) int ff_frame_thread_init(AVCodecContext *avctx)
@ -583,7 +583,7 @@ int ff_frame_thread_init(AVCodecContext *avctx)
return 0; return 0;
} }
avctx->thread_opaque = fctx = av_mallocz(sizeof(FrameThreadContext)); avctx->internal->thread_ctx = fctx = av_mallocz(sizeof(FrameThreadContext));
fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count); fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
pthread_mutex_init(&fctx->buffer_mutex, NULL); pthread_mutex_init(&fctx->buffer_mutex, NULL);
@ -608,9 +608,16 @@ int ff_frame_thread_init(AVCodecContext *avctx)
} }
*copy = *src; *copy = *src;
copy->thread_opaque = p;
copy->pkt = &p->avpkt; copy->pkt = &p->avpkt;
copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) {
err = AVERROR(ENOMEM);
goto error;
}
*copy->internal = *src->internal;
copy->internal->thread_ctx = p;
if (!i) { if (!i) {
src = copy; src = copy;
@ -625,12 +632,6 @@ int ff_frame_thread_init(AVCodecContext *avctx)
goto error; goto error;
} }
memcpy(copy->priv_data, src->priv_data, codec->priv_data_size); memcpy(copy->priv_data, src->priv_data, codec->priv_data_size);
copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) {
err = AVERROR(ENOMEM);
goto error;
}
*copy->internal = *src->internal;
copy->internal->is_copy = 1; copy->internal->is_copy = 1;
if (codec->init_thread_copy) if (codec->init_thread_copy)
@ -654,9 +655,9 @@ error:
void ff_thread_flush(AVCodecContext *avctx) void ff_thread_flush(AVCodecContext *avctx)
{ {
int i; int i;
FrameThreadContext *fctx = avctx->thread_opaque; FrameThreadContext *fctx = avctx->internal->thread_ctx;
if (!avctx->thread_opaque) return; if (!fctx) return;
park_frame_worker_threads(fctx, avctx->thread_count); park_frame_worker_threads(fctx, avctx->thread_count);
if (fctx->prev_thread) { if (fctx->prev_thread) {
@ -681,7 +682,7 @@ void ff_thread_flush(AVCodecContext *avctx)
int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
{ {
PerThreadContext *p = avctx->thread_opaque; PerThreadContext *p = avctx->internal->thread_ctx;
int err; int err;
f->owner = avctx; f->owner = avctx;
@ -743,7 +744,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
{ {
PerThreadContext *p = avctx->thread_opaque; PerThreadContext *p = avctx->internal->thread_ctx;
FrameThreadContext *fctx; FrameThreadContext *fctx;
AVFrame *dst, *tmp; AVFrame *dst, *tmp;
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS

12
libavcodec/pthread_slice.c
Unescape View File

@ -63,7 +63,7 @@ typedef struct SliceThreadContext {
static void* attribute_align_arg worker(void *v) static void* attribute_align_arg worker(void *v)
{ {
AVCodecContext *avctx = v; AVCodecContext *avctx = v;
SliceThreadContext *c = avctx->thread_opaque; SliceThreadContext *c = avctx->internal->thread_ctx;
unsigned last_execute = 0; unsigned last_execute = 0;
int our_job = c->job_count; int our_job = c->job_count;
int thread_count = avctx->thread_count; int thread_count = avctx->thread_count;
@ -98,7 +98,7 @@ static void* attribute_align_arg worker(void *v)
void ff_slice_thread_free(AVCodecContext *avctx) void ff_slice_thread_free(AVCodecContext *avctx)
{ {
SliceThreadContext *c = avctx->thread_opaque; SliceThreadContext *c = avctx->internal->thread_ctx;
int i; int i;
pthread_mutex_lock(&c->current_job_lock); pthread_mutex_lock(&c->current_job_lock);
@ -113,7 +113,7 @@ void ff_slice_thread_free(AVCodecContext *avctx)
pthread_cond_destroy(&c->current_job_cond); pthread_cond_destroy(&c->current_job_cond);
pthread_cond_destroy(&c->last_job_cond); pthread_cond_destroy(&c->last_job_cond);
av_free(c->workers); av_free(c->workers);
av_freep(&avctx->thread_opaque); av_freep(&avctx->internal->thread_ctx);
} }
static av_always_inline void thread_park_workers(SliceThreadContext *c, int thread_count) static av_always_inline void thread_park_workers(SliceThreadContext *c, int thread_count)
@ -125,7 +125,7 @@ static av_always_inline void thread_park_workers(SliceThreadContext *c, int thre
static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size) static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, int *ret, int job_count, int job_size)
{ {
SliceThreadContext *c = avctx->thread_opaque; SliceThreadContext *c = avctx->internal->thread_ctx;
int dummy_ret; int dummy_ret;
if (!(avctx->active_thread_type&FF_THREAD_SLICE) || avctx->thread_count <= 1) if (!(avctx->active_thread_type&FF_THREAD_SLICE) || avctx->thread_count <= 1)
@ -158,7 +158,7 @@ static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, i
static int thread_execute2(AVCodecContext *avctx, action_func2* func2, void *arg, int *ret, int job_count) static int thread_execute2(AVCodecContext *avctx, action_func2* func2, void *arg, int *ret, int job_count)
{ {
SliceThreadContext *c = avctx->thread_opaque; SliceThreadContext *c = avctx->internal->thread_ctx;
c->func2 = func2; c->func2 = func2;
return thread_execute(avctx, NULL, arg, ret, job_count, 0); return thread_execute(avctx, NULL, arg, ret, job_count, 0);
} }
@ -198,7 +198,7 @@ int ff_slice_thread_init(AVCodecContext *avctx)
return -1; return -1;
} }
avctx->thread_opaque = c; avctx->internal->thread_ctx = c;
c->current_job = 0; c->current_job = 0;
c->job_count = 0; c->job_count = 0;
c->job_size = 0; c->job_size = 0;

2
libavcodec/utils.c
Unescape View File

@ -1567,7 +1567,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
if (avcodec_is_open(avctx)) { if (avcodec_is_open(avctx)) {
FramePool *pool = avctx->internal->pool; FramePool *pool = avctx->internal->pool;
int i; int i;
if (HAVE_THREADS && avctx->thread_opaque) if (HAVE_THREADS && avctx->internal->thread_ctx)
ff_thread_free(avctx); ff_thread_free(avctx);
if (avctx->codec && avctx->codec->close) if (avctx->codec && avctx->codec->close)
avctx->codec->close(avctx); avctx->codec->close(avctx);

3
libavcodec/version.h
Unescape View File

@ -88,5 +88,8 @@
#ifndef FF_API_ASPECT_EXTENDED #ifndef FF_API_ASPECT_EXTENDED
#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_THREAD_OPAQUE
#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */

Write Preview
Loading…
Cancel
Save