Commit c11ef252 authored by Philip Gladstone's avatar Philip Gladstone

Fixed problem with frame rate reduction when capturing from a source

whose PTS does not start at zero. New code will fix that if the PTS
is more than 100 seconds from zero. This may well not be the right
number, but it is a big improvement over the current state.

Originally committed as revision 1297 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6638d424
...@@ -163,6 +163,7 @@ typedef struct AVOutputStream { ...@@ -163,6 +163,7 @@ typedef struct AVOutputStream {
/* input pts and corresponding output pts /* input pts and corresponding output pts
for A/V sync */ for A/V sync */
double sync_ipts; double sync_ipts;
double sync_ipts_offset;
INT64 sync_opts; INT64 sync_opts;
/* video only */ /* video only */
AVPicture pict_tmp; /* temporary image for resizing */ AVPicture pict_tmp; /* temporary image for resizing */
...@@ -541,12 +542,24 @@ static void do_video_out(AVFormatContext *s, ...@@ -541,12 +542,24 @@ static void do_video_out(AVFormatContext *s,
double vdelta; double vdelta;
if (ost->sync_ipts != AV_NOPTS_VALUE) { if (ost->sync_ipts != AV_NOPTS_VALUE) {
vdelta = (double)(ost->st->pts.val) * s->pts_num / s->pts_den - ost->sync_ipts; vdelta = (double)(ost->st->pts.val) * s->pts_num / s->pts_den - (ost->sync_ipts - ost->sync_ipts_offset);
if (vdelta < -AV_DELAY_MAX) if (vdelta < 100 && vdelta > -100) {
nb_frames = 2; if (vdelta < -AV_DELAY_MAX)
else if (vdelta > AV_DELAY_MAX) nb_frames = 2;
nb_frames = 0; else if (vdelta > AV_DELAY_MAX)
//printf("vdelta=%f\n", vdelta); nb_frames = 0;
} else {
ost->sync_ipts_offset -= vdelta;
}
#if 0
{
static char *action[] = { "drop frame", "copy frame", "dup frame" };
printf("Input PTS %12.6f, output PTS %12.6f: %s\n",
(double) ost->sync_ipts, (double) ost->st->pts.val * s->pts_num / s->pts_den,
action[nb_frames]);
}
#endif
} }
} }
if (nb_frames <= 0) if (nb_frames <= 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment