virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

tiff: frame multithreading support

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-08-09 14:01:46 +00:00
parent 9706401927
commit 8a7295beeb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/tiff.c
View File

@ -41,6 +41,7 @@
#include "mathops.h" #include "mathops.h"
#include "tiff.h" #include "tiff.h"
#include "tiff_data.h" #include "tiff_data.h"
#include "thread.h"
typedef struct TiffContext { typedef struct TiffContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@ -492,7 +493,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
return 0; return 0;
} }
static int init_image(TiffContext *s, AVFrame *frame) static int init_image(TiffContext *s, ThreadFrame *frame)
{ {
int i, ret; int i, ret;
uint32_t *pal; uint32_t *pal;
@ -549,14 +550,14 @@ static int init_image(TiffContext *s, AVFrame *frame)
return ret; return ret;
avcodec_set_dimensions(s->avctx, s->width, s->height); avcodec_set_dimensions(s->avctx, s->width, s->height);
} }
if ((ret = ff_get_buffer(s->avctx, frame, 0)) < 0) if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0)
return ret; return ret;
if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
if (s->palette_is_set) { if (s->palette_is_set) {
memcpy(frame->data[1], s->palette, sizeof(s->palette)); memcpy(frame->f->data[1], s->palette, sizeof(s->palette));
} else { } else {
/* make default grayscale pal */ /* make default grayscale pal */
pal = (uint32_t *) frame->data[1]; pal = (uint32_t *) frame->f->data[1];
for (i = 0; i < 1<<s->bpp; i++) for (i = 0; i < 1<<s->bpp; i++)
pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101; pal[i] = 0xFFU << 24 | i * 255 / ((1<<s->bpp) - 1) * 0x010101;
} }
@ -936,6 +937,7 @@ static int decode_frame(AVCodecContext *avctx,
{ {
TiffContext *const s = avctx->priv_data; TiffContext *const s = avctx->priv_data;
AVFrame *const p = data; AVFrame *const p = data;
ThreadFrame frame = { .f = data };
unsigned off; unsigned off;
int le, ret, plane, planes; int le, ret, plane, planes;
int i, j, entries, stride; int i, j, entries, stride;
@ -996,7 +998,7 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
/* now we have the data and may start decoding */ /* now we have the data and may start decoding */
if ((ret = init_image(s, p)) < 0) if ((ret = init_image(s, &frame)) < 0)
return ret; return ret;
if (s->strips == 1 && !s->stripsize) { if (s->strips == 1 && !s->stripsize) {
@ -1135,5 +1137,6 @@ AVCodec ff_tiff_decoder = {
.init = tiff_init, .init = tiff_init,
.close = tiff_end, .close = tiff_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .init_thread_copy = ONLY_IF_THREADS_ENABLED(tiff_init),
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
}; };