RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffv1: add optional per slice CRCs to detect undamaged slices. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-20 15:08:28 +02:00
parent b4fc53856d
commit 044f7275d3
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/ffv1.c
View File

@ -192,6 +192,7 @@ typedef struct FFV1Context{
int16_t *sample_buffer;
int gob_count;
int packed_at_lsb;
int ec;
int quant_table_count;
@ -833,6 +834,10 @@ static int write_extra_header(FFV1Context *f){
}
}
if(f->version > 2){
put_symbol(c, state, f->ec, 0);
}
f->avctx->extradata_size= ff_rac_terminate(c);
v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, f->avctx->extradata, f->avctx->extradata_size);
AV_WL32(f->avctx->extradata + f->avctx->extradata_size, v);
@ -1290,6 +1295,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
AV_WB24(buf_p+bytes, bytes);
bytes+=3;
}
if(f->ec){
unsigned v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, bytes);
AV_WL32(buf_p + bytes, v); bytes += 4;
}
buf_p += bytes;
}
@ -1726,6 +1735,10 @@ static int read_extra_header(FFV1Context *f){
}
}
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);
@ -1959,9 +1972,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
buf_p= buf + buf_size;
for(i=f->slice_count-1; i>=0; i--){
FFV1Context *fs= f->slice_context[i];
int trailer = 3 + 4*!!f->ec;
int v;
if(i) v = AV_RB24(buf_p-3)+3;
if(i) 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");
@ -1969,6 +1983,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
buf_p -= v;
if(f->ec){
unsigned crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, v);
if(crc){
av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!\n", crc);
}
}
if(i){
if(fs->ac){
ff_init_range_decoder(&fs->c, buf_p, v);