RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vf_vapoursynth: use frame durations instead of _AbsoluteTime 

Set _DurationNum/_DurationDen on each VS frame, instead of
_AbsoluteTime. The duration is the difference between the timestamp of
the frame and the next frame, and when receiving filtered VS frames, we
convert them back to an absolute PTS by summing them.

We pass the timestamps with microsecond resolution. mpv uses double for
timestamps internally, so we don't know the "real" timebase or FPS. VS
on the other hand uses fractions for frame durations. We can't pass
through the numbers exactly, but microseconds ought to be enough to be
even safe from accumulating rounding errors.
This commit is contained in:
wm4 2014-04-28 22:22:55 +02:00
parent 062d5eea3b
commit 6b0b8368a4
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/man/en/vf.rst
View File

@ -861,8 +861,8 @@ Available filters are:
and it is expected that the script reads video from it. (Otherwise, and it is expected that the script reads video from it. (Otherwise,
mpv will decode no video, and the video packet queue will overflow, mpv will decode no video, and the video packet queue will overflow,
eventually leading to audio being stopped.) The script is also eventually leading to audio being stopped.) The script is also
expected to pass through timestamps using the ``AbsoluteTime`` frame expected to pass through timestamps using the ``_DurationNum`` and
property. ``_DurationDen`` frame properties.
.. admonition:: Example: .. admonition:: Example:

31
video/filter/vf_vapoursynth.c
View File

@ -47,8 +47,10 @@ struct vf_priv_s {
pthread_cond_t wakeup; pthread_cond_t wakeup;
// --- the following members are all protected by lock // --- the following members are all protected by lock
struct mp_image *next_image;// used to compute frame duration of oldest image
struct mp_image **buffered; // oldest image first struct mp_image **buffered; // oldest image first
int num_buffered; int num_buffered;
double prev_pts; // pts of last frame returned
int in_frameno; // frame number of buffered[0] (the oldest) int in_frameno; // frame number of buffered[0] (the oldest)
int out_frameno; // frame number of last requested frame int out_frameno; // frame number of last requested frame
bool getting_frame; // getAsyncFrame is in progress bool getting_frame; // getAsyncFrame is in progress
@ -153,10 +155,13 @@ static void VS_CC vs_frame_done(void *userData, const VSFrameRef *f, int n,
img.pts = MP_NOPTS_VALUE; img.pts = MP_NOPTS_VALUE;
const VSMap *map = p->vsapi->getFramePropsRO(f); const VSMap *map = p->vsapi->getFramePropsRO(f);
if (map) { if (map) {
int err; int err1, err2;
double t = p->vsapi->propGetFloat(map, "_AbsoluteTime", 0, &err); int num = p->vsapi->propGetInt(map, "_DurationNum", 0, &err1);
if (!err) int den = p->vsapi->propGetInt(map, "_DurationDen", 0, &err2);
img.pts = t; if (!err1 && !err2 && p->prev_pts != MP_NOPTS_VALUE) {
img.pts = p->prev_pts;
p->prev_pts += num / (double)den;
}
} }
if (img.pts == MP_NOPTS_VALUE) if (img.pts == MP_NOPTS_VALUE)
MP_ERR(vf, "No PTS after filter!\n"); MP_ERR(vf, "No PTS after filter!\n");
@ -180,9 +185,16 @@ static int filter_ext(struct vf_instance *vf, struct mp_image *mpi)
return -1; return -1;
} }
MPSWAP(struct mp_image *, p->next_image, mpi);
if (!mpi) if (!mpi)
return 0; return 0;
// Turn PTS into frame duration (the pts field is abused for storing it)
if (p->prev_pts == MP_NOPTS_VALUE)
p->prev_pts = mpi->pts;
mpi->pts = p->next_image ? p->next_image->pts - mpi->pts : 0;
// Try to get new frames until we get rid of the input mpi. // Try to get new frames until we get rid of the input mpi.
pthread_mutex_lock(&p->lock); pthread_mutex_lock(&p->lock);
while (1) { while (1) {
@ -285,8 +297,12 @@ static const VSFrameRef *VS_CC infiltGetFrame(int frameno, int activationReason,
struct mp_image vsframe = map_vs_frame(p, ret, true); struct mp_image vsframe = map_vs_frame(p, ret, true);
mp_image_copy(&vsframe, img); mp_image_copy(&vsframe, img);
VSMap *map = p->vsapi->getFramePropsRW(ret); VSMap *map = p->vsapi->getFramePropsRW(ret);
if (map) if (map) {
p->vsapi->propSetFloat(map, "_AbsoluteTime", img->pts, 0); int res = 1e6;
int dur = img->pts * res + 0.5;
p->vsapi->propSetInt(map, "_DurationNum", dur, 0);
p->vsapi->propSetInt(map, "_DurationDen", res, 0);
}
break; break;
} }
pthread_cond_wait(&p->wakeup, &p->lock); pthread_cond_wait(&p->wakeup, &p->lock);
@ -340,6 +356,9 @@ static void destroy_vs(struct vf_instance *vf)
for (int n = 0; n < p->num_buffered; n++) for (int n = 0; n < p->num_buffered; n++)
talloc_free(p->buffered[n]); talloc_free(p->buffered[n]);
p->num_buffered = 0; p->num_buffered = 0;
talloc_free(p->next_image);
p->next_image = NULL;
p->prev_pts = MP_NOPTS_VALUE;
p->out_frameno = p->in_frameno = 0; p->out_frameno = p->in_frameno = 0;
} }