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

avformat/utils: reject poorly fitting rfps values earlier

Browse Source 
This avoids collecting statistics for rfps values that very likely
will get rejected later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-07 04:13:44 +01:00
parent ba189b1db4
commit 1770da18f7
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/utils.c
View File

@ -2719,16 +2719,36 @@ int ff_rfps_add_frame(AVFormatContext *ic, AVStream *st, int64_t ts)
// if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO) // if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
// av_log(NULL, AV_LOG_ERROR, "%f\n", dts); // av_log(NULL, AV_LOG_ERROR, "%f\n", dts);
for (i=0; i<MAX_STD_TIMEBASES; i++) { for (i=0; i<MAX_STD_TIMEBASES; i++) {
int framerate= get_std_framerate(i); if (st->info->duration_error[0][1][i] < 1e10) {
double sdts= dts*framerate/(1001*12); int framerate= get_std_framerate(i);
for(j=0; j<2; j++){ double sdts= dts*framerate/(1001*12);
int64_t ticks= llrint(sdts+j*0.5); for(j=0; j<2; j++){
double error= sdts - ticks + j*0.5; int64_t ticks= llrint(sdts+j*0.5);
st->info->duration_error[j][0][i] += error; double error= sdts - ticks + j*0.5;
st->info->duration_error[j][1][i] += error*error; st->info->duration_error[j][0][i] += error;
st->info->duration_error[j][1][i] += error*error;
}
} }
} }
st->info->duration_count++; st->info->duration_count++;
if (st->info->duration_count % 10 == 0) {
int n = st->info->duration_count;
for (i=0; i<MAX_STD_TIMEBASES; i++) {
if (st->info->duration_error[0][1][i] < 1e10) {
int framerate= get_std_framerate(i);
double a0 = st->info->duration_error[0][0][i] / n;
double error0 = st->info->duration_error[0][1][i] / n - a0*a0;
double a1 = st->info->duration_error[1][0][i] / n;
double error1 = st->info->duration_error[1][1][i] / n - a1*a1;
if (error0 > 0.04 && error1 > 0.04) {
st->info->duration_error[0][1][i] = 2e10;
st->info->duration_error[1][1][i] = 2e10;
}
}
}
}
// ignore the first 4 values, they might have some random jitter // ignore the first 4 values, they might have some random jitter
if (st->info->duration_count > 3 && is_relative(ts) == is_relative(last)) if (st->info->duration_count > 3 && is_relative(ts) == is_relative(last))
st->info->duration_gcd = av_gcd(st->info->duration_gcd, duration); st->info->duration_gcd = av_gcd(st->info->duration_gcd, duration);