mirror of
https://github.com/mpv-player/mpv
synced 2025-01-02 04:42:10 +00:00
f90e7ef7ea
If the --fps option was given (MPOpts->force_fps), the demuxer FPS value was overwritten with the forced value. This was fine, since the demuxer value wasn't needed anymore. But with the recent changes not to write to the demuxer stream headers, we don't want to do this anymore. So maintain the (forced/updated) FPS value in dec_video->fps. The removed code in loadfile.c is probably redundant, and an artifact from past refactorings. Note that sub.c will now always use the demuxer FPS value, instead of the user override value. I think this is fine, because it used the demuxer's video size values too. (And it's rare that these values are used at all.)
80 lines
2.6 KiB
C
80 lines
2.6 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 osd_state;
|
|
struct mp_decoder_list;
|
|
|
|
struct dec_video {
|
|
struct MPOpts *opts;
|
|
struct vf_instance *vfilter; // video filter chain
|
|
const struct vd_functions *vd_driver;
|
|
int vf_initialized; // -1 failed, 0 not done, 1 done
|
|
long vf_reconfig_count; // incremented each mpcodecs_reconfig_vo() call
|
|
struct mp_image_params vf_input; // video filter input params
|
|
struct mp_hwdec_info hwdec_info; // video output hwdec handles
|
|
struct sh_stream *header;
|
|
|
|
char *decoder_desc;
|
|
|
|
void *priv;
|
|
|
|
float next_frame_time;
|
|
double last_pts;
|
|
double buffered_pts[32];
|
|
int num_buffered_pts;
|
|
double codec_reordered_pts;
|
|
double prev_codec_reordered_pts;
|
|
int num_reordered_pts_problems;
|
|
double sorted_pts;
|
|
double prev_sorted_pts;
|
|
int num_sorted_pts_problems;
|
|
int pts_assoc_mode;
|
|
double 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;
|
|
};
|
|
|
|
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;
|
|
void *video_decode(struct dec_video *d_video, struct demux_packet *packet,
|
|
int drop_frame, double pts);
|
|
|
|
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_resync_stream(struct dec_video *d_video);
|
|
void video_reinit_vo(struct dec_video *d_video);
|
|
int video_vd_control(struct dec_video *d_video, int cmd, void *arg);
|
|
|
|
#endif /* MPLAYER_DEC_VIDEO_H */
|