virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

bmv: get a new frame on every decode_frame(), so we can use direct rendering

Browse Source
This commit is contained in:
Kostya Shishkov 2012-10-18 11:08:01 +02:00
parent 1cd432e167
commit 8774d58358
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/bmv.c
View File

@ -196,7 +196,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
{ {
BMVDecContext * const c = avctx->priv_data; BMVDecContext * const c = avctx->priv_data;
int type, scr_off; int type, scr_off;
int i; int i, ret;
uint8_t *srcptr, *outptr; uint8_t *srcptr, *outptr;
c->stream = pkt->data; c->stream = pkt->data;
@ -237,6 +237,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
scr_off = 0; scr_off = 0;
} }
if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic);
c->pic.reference = 3;
if ((ret = avctx->get_buffer(avctx, &c->pic)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
if (decode_bmv_frame(c->stream, pkt->size - (c->stream - pkt->data), c->frame, scr_off)) { if (decode_bmv_frame(c->stream, pkt->size - (c->stream - pkt->data), c->frame, scr_off)) {
av_log(avctx, AV_LOG_ERROR, "Error decoding frame data\n"); av_log(avctx, AV_LOG_ERROR, "Error decoding frame data\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -268,12 +277,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
c->avctx = avctx; c->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
c->pic.reference = 1;
if (avctx->get_buffer(avctx, &c->pic) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
c->frame = c->frame_base + 640; c->frame = c->frame_base + 640;
return 0; return 0;
@ -365,6 +368,7 @@ AVCodec ff_bmv_video_decoder = {
.init = decode_init, .init = decode_init,
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"), .long_name = NULL_IF_CONFIG_SMALL("Discworld II BMV video"),
}; };