openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 11:49:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

error concealment fix

Browse Source 
Originally committed as revision 4543 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-09-01 00:15:12 +00:00
parent c619ff6daf
commit 473a200d93
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/rv10.c
View File

@ -620,8 +620,14 @@ static int rv10_decode_packet(AVCodecContext *avctx,
//if(s->pict_type == P_TYPE) return 0;
if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames?
ff_er_frame_end(s);
MPV_frame_end(s);
s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0;
}
if(MPV_frame_start(s, avctx) < 0)
return -1;
ff_er_frame_start(s);
}
#ifdef DEBUG
@ -673,7 +679,7 @@ static int rv10_decode_packet(AVCodecContext *avctx,
s->mv_type = MV_TYPE_16X16;
ret=ff_h263_decode_mb(s, s->block);
if (ret == SLICE_ERROR) {
if (ret == SLICE_ERROR || s->gb.size_in_bits < get_bits_count(&s->gb)) {
av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
return -1;
}
@ -693,6 +699,8 @@ static int rv10_decode_packet(AVCodecContext *avctx,
if(ret == SLICE_END) break;
}
ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
return buf_size;
}
@ -723,15 +731,14 @@ static int rv10_decode_frame(AVCodecContext *avctx,
else
size= avctx->slice_offset[i+1] - offset;
if( rv10_decode_packet(avctx, buf+offset, size) < 0 )
return -1;
rv10_decode_packet(avctx, buf+offset, size);
}
}else{
if( rv10_decode_packet(avctx, buf, buf_size) < 0 )
return -1;
rv10_decode_packet(avctx, buf, buf_size);
}
if(s->mb_y>=s->mb_height){
ff_er_frame_end(s);
MPV_frame_end(s);
if(s->pict_type==B_TYPE || s->low_delay){
@ -743,6 +750,7 @@ static int rv10_decode_frame(AVCodecContext *avctx,
}
if(s->last_picture_ptr || s->low_delay)
*data_size = sizeof(AVFrame);
s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
}
return buf_size;