const unsigned char *buf;
int size;
+ int is_16bpp;
const unsigned char *stream_ptr;
const unsigned char *stream_end;
unsigned char *pixel_ptr;
return -1;
}
- avctx->pix_fmt = PIX_FMT_PAL8;
+ s->is_16bpp = avctx->bits_per_coded_sample == 16;
+ avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8;
+ if (s->is_16bpp) {
+ av_log(avctx, AV_LOG_ERROR, "16-bit Interplay video is not supported yet.\n");
+ return -1;
+ }
dsputil_init(&s->dsp, avctx);
/* decoding map contains 4 bits of information per 8x8 block */
uint64_t frame_pts_inc;
+ unsigned int video_bpp;
unsigned int video_width;
unsigned int video_height;
int64_t video_pts;
}
s->video_width = AV_RL16(&scratch[0]) * 8;
s->video_height = AV_RL16(&scratch[2]) * 8;
+ if (opcode_version < 2 || !AV_RL16(&scratch[6])) {
+ s->video_bpp = 8;
+ } else {
+ s->video_bpp = 16;
+ }
debug_ipmovie("video resolution: %d x %d\n",
s->video_width, s->video_height);
break;
st->codec->codec_tag = 0; /* no fourcc */
st->codec->width = ipmovie->video_width;
st->codec->height = ipmovie->video_height;
+ st->codec->bits_per_coded_sample = ipmovie->video_bpp;
/* palette considerations */
st->codec->palctrl = &ipmovie->palette_control;