generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

frame skip fixes

Browse Source 
fix 16pixel error in comparission
 fix vbv messup
 fix unlimited skip intervals, limited by GOP now

Originally committed as revision 4678 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-11-05 00:16:03 +00:00
parent 840fb7a76d
commit a75a3ca429
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegvideo.c
View File

@ -2117,7 +2117,8 @@ static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){
const int bw= plane ? 1 : 2; const int bw= plane ? 1 : 2;
for(y=0; y<s->mb_height*bw; y++){ for(y=0; y<s->mb_height*bw; y++){
for(x=0; x<s->mb_width*bw; x++){ for(x=0; x<s->mb_width*bw; x++){
int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride), ref->data[plane] + 8*(x + y*stride), stride, 8); int off= p->type == FF_BUFFER_TYPE_SHARED ? 0: 16;
int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride)+off, ref->data[plane] + 8*(x + y*stride), stride, 8);
switch(s->avctx->frame_skip_exp){ switch(s->avctx->frame_skip_exp){
case 0: score= FFMAX(score, v); break; case 0: score= FFMAX(score, v); break;
@ -2156,7 +2157,8 @@ static void select_input_picture(MpegEncContext *s){
int b_frames; int b_frames;
if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){ if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){
if(skip_check(s, s->input_picture[0], s->next_picture_ptr)){ if(s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)){
//FIXME check that te gop check above is +-1 correct
//av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts); //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts);
if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
@ -2169,6 +2171,9 @@ static void select_input_picture(MpegEncContext *s){
s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]); s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]);
} }
emms_c();
ff_vbv_update(s, 0);
goto no_output_pic; goto no_output_pic;
} }