mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 08:12:17 +00:00
227d087db6
Until now, the player didn't care to drain frames on video reconfig. Instead, the VO was reconfigured (i.e. resized) before the queued frames finished displaying. This can for example be observed by passing multiple images with different size as mf:// filename. Then the window would resize one frame before image with the new size is displayed. With --vo=vdpau, the effect is worse, because this VO queues more than 1 frame internally. Fix this by explicitly draining buffered frames before video reconfig. Raise the display time of the last frame. Otherwise, the last frame would be shown for a very short time only. This usually doesn't matter, but helps when playing image files. This is a byproduct of frame draining, because normally, video timing is based on the frames queued to the VO, and we can't do that with frames of different size or format. So we pretend that the frame before the change is the last frame in order to time it. This code is incorrect though: it tries to use the framerate, which often doesn't make sense. But it's good enough to test this code with mf://.
105 lines
3.4 KiB
C
105 lines
3.4 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_DEC_VIDEO_H
|
|
#define MPLAYER_DEC_VIDEO_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "demux/stheader.h"
|
|
#include "video/hwdec.h"
|
|
#include "video/mp_image.h"
|
|
|
|
struct mp_decoder_list;
|
|
struct vo;
|
|
|
|
struct dec_video {
|
|
struct MPOpts *opts;
|
|
struct vf_chain *vfilter; // video filter chain
|
|
struct vo *vo; // (still) needed by video_set/get_colors
|
|
const struct vd_functions *vd_driver;
|
|
struct mp_hwdec_info hwdec_info; // video output hwdec handles
|
|
struct sh_stream *header;
|
|
|
|
char *decoder_desc;
|
|
|
|
struct mp_image_params decoder_output; // last output of the decoder
|
|
struct mp_image_params vf_input; // video filter input params
|
|
|
|
// Used temporarily during format changes
|
|
struct mp_image *waiting_decoded_mpi;
|
|
|
|
void *priv; // for free use by vd_driver
|
|
|
|
// Last PTS from decoder (set with each vd_driver->decode() call)
|
|
double codec_pts;
|
|
int num_codec_pts_problems;
|
|
|
|
// Last packet DTS from decoder (passed through from source packets)
|
|
double codec_dts;
|
|
int num_codec_dts_problems;
|
|
|
|
// PTS sorting (obscure, non-default)
|
|
double buffered_pts[32];
|
|
int num_buffered_pts;
|
|
double sorted_pts;
|
|
int num_sorted_pts_problems;
|
|
double unsorted_pts;
|
|
int num_unsorted_pts_problems;
|
|
int pts_assoc_mode;
|
|
|
|
// PTS or DTS of packet last read
|
|
double last_packet_pdts;
|
|
|
|
// There was at least one packet with non-sense timestamps.
|
|
int has_broken_packet_pts; // <0: uninitialized, 0: no problems, 1: broken
|
|
|
|
// Final PTS of previously decoded image
|
|
double decoded_pts;
|
|
|
|
float stream_aspect; // aspect ratio in media headers (DVD IFO files)
|
|
int i_bps; // == bitrate (compressed bytes/sec)
|
|
float fps; // FPS from demuxer or from user override
|
|
float initial_decoder_aspect;
|
|
|
|
// State used only by player/video.c
|
|
double last_pts;
|
|
};
|
|
|
|
struct mp_decoder_list *video_decoder_list(void);
|
|
|
|
bool video_init_best_codec(struct dec_video *d_video, char* video_decoders);
|
|
void video_uninit(struct dec_video *d_video);
|
|
|
|
struct demux_packet;
|
|
struct mp_image *video_decode(struct dec_video *d_video,
|
|
struct demux_packet *packet,
|
|
int drop_frame);
|
|
|
|
int video_get_colors(struct dec_video *d_video, const char *item, int *value);
|
|
int video_set_colors(struct dec_video *d_video, const char *item, int value);
|
|
void video_reset_decoding(struct dec_video *d_video);
|
|
int video_vd_control(struct dec_video *d_video, int cmd, void *arg);
|
|
|
|
int video_reconfig_filters(struct dec_video *d_video,
|
|
const struct mp_image_params *params);
|
|
|
|
int video_vf_vo_control(struct dec_video *d_video, int vf_cmd, void *data);
|
|
|
|
#endif /* MPLAYER_DEC_VIDEO_H */
|