HpelDSPContext hdsp;
GetBitContext gb;
AVFrame *prev;
+
+ uint8_t *pkt_swapped;
+ int pkt_swapped_allocated;
+
int width;
int height;
int frame_code;
continue; /* skip vector */
}
- if (stages > 0 && level >= 4) {
- av_dlog(NULL,
+ if ((stages > 0 && level >= 4) || stages < 0) {
+ ff_dlog(NULL,
"Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n",
stages, level);
return AVERROR_INVALIDDATA; /* invalid vector */
if (stages == -1)
continue; /* skip vector */
- if ((stages > 0) && (level >= 4)) {
- av_dlog(NULL,
+ if ((stages > 0 && level >= 4) || stages < 0) {
+ ff_dlog(NULL,
"Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n",
stages, level);
return AVERROR_INVALIDDATA; /* invalid vector */
pitch, motion, x, y, width, height);
if (result != 0) {
- av_dlog(avctx, "Error in svq1_motion_inter_block %i\n", result);
+ ff_dlog(avctx, "Error in svq1_motion_inter_block %i\n", result);
break;
}
result = svq1_decode_block_non_intra(bitbuf, current, pitch);
pitch, motion, x, y, width, height);
if (result != 0) {
- av_dlog(avctx, "Error in svq1_motion_inter_4v_block %i\n", result);
+ ff_dlog(avctx, "Error in svq1_motion_inter_4v_block %i\n", result);
break;
}
result = svq1_decode_block_non_intra(bitbuf, current, pitch);
bitbuf->size_in_bits >> 3,
csum);
- av_dlog(avctx, "%s checksum (%02x) for packet data\n",
+ ff_dlog(avctx, "%s checksum (%02x) for packet data\n",
(csum == 0) ? "correct" : "incorrect", csum);
}
/* swap some header bytes (why?) */
if (s->frame_code != 0x20) {
- uint32_t *src = (uint32_t *)(buf + 4);
+ uint32_t *src;
+
+ if (buf_size < 9 * 4) {
+ av_log(avctx, AV_LOG_ERROR, "Input packet too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ av_fast_padded_malloc(&s->pkt_swapped,
+ &s->pkt_swapped_allocated,
+ buf_size);
+ if (!s->pkt_swapped)
+ return AVERROR(ENOMEM);
+
+ memcpy(s->pkt_swapped, buf, buf_size);
+ buf = s->pkt_swapped;
+ init_get_bits(&s->gb, buf, buf_size * 8);
+ skip_bits(&s->gb, 22);
+
+ src = (uint32_t *)(s->pkt_swapped + 4);
for (i = 0; i < 4; i++)
src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i];
result = svq1_decode_frame_header(avctx, cur);
if (result != 0) {
- av_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result);
+ ff_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result);
return result;
}
width = FFALIGN(s->width, 16);
height = FFALIGN(s->height, 16);
} else {
- if (avctx->flags & CODEC_FLAG_GRAY)
+ if (avctx->flags & AV_CODEC_FLAG_GRAY)
break;
width = FFALIGN(s->width / 4, 16);
height = FFALIGN(s->height / 4, 16);
previous, linesize,
pmv, x, y, width, height);
if (result != 0) {
- av_dlog(avctx,
+ ff_dlog(avctx,
"Error in svq1_decode_delta_block %i\n",
result);
goto err;
SVQ1Context *s = avctx->priv_data;
av_frame_free(&s->prev);
+ av_freep(&s->pkt_swapped);
return 0;
}