diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 23:58:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 00:13:54 +0200 |
| commit | 01aa664f215345cddd57a3dcea2740ac0d0daf5f (patch) | |
| tree | 90753b1d0ef4e2c6e1dd280de52696d6d20489d8 | |
| parent | 99b18b110c98e3ec7444b9756a908da8dcd5765b (diff) | |
| download | ffmpeg-01aa664f215345cddd57a3dcea2740ac0d0daf5f.tar.gz | |
cyuv: implement raw cyuv
Fixes Ticket1620
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/cyuv.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index e472a4016e..df0a2d206b 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -53,7 +53,6 @@ static av_cold int cyuv_decode_init(AVCodecContext *avctx) if (s->width & 0x3) return -1; s->height = avctx->height; - avctx->pix_fmt = PIX_FMT_YUV411P; avcodec_get_frame_defaults(&s->frame); return 0; @@ -83,6 +82,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; if (avctx->codec_id == AV_CODEC_ID_AURA) { y_table = u_table; @@ -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 = PIX_FMT_YUV411P; + } else if(buf_size == rawsize ) { + avctx->pix_fmt = 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 -1; @@ -115,6 +119,15 @@ static int cyuv_decode_frame(AVCodecContext *avctx, u_plane = s->frame.data[1]; v_plane = s->frame.data[2]; + if (buf_size == rawsize) { + int linesize = FFALIGN(s->width,2) * 2; + y_plane += s->frame.linesize[0] * s->height; + for (stream_ptr = 0; stream_ptr < rawsize; stream_ptr += linesize) { + y_plane -= s->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 * s->frame.linesize[0]); @@ -162,6 +175,7 @@ static int cyuv_decode_frame(AVCodecContext *avctx, } } + } *data_size=sizeof(AVFrame); *(AVFrame*)data= s->frame; |