diff options
Diffstat (limited to 'libavcodec/cyuv.c')
| -rw-r--r-- | libavcodec/cyuv.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 86f7aacb65..f2b0a7cbab 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -6,20 +6,20 @@ * * Copyright (C) 2003 The FFmpeg project * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -52,7 +52,6 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx) if (s->width & 0x3) return AVERROR_INVALIDDATA; s->height = avctx->height; - avctx->pix_fmt = AV_PIX_FMT_YUV411P; return 0; } @@ -82,6 +81,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, int stream_ptr; unsigned char cur_byte; int pixel_groups; + int rawsize = s->height * FFALIGN(s->width,2) * 2; int ret; if (avctx->codec_id == AV_CODEC_ID_AURA) { @@ -92,7 +92,11 @@ static int cyuv_decode_frame(AVCodecContext *avctx, * followed by (height) lines each with 3 bytes to represent groups * of 4 pixels. Thus, the total size of the buffer ought to be: * (3 * 16) + height * (width * 3 / 4) */ - if (buf_size != 48 + s->height * (s->width * 3 / 4)) { + if (buf_size == 48 + s->height * (s->width * 3 / 4)) { + avctx->pix_fmt = AV_PIX_FMT_YUV411P; + } else if(buf_size == rawsize ) { + avctx->pix_fmt = AV_PIX_FMT_UYVY422; + } else { av_log(avctx, AV_LOG_ERROR, "got a buffer with %d bytes when %d were expected\n", buf_size, 48 + s->height * (s->width * 3 / 4)); return AVERROR_INVALIDDATA; @@ -101,15 +105,22 @@ static int cyuv_decode_frame(AVCodecContext *avctx, /* pixel data starts 48 bytes in, after 3x16-byte tables */ stream_ptr = 48; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } y_plane = frame->data[0]; u_plane = frame->data[1]; v_plane = frame->data[2]; + if (buf_size == rawsize) { + int linesize = FFALIGN(s->width,2) * 2; + y_plane += frame->linesize[0] * s->height; + for (stream_ptr = 0; stream_ptr < rawsize; stream_ptr += linesize) { + y_plane -= frame->linesize[0]; + memcpy(y_plane, buf+stream_ptr, linesize); + } + } else { + /* iterate through each line in the height */ for (y_ptr = 0, u_ptr = 0, v_ptr = 0; y_ptr < (s->height * frame->linesize[0]); @@ -157,6 +168,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, } } + } *got_frame = 1; @@ -173,6 +185,7 @@ AVCodec ff_aura_decoder = { .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -186,5 +199,6 @@ AVCodec ff_cyuv_decoder = { .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |