har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffv1: Always store slice size when error reobustness is enabled.

Browse Source 
This simplifies finding slices within a damaged bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-25 12:01:44 +02:00
parent 16524d1be0
commit 0c27854532
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffv1.c
View File

@ -1290,7 +1290,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
flush_put_bits(&fs->pb); //nicer padding FIXME flush_put_bits(&fs->pb); //nicer padding FIXME
bytes= fs->ac_byte_count + (put_bits_count(&fs->pb)+7)/8; bytes= fs->ac_byte_count + (put_bits_count(&fs->pb)+7)/8;
} }
if(i>0){ if(i>0 || f->ec){
av_assert0(bytes < pkt->size/f->slice_count); av_assert0(bytes < pkt->size/f->slice_count);
memmove(buf_p, fs->c.bytestream_start, bytes); memmove(buf_p, fs->c.bytestream_start, bytes);
av_assert0(bytes < (1<<24)); av_assert0(bytes < (1<<24));
@ -1990,7 +1990,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
int trailer = 3 + 4*!!f->ec; int trailer = 3 + 4*!!f->ec;
int v; int v;
if(i) v = AV_RB24(buf_p-trailer)+trailer; if(i || f->ec) v = AV_RB24(buf_p-trailer)+trailer;
else v = buf_p - c->bytestream_start; else v = buf_p - c->bytestream_start;
if(buf_p - c->bytestream_start < v){ if(buf_p - c->bytestream_start < v){
av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n"); av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n");