diff options
| author | Roberto Togni <r_togni@tiscali.it> | 2003-11-07 21:21:36 +0000 |
|---|---|---|
| committer | Roberto Togni <r_togni@tiscali.it> | 2003-11-07 21:21:36 +0000 |
| commit | e02c251e5ab001eeb010c862670de9b188008b5d (patch) | |
| tree | 388d2594114d6da7b6f7e2681a30bcf931bc3b07 /libavcodec/msvideo1.c | |
| parent | 074c4ca7fd77457f90ab2f4e772ffac8caf17f9c (diff) | |
| download | ffmpeg-e02c251e5ab001eeb010c862670de9b188008b5d.tar.gz | |
Set buffer hints, use cr where available
Originally committed as revision 2485 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msvideo1.c')
| -rw-r--r-- | libavcodec/msvideo1.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 207d4efeb7..d08792e445 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -48,12 +48,14 @@ } #define COPY_PREV_BLOCK() \ + if (!s->avctx->cr_available) {\ pixel_ptr = block_ptr; \ for (pixel_y = 0; pixel_y < 4; pixel_y++) { \ for (pixel_x = 0; pixel_x < 4; pixel_x++, pixel_ptr++) \ pixels[pixel_ptr] = prev_pixels[pixel_ptr]; \ pixel_ptr -= row_dec; \ - } + } \ + } typedef struct Msvideo1Context { @@ -318,9 +320,19 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, { Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; + /* no supplementary picture */ + if (buf_size == 0) + return 0; + s->buf = buf; s->size = buf_size; + s->frame.reference = 1; + s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE; + if (avctx->cr_available) + s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE; + else + s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE; if (avctx->get_buffer(avctx, &s->frame)) { av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 Video: get_buffer() failed\n"); return -1; @@ -340,6 +352,7 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, avctx->release_buffer(avctx, &s->prev_frame); /* shuffle frames */ + if (!avctx->cr_available) s->prev_frame = s->frame; *data_size = sizeof(AVFrame); @@ -368,5 +381,5 @@ AVCodec msvideo1_decoder = { NULL, msvideo1_decode_end, msvideo1_decode_frame, - CODEC_CAP_DR1, + CODEC_CAP_DR1 | CODEC_CAP_CR, }; |