mirror of
https://github.com/mpv-player/mpv
synced 2024-10-18 10:25:02 +02:00
74b7dcc5f4
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.
41 lines
1.5 KiB
C
41 lines
1.5 KiB
C
#ifndef MPLAYER_VD_H
|
|
#define MPLAYER_VD_H
|
|
|
|
#include "mp_image.h"
|
|
#include "mpc_info.h"
|
|
#include "libmpdemux/stheader.h"
|
|
|
|
typedef mp_codec_info_t vd_info_t;
|
|
|
|
/* interface of video decoder drivers */
|
|
typedef struct vd_functions
|
|
{
|
|
const vd_info_t *info;
|
|
int (*init)(sh_video_t *sh);
|
|
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
|
|
extern const vd_functions_t * const mpcodecs_vd_drivers[];
|
|
|
|
#define VDCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */
|
|
#define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
|
|
#define VDCTRL_SET_PP_LEVEL 5 /* set postprocessing level */
|
|
#define VDCTRL_SET_EQUALIZER 6 /* set color options (brightness,contrast etc) */
|
|
#define VDCTRL_GET_EQUALIZER 7 /* get color options (brightness,contrast etc) */
|
|
#define VDCTRL_RESYNC_STREAM 8 /* seeking */
|
|
#define VDCTRL_QUERY_UNSEEN_FRAMES 9 /* current decoder lag */
|
|
|
|
// callbacks:
|
|
int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt);
|
|
mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
|
|
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
|
|
|
|
#define VDFLAGS_DROPFRAME 3
|
|
|
|
#endif /* MPLAYER_VD_H */
|