X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Froqvideodec.c;h=a2730af9226e9cc07e2254afcc8e5a46e0286e74;hb=a247ac640df3da573cd661065bf53f37863e2b46;hp=0ab7d399d6750aa37835b25dedf3a77d547ab83e;hpb=94d98330ed6c5562341315c26c1af92771a2e6de;p=ffmpeg diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 0ab7d399d67..a2730af9226 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -33,20 +33,19 @@ #include "internal.h" #include "roqvideo.h" -static void roqvideo_decode_frame(RoqContext *ri) +static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) { unsigned int chunk_id = 0, chunk_arg = 0; unsigned long chunk_size = 0; int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1; int vqid, xpos, ypos, xp, yp, x, y, mx, my; - int frame_stats[2][4] = {{0},{0}}; roq_qcell *qcell; int64_t chunk_start; - while (bytestream2_get_bytes_left(&ri->gb) >= 8) { - chunk_id = bytestream2_get_le16(&ri->gb); - chunk_size = bytestream2_get_le32(&ri->gb); - chunk_arg = bytestream2_get_le16(&ri->gb); + while (bytestream2_get_bytes_left(gb) >= 8) { + chunk_id = bytestream2_get_le16(gb); + chunk_size = bytestream2_get_le32(gb); + chunk_arg = bytestream2_get_le16(gb); if(chunk_id == RoQ_QUAD_VQ) break; @@ -56,54 +55,53 @@ static void roqvideo_decode_frame(RoqContext *ri) if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size) nv2 = 256; for(i = 0; i < nv1; i++) { - ri->cb2x2[i].y[0] = bytestream2_get_byte(&ri->gb); - ri->cb2x2[i].y[1] = bytestream2_get_byte(&ri->gb); - ri->cb2x2[i].y[2] = bytestream2_get_byte(&ri->gb); - ri->cb2x2[i].y[3] = bytestream2_get_byte(&ri->gb); - ri->cb2x2[i].u = bytestream2_get_byte(&ri->gb); - ri->cb2x2[i].v = bytestream2_get_byte(&ri->gb); + ri->cb2x2[i].y[0] = bytestream2_get_byte(gb); + ri->cb2x2[i].y[1] = bytestream2_get_byte(gb); + ri->cb2x2[i].y[2] = bytestream2_get_byte(gb); + ri->cb2x2[i].y[3] = bytestream2_get_byte(gb); + ri->cb2x2[i].u = bytestream2_get_byte(gb); + ri->cb2x2[i].v = bytestream2_get_byte(gb); } for(i = 0; i < nv2; i++) for(j = 0; j < 4; j++) - ri->cb4x4[i].idx[j] = bytestream2_get_byte(&ri->gb); + ri->cb4x4[i].idx[j] = bytestream2_get_byte(gb); } } - chunk_start = bytestream2_tell(&ri->gb); + chunk_start = bytestream2_tell(gb); xpos = ypos = 0; - if (chunk_size > bytestream2_get_bytes_left(&ri->gb)) { + if (chunk_size > bytestream2_get_bytes_left(gb)) { av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); - chunk_size = bytestream2_get_bytes_left(&ri->gb); + chunk_size = bytestream2_get_bytes_left(gb); } - while (bytestream2_tell(&ri->gb) < chunk_start + chunk_size) { + while (bytestream2_tell(gb) < chunk_start + chunk_size) { for (yp = ypos; yp < ypos + 16; yp += 8) for (xp = xpos; xp < xpos + 16; xp += 8) { - if (bytestream2_tell(&ri->gb) >= chunk_start + chunk_size) { + if (bytestream2_tell(gb) >= chunk_start + chunk_size) { av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { - vqflg = bytestream2_get_le16(&ri->gb); + vqflg = bytestream2_get_le16(gb); vqflg_pos = 7; } vqid = (vqflg >> (vqflg_pos * 2)) & 0x3; - frame_stats[0][vqid]++; vqflg_pos--; switch(vqid) { case RoQ_ID_MOT: break; case RoQ_ID_FCC: { - int byte = bytestream2_get_byte(&ri->gb); + int byte = bytestream2_get_byte(gb); mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8)); my = 8 - (byte & 0xf) - ((signed char) chunk_arg); ff_apply_motion_8x8(ri, xp, yp, mx, my); break; } case RoQ_ID_SLD: - qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb); + qcell = ri->cb4x4 + bytestream2_get_byte(gb); ff_apply_vector_4x4(ri, xp, yp, ri->cb2x2 + qcell->idx[0]); ff_apply_vector_4x4(ri, xp + 4, yp, ri->cb2x2 + qcell->idx[1]); ff_apply_vector_4x4(ri, xp, yp + 4, ri->cb2x2 + qcell->idx[2]); @@ -115,39 +113,38 @@ static void roqvideo_decode_frame(RoqContext *ri) if(k & 0x01) x += 4; if(k & 0x02) y += 4; - if (bytestream2_tell(&ri->gb) >= chunk_start + chunk_size) { + if (bytestream2_tell(gb) >= chunk_start + chunk_size) { av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { - vqflg = bytestream2_get_le16(&ri->gb); + vqflg = bytestream2_get_le16(gb); vqflg_pos = 7; } vqid = (vqflg >> (vqflg_pos * 2)) & 0x3; - frame_stats[1][vqid]++; vqflg_pos--; switch(vqid) { case RoQ_ID_MOT: break; case RoQ_ID_FCC: { - int byte = bytestream2_get_byte(&ri->gb); + int byte = bytestream2_get_byte(gb); mx = 8 - (byte >> 4) - ((signed char) (chunk_arg >> 8)); my = 8 - (byte & 0xf) - ((signed char) chunk_arg); ff_apply_motion_4x4(ri, x, y, mx, my); break; } case RoQ_ID_SLD: - qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb); + qcell = ri->cb4x4 + bytestream2_get_byte(gb); ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + qcell->idx[0]); ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + qcell->idx[1]); ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + qcell->idx[2]); ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + qcell->idx[3]); break; case RoQ_ID_CCC: - ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb)); - ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb)); - ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb)); - ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb)); + ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + bytestream2_get_byte(gb)); + ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + bytestream2_get_byte(gb)); + ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + bytestream2_get_byte(gb)); + ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + bytestream2_get_byte(gb)); break; } } @@ -184,11 +181,8 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) s->last_frame = av_frame_alloc(); s->current_frame = av_frame_alloc(); - if (!s->current_frame || !s->last_frame) { - av_frame_free(&s->current_frame); - av_frame_free(&s->last_frame); + if (!s->current_frame || !s->last_frame) return AVERROR(ENOMEM); - } avctx->pix_fmt = AV_PIX_FMT_YUVJ444P; avctx->color_range = AVCOL_RANGE_JPEG; @@ -204,9 +198,10 @@ static int roq_decode_frame(AVCodecContext *avctx, int buf_size = avpkt->size; RoqContext *s = avctx->priv_data; int copy = !s->current_frame->data[0] && s->last_frame->data[0]; + GetByteContext gb; int ret; - if ((ret = ff_reget_buffer(avctx, s->current_frame)) < 0) + if ((ret = ff_reget_buffer(avctx, s->current_frame, 0)) < 0) return ret; if (copy) { @@ -215,8 +210,8 @@ static int roq_decode_frame(AVCodecContext *avctx, return ret; } - bytestream2_init(&s->gb, buf, buf_size); - roqvideo_decode_frame(s); + bytestream2_init(&gb, buf, buf_size); + roqvideo_decode_frame(s, &gb); if ((ret = av_frame_ref(data, s->current_frame)) < 0) return ret; @@ -238,7 +233,7 @@ static av_cold int roq_decode_end(AVCodecContext *avctx) return 0; } -AVCodec ff_roq_decoder = { +const AVCodec ff_roq_decoder = { .name = "roqvideo", .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), .type = AVMEDIA_TYPE_VIDEO, @@ -248,4 +243,5 @@ AVCodec ff_roq_decoder = { .close = roq_decode_end, .decode = roq_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };