core: Add support for decoder reordering of pts values

Add a mode where libavcodec's reordered_opaque feature is used to
associate container packet timestamps with decoded frames. This should
improve behavior at least for MPEG files with interlaced h264; the
previous code does not cope well with the libavformat demuxer
producing two field packets with separate timestamps but the
libavcodec h264 decoder only producing a single output frame for those
two packets (so half the timestamps have no associated output frame).

The current libavformat mpeg demuxer seems to finally work with
interlaced h264 files and produce valid timestamps which are useful
with a mode like this.

By default MPlayer now selects between this new mode and the old one
automatically based on the number of timestamp problems they cause; by
default the new mode is used if both seem to work. The new option
-pts-association-mode can be used to force a particular mode. If
correct-pts mode is disabled this has no effect on timing.

Also remove the "EXPERIMENTAL" marker from the manpage description of
-correct-pts.

1 files changed, 2 insertions, 0 deletions

diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index df71970f7d..30e61c68b3 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -15,6 +15,8 @@ typedef struct vd_functions
         void (*uninit)(sh_video_t *sh);
         int (*control)(sh_video_t *sh,int cmd,void* arg, ...);
         mp_image_t* (*decode)(sh_video_t *sh,void* data,int len,int flags);
+        struct mp_image *(*decode2)(struct sh_video *sh, void *data, int len,
+                                    int flags, double *reordered_pts);
 } vd_functions_t;
 
 // NULL terminated array of all drivers