diff options
| author | Torsten Jager <t.jager@gmx.de> | 2014-05-24 15:23:10 +0200 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2014-05-24 15:23:10 +0200 |
| commit | 859127091f6ed35f60ebb5b1d40bef87f9f4a8b9 (patch) | |
| tree | 74e090fd2557846a3f8174a77445be216440de65 /src | |
| parent | 3d704515f0df46cf62a93bf74962e6645d5220a9 (diff) | |
| download | xine-lib-859127091f6ed35f60ebb5b1d40bef87f9f4a8b9.tar.gz xine-lib-859127091f6ed35f60ebb5b1d40bef87f9f4a8b9.tar.bz2 | |
ff_video_decoder: fix multithreading #2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 21fbcdcc0..fa354b28f 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -281,6 +281,16 @@ static int get_buffer (AVCodecContext *context, AVFrame *av_frame) int top_edge; int guarded_render = 0; + /* multiple threads have individual contexts !! */ +#ifdef AVCODEC_HAS_COLORSPACE + if (context != this->context) { + if (this->context->colorspace == 2) /* undefined */ + this->context->colorspace = context->colorspace; + if (this->context->color_range == 0) + this->context->color_range = context->color_range; + } +#endif + /* A bit of unmotivated paranoia... */ if (buf_width < width) buf_width = width; @@ -304,7 +314,7 @@ static int get_buffer (AVCodecContext *context, AVFrame *av_frame) avcodec_align_dimensions(context, &buf_width, &buf_height); #ifdef ENABLE_VAAPI - if( this->context->pix_fmt == PIX_FMT_VAAPI_VLD) { + if( context->pix_fmt == PIX_FMT_VAAPI_VLD ) { av_frame->opaque = NULL; av_frame->data[0] = NULL; @@ -417,8 +427,8 @@ static int get_buffer (AVCodecContext *context, AVFrame *av_frame) buf_height += top_edge + this->edge + 15; buf_height &= ~15; - if ((this->full2mpeg || (this->context->pix_fmt != PIX_FMT_YUV420P && - this->context->pix_fmt != PIX_FMT_YUVJ420P)) || guarded_render) { + if (this->full2mpeg || guarded_render || + (context->pix_fmt != PIX_FMT_YUV420P && context->pix_fmt != PIX_FMT_YUVJ420P)) { if (!this->is_direct_rendering_disabled) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n")); |