RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/pthread: add wpp api 

cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c

Conflicts:

	libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mickaël Raulet 2013-10-20 22:48:03 +02:00 committed by Michael Niedermayer
parent 519395e4dd
commit e146c326b9
3 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libavcodec/pthread.c
View File

@ -66,6 +66,12 @@ typedef struct ThreadContext {
unsigned current_execute;
int current_job;
int done;
int *entries;
int entries_count;
int thread_count;
pthread_cond_t *progress_cond;
pthread_mutex_t *progress_mutex;
} ThreadContext;
/**
@ -1126,3 +1132,62 @@ void ff_thread_free(AVCodecContext *avctx)
else
thread_free(avctx);
}
void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n)
{
ThreadContext *p = avctx->thread_opaque;
int *entries = p->entries;
pthread_mutex_lock(&p->progress_mutex[thread]);
entries[field] +=n;
pthread_cond_signal(&p->progress_cond[thread]);
pthread_mutex_unlock(&p->progress_mutex[thread]);
}
void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift)
{
ThreadContext *p = avctx->thread_opaque;
int *entries = p->entries;
if (!entries || !field) return;
thread = thread ? thread - 1 : p->thread_count - 1;
pthread_mutex_lock(&p->progress_mutex[thread]);
while ((entries[field - 1] - entries[field]) < shift){
pthread_cond_wait(&p->progress_cond[thread], &p->progress_mutex[thread]);
}
pthread_mutex_unlock(&p->progress_mutex[thread]);
}
int ff_alloc_entries(AVCodecContext *avctx, int count)
{
int i;
if (avctx->active_thread_type & FF_THREAD_SLICE) {
ThreadContext *p = avctx->thread_opaque;
p->thread_count = avctx->thread_count;
p->entries = av_mallocz(count * sizeof(int));
if (!p->entries) {
return AVERROR(ENOMEM);
}
p->entries_count = count;
p->progress_mutex = av_malloc(p->thread_count * sizeof(pthread_mutex_t));
p->progress_cond = av_malloc(p->thread_count * sizeof(pthread_cond_t));
for (i = 0; i < p->thread_count; i++) {
pthread_mutex_init(&p->progress_mutex[i], NULL);
pthread_cond_init(&p->progress_cond[i], NULL);
}
}
return 0;
}
void ff_reset_entries(AVCodecContext *avctx)
{
ThreadContext *p = avctx->thread_opaque;
memset(p->entries, 0, p->entries_count * sizeof(int));
}

5
libavcodec/thread.h
View File

@ -135,4 +135,9 @@ int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src);
int ff_thread_init(AVCodecContext *s);
void ff_thread_free(AVCodecContext *s);
int ff_alloc_entries(AVCodecContext *avctx, int count);
void ff_reset_entries(AVCodecContext *avctx);
void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n);
void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift);
#endif /* AVCODEC_THREAD_H */

17
libavcodec/utils.c
View File

@ -3269,6 +3269,23 @@ int ff_thread_can_start_frame(AVCodecContext *avctx)
return 1;
}
int ff_alloc_entries(AVCodecContext *avctx, int count)
{
return 0;
}
void ff_reset_entries(AVCodecContext *avctx)
{
}
void ff_thread_await_progress2(AVCodecContext *avctx, int field, int thread, int shift)
{
}
void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, int n)
{
}
#endif
enum AVMediaType avcodec_get_type(enum AVCodecID codec_id)