generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix buffering in qpeg in a way that allows direct rendering.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-04-28 14:06:36 +02:00
parent 183401b924
commit a0db7424e4
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/qpeg.c
View File

@ -28,8 +28,7 @@
typedef struct QpegContext{ typedef struct QpegContext{
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame pic; AVFrame pic, ref;
uint8_t *refdata;
uint32_t pal[256]; uint32_t pal[256];
} QpegContext; } QpegContext;
@ -124,9 +123,12 @@ static void qpeg_decode_inter(const uint8_t *src, uint8_t *dst, int size,
int filled = 0; int filled = 0;
int orig_height; int orig_height;
if(!refdata)
refdata= dst;
/* copy prev frame */ /* copy prev frame */
for(i = 0; i < height; i++) for(i = 0; i < height; i++)
memcpy(refdata + (i * width), dst + (i * stride), width); memcpy(dst + (i * stride), refdata + (i * stride), width);
orig_height = height; orig_height = height;
height--; height--;
@ -172,10 +174,10 @@ static void qpeg_decode_inter(const uint8_t *src, uint8_t *dst, int size,
me_x, me_y, me_w, me_h, filled, height); me_x, me_y, me_w, me_h, filled, height);
else { else {
/* do motion compensation */ /* do motion compensation */
me_plane = refdata + (filled + me_x) + (height - me_y) * width; me_plane = refdata + (filled + me_x) + (height - me_y) * stride;
for(j = 0; j < me_h; j++) { for(j = 0; j < me_h; j++) {
for(i = 0; i < me_w; i++) for(i = 0; i < me_w; i++)
dst[filled + i - (j * stride)] = me_plane[i - (j * width)]; dst[filled + i - (j * stride)] = me_plane[i - (j * stride)];
} }
} }
} }
@ -254,15 +256,17 @@ static int decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
QpegContext * const a = avctx->priv_data; QpegContext * const a = avctx->priv_data;
AVFrame * const p= (AVFrame*)&a->pic; AVFrame * p= (AVFrame*)&a->pic;
AVFrame * ref= (AVFrame*)&a->ref;
uint8_t* outdata; uint8_t* outdata;
int delta; int delta;
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
if(p->data[0]) if(ref->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, ref);
FFSWAP(AVFrame, *ref, *p);
p->reference= 0; p->reference= 3;
if(avctx->get_buffer(avctx, p) < 0){ if(avctx->get_buffer(avctx, p) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
@ -272,7 +276,7 @@ static int decode_frame(AVCodecContext *avctx,
qpeg_decode_intra(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height); qpeg_decode_intra(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height);
} else { } else {
delta = buf[0x85]; delta = buf[0x85];
qpeg_decode_inter(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height, delta, buf + 4, a->refdata); qpeg_decode_inter(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height, delta, buf + 4, a->ref.data[0]);
} }
/* make the palette available on the way out */ /* make the palette available on the way out */
@ -293,7 +297,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
a->avctx = avctx; a->avctx = avctx;
avctx->pix_fmt= PIX_FMT_PAL8; avctx->pix_fmt= PIX_FMT_PAL8;
a->refdata = av_malloc(avctx->width * avctx->height);
return 0; return 0;
} }
@ -301,11 +304,13 @@ static av_cold int decode_init(AVCodecContext *avctx){
static av_cold int decode_end(AVCodecContext *avctx){ static av_cold int decode_end(AVCodecContext *avctx){
QpegContext * const a = avctx->priv_data; QpegContext * const a = avctx->priv_data;
AVFrame * const p= (AVFrame*)&a->pic; AVFrame * const p= (AVFrame*)&a->pic;
AVFrame * const ref= (AVFrame*)&a->ref;
if(p->data[0]) if(p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
if(ref->data[0])
avctx->release_buffer(avctx, ref);
av_free(a->refdata);
return 0; return 0;
} }