virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

ffv1dec: add simple error concealment in case of CRC errors on slices.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-16 15:39:58 +02:00
parent 371d37fcf5
commit 094845aad8
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/ffv1.c
View File

@ -37,6 +37,7 @@
#include "libavutil/avassert.h"
#include "libavutil/crc.h"
#include "libavutil/opt.h"
#include "libavutil/imgutils.h"
#ifdef __INTEL_COMPILER
#undef av_flatten
@ -197,6 +198,7 @@ typedef struct FFV1Context{
int gob_count;
int packed_at_lsb;
int ec;
int slice_damaged;
int key_frame_ok;
int quant_table_count;
@ -2015,6 +2017,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
buf_p -= v;
fs->slice_damaged = 0;
if(f->ec){
unsigned crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, v);
if(crc){
@ -2027,6 +2030,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
} else {
av_log(f->avctx, AV_LOG_ERROR, "\n");
}
fs->slice_damaged = 1;
}
}
@ -2036,6 +2040,25 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
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, src, f->last_picture.linesize,
avctx->pix_fmt, fs->slice_width, fs->slice_height);
}
}
f->picture_number++;
*picture= *p;