# HG changeset patch # User kabi # Date 1036432990 0 # Node ID 9cec9eab681f31bd28a2b9fc42edda909d732ac3 # Parent d73ad03912f550e4449c353568b855b3530f9df8 * DR1 support diff -r d73ad03912f5 -r 9cec9eab681f dv.c --- a/dv.c Mon Nov 04 10:01:15 2002 +0000 +++ b/dv.c Mon Nov 04 18:03:10 2002 +0000 @@ -551,18 +551,39 @@ else mb_pos_ptr = dv_place_420; + if (avctx->flags & CODEC_FLAG_DR1 && avctx->get_buffer_callback) + { + s->width = -1; + avctx->dr_buffer[0] = avctx->dr_buffer[1] = avctx->dr_buffer[2] = 0; + if(avctx->get_buffer_callback(avctx, width, height, I_TYPE) < 0){ + fprintf(stderr, "get_buffer() failed\n"); + return -1; + } + } + + /* (re)alloc picture if needed */ if (s->width != width || s->height != height) { - for(i=0;i<3;i++) - av_freep(&s->current_picture[i]); + if (!(avctx->flags & CODEC_FLAG_DR1)) + for(i=0;i<3;i++) { + if (avctx->dr_buffer[i] != s->current_picture[i]) + av_freep(&s->current_picture[i]); + avctx->dr_buffer[i] = 0; + } + for(i=0;i<3;i++) { - size = width * height; - s->linesize[i] = width; - if (i >= 1) { - size >>= 2; - s->linesize[i] >>= s->sampling_411 ? 2 : 1; - } - s->current_picture[i] = av_malloc(size); + if (avctx->dr_buffer[i]) { + s->current_picture[i] = avctx->dr_buffer[i]; + s->linesize[i] = (i == 0) ? avctx->dr_stride : avctx->dr_uvstride; + } else { + size = width * height; + s->linesize[i] = width; + if (i >= 1) { + size >>= 2; + s->linesize[i] >>= s->sampling_411 ? 2 : 1; + } + s->current_picture[i] = av_malloc(size); + } if (!s->current_picture[i]) return -1; } @@ -614,6 +635,7 @@ int i; for(i=0;i<3;i++) + if (avctx->dr_buffer[i] != s->current_picture[i]) av_freep(&s->current_picture[i]); return 0; } @@ -627,7 +649,7 @@ NULL, dvvideo_decode_end, dvvideo_decode_frame, - 0, + CODEC_CAP_DR1, NULL };