Mercurial > libavcodec.hg
changeset 1607:9ef0d51e809b libavcodec
Set buffer hints, use cr where available
| author | rtognimp |
|---|---|
| date | Fri, 07 Nov 2003 21:21:36 +0000 |
| parents | a1ac8e675b95 |
| children | 639972344c6f |
| files | msrle.c msvideo1.c rpza.c |
| diffstat | 3 files changed, 45 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/msrle.c Fri Nov 07 21:20:24 2003 +0000 +++ b/msrle.c Fri Nov 07 21:21:36 2003 +0000 @@ -160,10 +160,19 @@ { MsrleContext *s = (MsrleContext *)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(avctx, AV_LOG_ERROR, " MS RLE: get_buffer() failed\n"); return -1; @@ -185,6 +194,7 @@ avctx->release_buffer(avctx, &s->prev_frame); /* shuffle frames */ + if (!avctx->cr_available) s->prev_frame = s->frame; *data_size = sizeof(AVFrame); @@ -214,5 +224,5 @@ NULL, msrle_decode_end, msrle_decode_frame, - CODEC_CAP_DR1, + CODEC_CAP_DR1 | CODEC_CAP_CR, };
--- a/msvideo1.c Fri Nov 07 21:20:24 2003 +0000 +++ b/msvideo1.c Fri Nov 07 21:21:36 2003 +0000 @@ -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 @@ { 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 @@ 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 @@ NULL, msvideo1_decode_end, msvideo1_decode_frame, - CODEC_CAP_DR1, + CODEC_CAP_DR1 | CODEC_CAP_CR, };
--- a/rpza.c Fri Nov 07 21:20:24 2003 +0000 +++ b/rpza.c Fri Nov 07 21:21:36 2003 +0000 @@ -140,6 +140,7 @@ /* Skip blocks */ case 0x80: while (n_blocks--) { + if (!s->avctx->cr_available) { block_ptr = row_ptr + pixel_ptr; for (pixel_y = 0; pixel_y < 4; pixel_y++) { for (pixel_x = 0; pixel_x < 4; pixel_x++){ @@ -148,7 +149,8 @@ } block_ptr += row_inc; } - ADVANCE_BLOCK(); + } + ADVANCE_BLOCK(); } break; @@ -264,21 +266,36 @@ { RpzaContext *s = (RpzaContext *)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(avctx, AV_LOG_ERROR, " RPZA Video: get_buffer() failed\n"); return -1; } + if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0])) + av_log(avctx, AV_LOG_ERROR, "Buffer linesize changed: current %u, previous %u.\n" + "Expect wrong image and/or crash!\n", + s->frame.linesize[0], s->prev_frame.linesize[0]); + rpza_decode_stream(s); if (s->prev_frame.data[0]) avctx->release_buffer(avctx, &s->prev_frame); /* shuffle frames */ + if (!avctx->cr_available) s->prev_frame = s->frame; *data_size = sizeof(AVFrame); @@ -307,5 +324,5 @@ NULL, rpza_decode_end, rpza_decode_frame, - CODEC_CAP_DR1, + CODEC_CAP_DR1 | CODEC_CAP_CR, };