summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1dec.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/ffv1dec.c')
-rw-r--r--libavcodec/ffv1dec.c465
1 files changed, 336 insertions, 129 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 6877b7848b..1197dbce84 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -1,22 +1,22 @@
/*
* FFV1 decoder
*
- * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2003-2012 Michael Niedermayer <michaelni@gmx.at>
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -26,7 +26,13 @@
*/
#include "libavutil/avassert.h"
+#include "libavutil/crc.h"
+#include "libavutil/opt.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/timer.h"
#include "avcodec.h"
+#include "internal.h"
#include "get_bits.h"
#include "put_bits.h"
#include "dsputil.h"
@@ -190,69 +196,165 @@ static void decode_plane(FFV1Context *s, uint8_t *src,
for (x = 0; x < w; x++)
src[x + stride * y] = sample[1][x];
} else {
- decode_line(s, w, sample, plane_index,
- s->avctx->bits_per_raw_sample);
- for (x = 0; x < w; x++)
- ((uint16_t *)(src + stride * y))[x] =
- sample[1][x] << (16 - s->avctx->bits_per_raw_sample);
+ decode_line(s, w, sample, plane_index, s->avctx->bits_per_raw_sample);
+ if (s->packed_at_lsb) {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x] = sample[1][x];
+ }
+ } else {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample);
+ }
+ }
}
// STOP_TIMER("decode-line") }
}
}
-static void decode_rgb_frame(FFV1Context *s, uint32_t *src,
- int w, int h, int stride)
+static void decode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3])
{
int x, y, p;
- int16_t *sample[3][2];
- for (x = 0; x < 3; x++) {
+ int16_t *sample[4][2];
+ int lbd = s->avctx->bits_per_raw_sample <= 8;
+ int bits = s->avctx->bits_per_raw_sample > 0 ? s->avctx->bits_per_raw_sample : 8;
+ int offset = 1 << bits;
+ for (x = 0; x < 4; x++) {
sample[x][0] = s->sample_buffer + x * 2 * (w + 6) + 3;
sample[x][1] = s->sample_buffer + (x * 2 + 1) * (w + 6) + 3;
}
s->run_index = 0;
- memset(s->sample_buffer, 0, 6 * (w + 6) * sizeof(*s->sample_buffer));
+ memset(s->sample_buffer, 0, 8*(w+6)*sizeof(*s->sample_buffer));
for (y = 0; y < h; y++) {
- for (p = 0; p < 3; p++) {
+ for (p = 0; p < 3 + s->transparency; p++) {
int16_t *temp = sample[p][0]; // FIXME: try a normal buffer
sample[p][0] = sample[p][1];
sample[p][1] = temp;
- sample[p][1][-1] = sample[p][0][0];
- sample[p][0][w] = sample[p][0][w - 1];
- decode_line(s, w, sample[p], FFMIN(p, 1), 9);
+ sample[p][1][-1]= sample[p][0][0 ];
+ sample[p][0][ w]= sample[p][0][w-1];
+ if (lbd)
+ decode_line(s, w, sample[p], (p+1)/2, 9);
+ else
+ decode_line(s, w, sample[p], (p+1)/2, bits+1);
}
for (x = 0; x < w; x++) {
int g = sample[0][1][x];
int b = sample[1][1][x];
int r = sample[2][1][x];
+ int a = sample[3][1][x];
-// assert(g >= 0 && b >= 0 && r >= 0);
-// assert(g < 256 && b < 512 && r < 512);
-
- b -= 0x100;
- r -= 0x100;
+ b -= offset;
+ r -= offset;
g -= (b + r) >> 2;
b += g;
r += g;
- src[x + stride * y] = b + (g << 8) + (r << 16) + (0xFF << 24);
+ if (lbd)
+ *((uint32_t*)(src[0] + x*4 + stride[0]*y)) = b + (g<<8) + (r<<16) + (a<<24);
+ else {
+ *((uint16_t*)(src[0] + x*2 + stride[0]*y)) = b;
+ *((uint16_t*)(src[1] + x*2 + stride[1]*y)) = g;
+ *((uint16_t*)(src[2] + x*2 + stride[2]*y)) = r;
+ }
+ }
+ }
+}
+
+static int decode_slice_header(FFV1Context *f, FFV1Context *fs)
+{
+ RangeCoder *c = &fs->c;
+ uint8_t state[CONTEXT_SIZE];
+ unsigned ps, i, context_count;
+ memset(state, 128, sizeof(state));
+
+ av_assert0(f->version > 2);
+
+ fs->slice_x = get_symbol(c, state, 0) * f->width ;
+ fs->slice_y = get_symbol(c, state, 0) * f->height;
+ fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
+ fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
+
+ fs->slice_x /= f->num_h_slices;
+ fs->slice_y /= f->num_v_slices;
+ fs->slice_width = fs->slice_width /f->num_h_slices - fs->slice_x;
+ fs->slice_height = fs->slice_height/f->num_v_slices - fs->slice_y;
+ if ((unsigned)fs->slice_width > f->width || (unsigned)fs->slice_height > f->height)
+ return -1;
+ if ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
+ || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
+ return -1;
+
+ for (i = 0; i < f->plane_count; i++) {
+ PlaneContext * const p = &fs->plane[i];
+ int idx = get_symbol(c, state, 0);
+ if (idx > (unsigned)f->quant_table_count) {
+ av_log(f->avctx, AV_LOG_ERROR, "quant_table_index out of range\n");
+ return -1;
+ }
+ p->quant_table_index = idx;
+ memcpy(p->quant_table, f->quant_tables[idx], sizeof(p->quant_table));
+ context_count = f->context_count[idx];
+
+ if (p->context_count < context_count) {
+ av_freep(&p->state);
+ av_freep(&p->vlc_state);
}
+ p->context_count = context_count;
+ }
+
+ ps = get_symbol(c, state, 0);
+ if (ps == 1) {
+ f->picture.interlaced_frame = 1;
+ f->picture.top_field_first = 1;
+ } else if (ps == 2) {
+ f->picture.interlaced_frame = 1;
+ f->picture.top_field_first = 0;
+ } else if (ps == 3) {
+ f->picture.interlaced_frame = 0;
}
+ f->picture.sample_aspect_ratio.num = get_symbol(c, state, 0);
+ f->picture.sample_aspect_ratio.den = get_symbol(c, state, 0);
+
+ return 0;
}
static int decode_slice(AVCodecContext *c, void *arg)
{
FFV1Context *fs = *(void **)arg;
FFV1Context *f = fs->avctx->priv_data;
- int width = fs->slice_width;
- int height = fs->slice_height;
- int x = fs->slice_x;
- int y = fs->slice_y;
- AVFrame *const p = &f->picture;
+ int width, height, x, y;
+ const int ps = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
+ AVFrame * const p = &f->picture;
+
+ if (f->version > 2) {
+ if (ffv1_init_slice_state(f, fs) < 0)
+ return AVERROR(ENOMEM);
+ if (decode_slice_header(f, fs) < 0) {
+ fs->slice_damaged = 1;
+ return AVERROR_INVALIDDATA;
+ }
+ }
+ if (ffv1_init_slice_state(f, fs) < 0)
+ return AVERROR(ENOMEM);
+ if (f->picture.key_frame)
+ ffv1_clear_slice_state(f, fs);
+ width = fs->slice_width;
+ height= fs->slice_height;
+ x= fs->slice_x;
+ y= fs->slice_y;
+
+ if (!fs->ac) {
+ if (f->version == 3 && f->minor_version > 1 || f->version > 3)
+ get_rac(&fs->c, (uint8_t[]) {129});
+ fs->ac_byte_count = f->version > 2 || (!x&&!y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
+ init_get_bits(&fs->gb,
+ fs->c.bytestream_start + fs->ac_byte_count,
+ (fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count) * 8);
+ }
av_assert1(width && height);
if (f->colorspace == 0) {
@@ -260,18 +362,28 @@ static int decode_slice(AVCodecContext *c, void *arg)
const int chroma_height = -((-height) >> f->chroma_v_shift);
const int cx = x >> f->chroma_h_shift;
const int cy = y >> f->chroma_v_shift;
+ decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0);
- decode_plane(fs, p->data[0] + x + y * p->linesize[0],
- width, height, p->linesize[0], 0);
-
- decode_plane(fs, p->data[1] + cx + cy * p->linesize[1],
- chroma_width, chroma_height, p->linesize[1], 1);
- decode_plane(fs, p->data[2] + cx + cy * p->linesize[1],
- chroma_width, chroma_height, p->linesize[2], 1);
+ if (f->chroma_planes) {
+ decode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1);
+ decode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1);
+ }
+ if (fs->transparency)
+ decode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2);
} else {
- decode_rgb_frame(fs,
- (uint32_t *)p->data[0] + x + y * (p->linesize[0] / 4),
- width, height, p->linesize[0] / 4);
+ uint8_t *planes[3] = {p->data[0] + ps*x + y*p->linesize[0],
+ p->data[1] + ps*x + y*p->linesize[1],
+ p->data[2] + ps*x + y*p->linesize[2]};
+ decode_rgb_frame(fs, planes, width, height, p->linesize);
+ }
+ if (fs->ac && f->version > 2) {
+ int v;
+ get_rac(&fs->c, (uint8_t[]) {129});
+ v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
+ if (v) {
+ av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);
+ fs->slice_damaged = 1;
+ }
}
emms_c();
@@ -288,9 +400,9 @@ static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale)
memset(state, 128, sizeof(state));
for (v = 0; i < 128; v++) {
- int len = get_symbol(c, state, 0) + 1;
+ unsigned len = get_symbol(c, state, 0) + 1;
- if (len + i > 128)
+ if (len > 128 - i)
return -1;
while (len--) {
@@ -335,17 +447,22 @@ static int read_extra_header(FFV1Context *f)
ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
f->version = get_symbol(c, state, 0);
- f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
+ if (f->version > 2) {
+ c->bytestream_end -= 4;
+ f->minor_version = get_symbol(c, state, 0);
+ }
+ f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
if (f->ac > 1)
for (i = 1; i < 256; i++)
f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i];
+
f->colorspace = get_symbol(c, state, 0); // YUV cs type
f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
- get_rac(c, state); // no chroma = false
+ f->chroma_planes = get_rac(c, state);
f->chroma_h_shift = get_symbol(c, state, 0);
f->chroma_v_shift = get_symbol(c, state, 0);
- get_rac(c, state); // transparency plane
- f->plane_count = 2;
+ f->transparency = get_rac(c, state);
+ f->plane_count = 2 + f->transparency;
f->num_h_slices = 1 + get_symbol(c, state, 0);
f->num_v_slices = 1 + get_symbol(c, state, 0);
@@ -379,19 +496,38 @@ static int read_extra_header(FFV1Context *f)
f->initial_states[i][j][k] =
(pred + get_symbol(c, state2[k], 1)) & 0xFF;
}
+
+ if (f->version > 2) {
+ f->ec = get_symbol(c, state, 0);
+ }
+
+ if (f->version > 2) {
+ unsigned v;
+ v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, f->avctx->extradata, f->avctx->extradata_size);
+ if (v) {
+ av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!\n", v);
+ return AVERROR_INVALIDDATA;
+ }
+ }
+
return 0;
}
static int read_header(FFV1Context *f)
{
uint8_t state[CONTEXT_SIZE];
- int i, j, context_count;
+ int i, j, context_count = -1; //-1 to avoid warning
RangeCoder *const c = &f->slice_context[0]->c;
memset(state, 128, sizeof(state));
if (f->version < 2) {
- f->version = get_symbol(c, state, 0);
+ unsigned v= get_symbol(c, state, 0);
+ if (v >= 2) {
+ av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v);
+ return AVERROR_INVALIDDATA;
+ }
+ f->version = v;
f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
if (f->ac > 1)
for (i = 1; i < 256; i++)
@@ -399,46 +535,65 @@ static int read_header(FFV1Context *f)
f->colorspace = get_symbol(c, state, 0); // YUV cs type
if (f->version > 0)
f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
- get_rac(c, state); // no chroma = false
+ f->chroma_planes = get_rac(c, state);
f->chroma_h_shift = get_symbol(c, state, 0);
f->chroma_v_shift = get_symbol(c, state, 0);
- get_rac(c, state); // transparency plane
- f->plane_count = 2;
+ f->transparency = get_rac(c, state);
+ f->plane_count = 2 + f->transparency;
}
if (f->colorspace == 0) {
- if (f->avctx->bits_per_raw_sample <= 8) {
- switch (16 * f->chroma_h_shift + f->chroma_v_shift) {
- case 0x00:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV444P;
- break;
- case 0x10:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
- break;
- case 0x11:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- break;
- case 0x20:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV411P;
- break;
- case 0x22:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV410P;
- break;
+ if (!f->transparency && !f->chroma_planes) {
+ if (f->avctx->bits_per_raw_sample <= 8)
+ f->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
+ else
+ f->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
+ } else if (f->avctx->bits_per_raw_sample<=8 && !f->transparency) {
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P; break;
+ case 0x01: f->avctx->pix_fmt = AV_PIX_FMT_YUV440P; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P; break;
+ case 0x20: f->avctx->pix_fmt = AV_PIX_FMT_YUV411P; break;
+ case 0x22: f->avctx->pix_fmt = AV_PIX_FMT_YUV410P; break;
+ default:
+ av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
+ return -1;
+ }
+ } else if (f->avctx->bits_per_raw_sample <= 8 && f->transparency) {
+ switch(16*f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUVA444P; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUVA420P; break;
+ default:
+ av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
+ return -1;
+ }
+ } else if (f->avctx->bits_per_raw_sample == 9) {
+ f->packed_at_lsb = 1;
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P9; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P9; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P9; break;
+ default:
+ av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
+ return -1;
+ }
+ } else if (f->avctx->bits_per_raw_sample == 10) {
+ f->packed_at_lsb = 1;
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P10; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P10; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P10; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
} else {
- switch (16 * f->chroma_h_shift + f->chroma_v_shift) {
- case 0x00:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV444P16;
- break;
- case 0x10:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
- break;
- case 0x11:
- f->avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
- break;
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P16; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P16; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P16; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
@@ -450,7 +605,17 @@ static int read_header(FFV1Context *f)
"chroma subsampling not supported in this colorspace\n");
return -1;
}
- f->avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ if ( f->avctx->bits_per_raw_sample == 9)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP9;
+ else if (f->avctx->bits_per_raw_sample == 10)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP10;
+ else if (f->avctx->bits_per_raw_sample == 12)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP12;
+ else if (f->avctx->bits_per_raw_sample == 14)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP14;
+ else
+ if (f->transparency) f->avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ else f->avctx->pix_fmt = AV_PIX_FMT_0RGB32;
} else {
av_log(f->avctx, AV_LOG_ERROR, "colorspace not supported\n");
return -1;
@@ -465,19 +630,33 @@ static int read_header(FFV1Context *f)
av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");
return -1;
}
- } else {
+ } else if (f->version < 3) {
f->slice_count = get_symbol(c, state, 0);
- if (f->slice_count > (unsigned)MAX_SLICES)
- return -1;
+ } else {
+ const uint8_t *p = c->bytestream_end;
+ for (f->slice_count = 0; f->slice_count < MAX_SLICES && 3 < p - c->bytestream_start; f->slice_count++) {
+ int trailer = 3 + 5*!!f->ec;
+ int size = AV_RB24(p-trailer);
+ if (size + trailer > p - c->bytestream_start)
+ break;
+ p -= size + trailer;
+ }
+ }
+ if (f->slice_count > (unsigned)MAX_SLICES || f->slice_count <= 0) {
+ av_log(f->avctx, AV_LOG_ERROR, "slice count %d is invalid\n", f->slice_count);
+ return -1;
}
for (j = 0; j < f->slice_count; j++) {
FFV1Context *fs = f->slice_context[j];
fs->ac = f->ac;
+ fs->packed_at_lsb = f->packed_at_lsb;
- if (f->version >= 2) {
- fs->slice_x = get_symbol(c, state, 0) * f->width;
- fs->slice_y = get_symbol(c, state, 0) * f->height;
+ fs->slice_damaged = 0;
+
+ if (f->version == 2) {
+ fs->slice_x = get_symbol(c, state, 0) * f->width ;
+ fs->slice_y = get_symbol(c, state, 0) * f->height;
fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
@@ -496,7 +675,7 @@ static int read_header(FFV1Context *f)
for (i = 0; i < f->plane_count; i++) {
PlaneContext *const p = &fs->plane[i];
- if (f->version >= 2) {
+ if (f->version == 2) {
int idx = get_symbol(c, state, 0);
if (idx > (unsigned)f->quant_table_count) {
av_log(f->avctx, AV_LOG_ERROR,
@@ -511,18 +690,20 @@ static int read_header(FFV1Context *f)
memcpy(p->quant_table, f->quant_table, sizeof(p->quant_table));
}
- if (p->context_count < context_count) {
- av_freep(&p->state);
- av_freep(&p->vlc_state);
+ if (f->version <= 2) {
+ av_assert0(context_count >= 0);
+ if (p->context_count < context_count) {
+ av_freep(&p->state);
+ av_freep(&p->vlc_state);
+ }
+ p->context_count = context_count;
}
- p->context_count = context_count;
}
}
-
return 0;
}
-static av_cold int ffv1_decode_init(AVCodecContext *avctx)
+static av_cold int decode_init(AVCodecContext *avctx)
{
FFV1Context *f = avctx->priv_data;
@@ -537,15 +718,14 @@ static av_cold int ffv1_decode_init(AVCodecContext *avctx)
return 0;
}
-static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
FFV1Context *f = avctx->priv_data;
RangeCoder *const c = &f->slice_context[0]->c;
AVFrame *const p = &f->picture;
- int bytes_read, i;
+ int i;
uint8_t keystate = 128;
const uint8_t *buf_p;
@@ -561,64 +741,91 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data,
p->pict_type = AV_PICTURE_TYPE_I; // FIXME: I vs. P
if (get_rac(c, &keystate)) {
p->key_frame = 1;
+ f->key_frame_ok = 0;
if (read_header(f) < 0)
return -1;
- if (ffv1_init_slice_state(f) < 0)
- return -1;
-
- ffv1_clear_state(f);
+ f->key_frame_ok = 1;
} else {
- p->key_frame = 0;
- }
- if (f->ac > 1) {
- int i;
- for (i = 1; i < 256; i++) {
- c->one_state[i] = f->state_transition[i];
- c->zero_state[256 - i] = 256 - c->one_state[i];
+ if (!f->key_frame_ok) {
+ av_log(avctx, AV_LOG_ERROR, "Cant decode non keyframe without valid keyframe\n");
+ return AVERROR_INVALIDDATA;
}
+ p->key_frame= 0;
}
- p->reference = 0;
+ p->reference = 3; //for error concealment
if (avctx->get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- if (avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(avctx, AV_LOG_ERROR, "keyframe:%d coder:%d\n", p->key_frame, f->ac);
-
- if (!f->ac) {
- bytes_read = c->bytestream - c->bytestream_start - 1;
- if (bytes_read == 0)
- av_log(avctx, AV_LOG_ERROR, "error at end of AC stream\n"); // FIXME
- init_get_bits(&f->slice_context[0]->gb, buf + bytes_read,
- (buf_size - bytes_read) * 8);
- } else {
- bytes_read = 0; /* avoid warning */
- }
+ if (avctx->debug&FF_DEBUG_PICT_INFO)
+ av_log(avctx, AV_LOG_DEBUG, "ver:%d keyframe:%d coder:%d ec:%d slices:%d bps:%d\n",
+ f->version, p->key_frame, f->ac, f->ec, f->slice_count, f->avctx->bits_per_raw_sample);
buf_p = buf + buf_size;
- for (i = f->slice_count - 1; i > 0; i--) {
+ for (i = f->slice_count - 1; i >= 0; i--) {
FFV1Context *fs = f->slice_context[i];
- int v = AV_RB24(buf_p - 3) + 3;
- if (buf_p - buf <= v) {
+ int trailer = 3 + 5*!!f->ec;
+ int v;
+
+ if (i || f->version>2) v = AV_RB24(buf_p-trailer)+trailer;
+ else v = buf_p - c->bytestream_start;
+ if (buf_p - c->bytestream_start < v) {
av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n");
return -1;
}
buf_p -= v;
- if (fs->ac)
+
+ if (f->ec) {
+ unsigned crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, v);
+ if (crc) {
+ int64_t ts = avpkt->pts != AV_NOPTS_VALUE ? avpkt->pts : avpkt->dts;
+ av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!", crc);
+ if (ts != AV_NOPTS_VALUE && avctx->pkt_timebase.num) {
+ av_log(f->avctx, AV_LOG_ERROR, "at %f seconds\n", ts*av_q2d(avctx->pkt_timebase));
+ } else if (ts != AV_NOPTS_VALUE) {
+ av_log(f->avctx, AV_LOG_ERROR, "at %"PRId64"\n", ts);
+ } else {
+ av_log(f->avctx, AV_LOG_ERROR, "\n");
+ }
+ fs->slice_damaged = 1;
+ }
+ }
+
+ if (i) {
ff_init_range_decoder(&fs->c, buf_p, v);
- else
- init_get_bits(&fs->gb, buf_p, v * 8);
+ } else
+ fs->c.bytestream_end = (uint8_t *)(buf_p + v);
+ }
+
+ avctx->execute(avctx, decode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*));
+
+ for (i=f->slice_count-1; i>=0; i--) {
+ FFV1Context *fs= f->slice_context[i];
+ int j;
+ if (fs->slice_damaged && f->last_picture.data[0]) {
+ uint8_t *dst[4], *src[4];
+ for (j=0; j<4; j++) {
+ int sh = (j==1 || j==2) ? f->chroma_h_shift : 0;
+ int sv = (j==1 || j==2) ? f->chroma_v_shift : 0;
+ dst[j] = f->picture .data[j] + f->picture .linesize[j]*
+ (fs->slice_y>>sv) + (fs->slice_x>>sh);
+ src[j] = f->last_picture.data[j] + f->last_picture.linesize[j]*
+ (fs->slice_y>>sv) + (fs->slice_x>>sh);
+ }
+ av_image_copy(dst, f->picture.linesize, (const uint8_t **)src, f->last_picture.linesize,
+ avctx->pix_fmt, fs->slice_width, fs->slice_height);
+ }
}
- avctx->execute(avctx, decode_slice, &f->slice_context[0],
- NULL, f->slice_count, sizeof(void *));
f->picture_number++;
*picture = *p;
*data_size = sizeof(AVFrame);
+ FFSWAP(AVFrame, f->picture, f->last_picture);
+
return buf_size;
}
@@ -627,9 +834,9 @@ AVCodec ff_ffv1_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_FFV1,
.priv_data_size = sizeof(FFV1Context),
- .init = ffv1_decode_init,
+ .init = decode_init,
.close = ffv1_close,
- .decode = ffv1_decode_frame,
+ .decode = decode_frame,
.capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ |
CODEC_CAP_SLICE_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 22:02:03 +0000