#include "avcodec.h"
#include "bytestream.h"
#include "cga_data.h"
+#include "internal.h"
typedef struct PicContext {
AVFrame frame;
}
static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
PicContext *s = avctx->priv_data;
uint32_t *palette;
int bits_per_plane, bpp, etype, esize, npal, pos_after_pal;
- int i, x, y, plane, tmp;
+ int i, x, y, plane, tmp, val;
bytestream2_init(&s->g, avpkt->data, avpkt->size);
avctx->release_buffer(avctx, &s->frame);
}
- if (avctx->get_buffer(avctx, &s->frame) < 0){
+ if (ff_get_buffer(avctx, &s->frame) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
// skip remaining palette bytes
bytestream2_seek(&s->g, pos_after_pal, SEEK_SET);
+ val = 0;
y = s->height - 1;
if (bytestream2_get_le16(&s->g)) {
x = 0;
while (plane < s->nb_planes && y >= 0 &&
bytestream2_get_bytes_left(&s->g) > stop_size) {
int run = 1;
- int val = bytestream2_get_byte(&s->g);
+ val = bytestream2_get_byte(&s->g);
if (val == marker) {
run = bytestream2_get_byte(&s->g);
if (run == 0)
}
}
}
+
+ if (x < avctx->width && y >= 0) {
+ int run = (y + 1) * avctx->width - x;
+ if (bits_per_plane == 8)
+ picmemset_8bpp(s, val, run, &x, &y);
+ else
+ picmemset(s, val, run / (8 / bits_per_plane), &x, &y, &plane, bits_per_plane);
+ }
} else {
while (y >= 0 && bytestream2_get_bytes_left(&s->g) > 0) {
memcpy(s->frame.data[0] + y * s->frame.linesize[0], s->g.buffer, FFMIN(avctx->width, bytestream2_get_bytes_left(&s->g)));
}
}
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*(AVFrame*)data = s->frame;
return avpkt->size;
}