mirror of
https://github.com/mpv-player/mpv
synced 2025-02-25 01:37:21 +00:00
8ea7eb77fc
The mpctx->eof field was used to also store other reasons to stop playing the current file besides EOF, and the code didn't properly distinguish those from EOF. Rename the field to "stop_play" and clean up some of the code accessing it. Properly separating EOF from other reasons allows handling file switching better. Before this commit buffered audio was always drained before moving to the next file (the only exception when it was NOT drained when stopping a file was when quitting the player completely). This added an extra delay when manually moving to the next file as you had to wait for the currently buffered audio to finish playing before the next file would start. After this commit audio is only drained if the file reaches EOF normally; otherwise audio is cut and the next file starts immediately.
137 lines
4.3 KiB
C
137 lines
4.3 KiB
C
#ifndef MPLAYER_MP_CORE_H
|
|
#define MPLAYER_MP_CORE_H
|
|
|
|
#include "options.h"
|
|
#include "mixer.h"
|
|
#include "subreader.h"
|
|
|
|
// definitions used internally by the core player code
|
|
|
|
#define INITIALIZED_VO 1
|
|
#define INITIALIZED_AO 2
|
|
#define INITIALIZED_GUI 4
|
|
#define INITIALIZED_GETCH2 8
|
|
#define INITIALIZED_SPUDEC 32
|
|
#define INITIALIZED_STREAM 64
|
|
#define INITIALIZED_VOBSUB 256
|
|
#define INITIALIZED_DEMUXER 512
|
|
#define INITIALIZED_ACODEC 1024
|
|
#define INITIALIZED_VCODEC 2048
|
|
#define INITIALIZED_ALL 0xFFFF
|
|
|
|
|
|
#define SUB_SOURCE_SUBS 0
|
|
#define SUB_SOURCE_VOBSUB 1
|
|
#define SUB_SOURCE_DEMUX 2
|
|
#define SUB_SOURCES 3
|
|
|
|
|
|
enum stop_play_reason {
|
|
KEEP_PLAYING = 0, // must be 0, numeric values of others do not matter
|
|
AT_END_OF_FILE,
|
|
PT_NEXT_ENTRY,
|
|
PT_PREV_ENTRY,
|
|
PT_NEXT_SRC,
|
|
PT_PREV_SRC,
|
|
PT_UP_NEXT,
|
|
PT_UP_PREV,
|
|
PT_STOP,
|
|
};
|
|
|
|
|
|
typedef struct MPContext {
|
|
struct MPOpts opts;
|
|
struct m_config *mconfig;
|
|
struct vo_x11_state *x11_state;
|
|
struct mp_fifo *key_fifo;
|
|
struct input_ctx *input;
|
|
struct osd_state *osd;
|
|
int osd_show_percentage;
|
|
int osd_function;
|
|
const ao_functions_t *audio_out;
|
|
struct play_tree *playtree;
|
|
struct play_tree_iter *playtree_iter;
|
|
char *filename; // currently playing file
|
|
enum stop_play_reason stop_play;
|
|
int play_tree_step;
|
|
unsigned int initialized_flags; // which subsystems have been initialized
|
|
|
|
struct stream *stream;
|
|
struct demuxer *demuxer;
|
|
struct sh_audio *sh_audio;
|
|
struct sh_video *sh_video;
|
|
struct demux_stream *d_audio;
|
|
struct demux_stream *d_video;
|
|
struct demux_stream *d_sub;
|
|
mixer_t mixer;
|
|
struct vo *video_out;
|
|
// Frames buffered in the vo ready to flip. Currently always 0 or 1.
|
|
// This is really a vo variable but currently there's no suitable vo
|
|
// struct.
|
|
int num_buffered_frames;
|
|
|
|
// AV sync: the next frame should be shown when the audio out has this
|
|
// much (in seconds) buffered data left. Increased when more data is
|
|
// written to the ao, decreased when moving to the next frame.
|
|
// In the audio-only case used as a timer since the last seek
|
|
// by the audio CPU usage meter.
|
|
double delay;
|
|
|
|
// Timestamp from the last time some timing functions read the
|
|
// current time, in (occasionally wrapping) microseconds. Used
|
|
// to turn a new time value to a delta from last time.
|
|
unsigned int last_time;
|
|
|
|
// Used to communicate the parameters of a seek between parts
|
|
float rel_seek_secs;
|
|
int abs_seek_pos;
|
|
|
|
float begin_skip; ///< start time of the current skip while on edlout mode
|
|
// audio is muted if either EDL or user activates mute
|
|
short edl_muted; ///< Stores whether EDL is currently in muted mode.
|
|
short user_muted; ///< Stores whether user wanted muted mode.
|
|
|
|
int global_sub_size; // this encompasses all subtitle sources
|
|
int global_sub_pos; // this encompasses all subtitle sources
|
|
int set_of_sub_pos;
|
|
int set_of_sub_size;
|
|
int global_sub_indices[SUB_SOURCES];
|
|
// set_of_ass_tracks[i] contains subtitles from set_of_subtitles[i]
|
|
// parsed by libass or NULL if format unsupported
|
|
struct ass_track_s *set_of_ass_tracks[MAX_SUBTITLE_FILES];
|
|
sub_data* set_of_subtitles[MAX_SUBTITLE_FILES];
|
|
|
|
int file_format;
|
|
|
|
int last_dvb_step;
|
|
int dvbin_reopen;
|
|
|
|
int was_paused;
|
|
|
|
#ifdef CONFIG_DVDNAV
|
|
struct mp_image *nav_smpi; ///< last decoded dvdnav video image
|
|
unsigned char *nav_buffer; ///< last read dvdnav video frame
|
|
unsigned char *nav_start; ///< pointer to last read video buffer
|
|
int nav_in_size; ///< last read size
|
|
#endif
|
|
} MPContext;
|
|
|
|
|
|
// Most of these should not be globals
|
|
extern FILE *edl_fd;
|
|
extern int file_filter;
|
|
// These appear in options list
|
|
extern int forced_subs_only;
|
|
|
|
struct ao_data;
|
|
int build_afilter_chain(struct MPContext *mpctx, struct sh_audio *sh_audio, struct ao_data *ao_data);
|
|
void uninit_player(struct MPContext *mpctx, unsigned int mask);
|
|
void reinit_audio_chain(struct MPContext *mpctx);
|
|
void init_vo_spudec(struct MPContext *mpctx);
|
|
double playing_audio_pts(struct MPContext *mpctx);
|
|
void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc);
|
|
void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr);
|
|
int reinit_video_chain(struct MPContext *mpctx);
|
|
|
|
#endif /* MPLAYER_MP_CORE_H */
|