From 56eafe33448780231cd2626239cac443e1cdbab4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Dec 2013 01:08:53 +0100 Subject: Rename mp_core.h to core.h Get rid of the mp_ prefix. --- mpvcore/options.c | 2 +- player/audio.c | 2 +- player/command.c | 2 +- player/configfiles.c | 2 +- player/core.h | 459 ++++++++++++++++++++++++++++++++++++++++++ player/dvdnav.c | 2 +- player/loadfile.c | 2 +- player/main.c | 2 +- player/misc.c | 2 +- player/mp_core.h | 459 ------------------------------------------ player/mp_lua.c | 2 +- player/osd.c | 2 +- player/playloop.c | 2 +- player/screenshot.c | 2 +- player/sub.c | 2 +- player/timeline/tl_cue.c | 2 +- player/timeline/tl_matroska.c | 2 +- player/timeline/tl_mpv_edl.c | 2 +- player/video.c | 2 +- 19 files changed, 476 insertions(+), 476 deletions(-) create mode 100644 player/core.h delete mode 100644 player/mp_core.h diff --git a/mpvcore/options.c b/mpvcore/options.c index 493c968243..e98009efab 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -39,7 +39,7 @@ #include "audio/mixer.h" #include "audio/filter/af.h" #include "audio/decode/dec_audio.h" -#include "player/mp_core.h" +#include "player/core.h" #include "osdep/priority.h" int network_bandwidth=0; diff --git a/player/audio.c b/player/audio.c index ec2f039531..8be2f9cddc 100644 --- a/player/audio.c +++ b/player/audio.c @@ -38,7 +38,7 @@ #include "demux/demux.h" #include "video/decode/dec_video.h" -#include "mp_core.h" +#include "core.h" static int build_afilter_chain(struct MPContext *mpctx) { diff --git a/player/command.c b/player/command.c index 10dfb4c261..35a6ed31bc 100644 --- a/player/command.c +++ b/player/command.c @@ -72,7 +72,7 @@ #include "osdep/io.h" -#include "mp_core.h" +#include "core.h" #include "mp_lua.h" struct command_ctx { diff --git a/player/configfiles.c b/player/configfiles.c index ac95f6fdf4..eb72de08ed 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -41,7 +41,7 @@ #include "stream/stream.h" -#include "mp_core.h" +#include "core.h" #include "command.h" #define DEF_CONFIG "# Write your default config options here!\n\n\n" diff --git a/player/core.h b/player/core.h new file mode 100644 index 0000000000..e1c7997907 --- /dev/null +++ b/player/core.h @@ -0,0 +1,459 @@ +/* + * 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_MP_CORE_H +#define MPLAYER_MP_CORE_H + +#include + +#include "mpvcore/mp_common.h" +#include "mpvcore/options.h" + +// definitions used internally by the core player code + +#define INITIALIZED_VO 1 +#define INITIALIZED_AO 2 +#define INITIALIZED_PLAYBACK 16 +#define INITIALIZED_LIBASS 32 +#define INITIALIZED_STREAM 64 +#define INITIALIZED_DEMUXER 512 +#define INITIALIZED_ACODEC 1024 +#define INITIALIZED_VCODEC 2048 +#define INITIALIZED_SUB 4096 +#define INITIALIZED_ALL 0xFFFF + + +enum stop_play_reason { + KEEP_PLAYING = 0, // must be 0, numeric values of others do not matter + AT_END_OF_FILE, // file has ended, prepare to play next + // also returned on unrecoverable playback errors + PT_NEXT_ENTRY, // prepare to play next entry in playlist + PT_CURRENT_ENTRY, // prepare to play mpctx->playlist->current + PT_STOP, // stop playback, clear playlist + PT_RESTART, // restart previous file + PT_RELOAD_DEMUXER, // restart playback, but keep stream open + PT_QUIT, // stop playback, quit player +}; + +enum exit_reason { + EXIT_NONE, + EXIT_QUIT, + EXIT_PLAYED, + EXIT_ERROR, + EXIT_NOTPLAYED, + EXIT_SOMENOTPLAYED +}; + +struct timeline_part { + double start; + double source_start; + struct demuxer *source; +}; + +struct chapter { + double start; + char *name; +}; + +enum mp_osd_seek_info { + OSD_SEEK_INFO_BAR = 1, + OSD_SEEK_INFO_TEXT = 2, + OSD_SEEK_INFO_CHAPTER_TEXT = 4, + OSD_SEEK_INFO_EDITION = 8, +}; + + +enum { + OSD_MSG_TEXT = 1, + OSD_MSG_SUB_DELAY, + OSD_MSG_SPEED, + OSD_MSG_OSD_STATUS, + OSD_MSG_BAR, + OSD_MSG_PAUSE, + OSD_MSG_RADIO_CHANNEL, + OSD_MSG_TV_CHANNEL, + + // Base id for messages generated from the commmand to property bridge. + OSD_MSG_PROPERTY = 0x100, + OSD_MSG_SUB_BASE = 0x1000, + + // other constants + MAX_OSD_LEVEL = 3, + MAX_TERM_OSD_LEVEL = 1, + OSD_LEVEL_INVISIBLE = 4, + OSD_BAR_SEEK = 256, +}; + +enum seek_type { + MPSEEK_NONE = 0, + MPSEEK_RELATIVE, + MPSEEK_ABSOLUTE, + MPSEEK_FACTOR, +}; + +struct track { + enum stream_type type; + // The type specific ID, also called aid (audio), sid (subs), vid (video). + // For UI purposes only; this ID doesn't have anything to do with any + // IDs coming from demuxers or container files. + int user_tid; + + // Same as stream->demuxer_id. -1 if not set. + int demuxer_id; + + char *title; + bool default_track; + bool attached_picture; + char *lang; + + // If this track is from an external file (e.g. subtitle file). + bool is_external; + char *external_filename; + bool auto_loaded; + + // If the track's stream changes with the timeline (ordered chapters). + bool under_timeline; + + // Value can change if under_timeline==true. + struct demuxer *demuxer; + // Invariant: !stream || stream->demuxer == demuxer + struct sh_stream *stream; + + // For external subtitles, which are read fully on init. Do not attempt + // to read packets from them. + bool preloaded; +}; + +enum { + MAX_NUM_VO_PTS = 100, +}; + +typedef struct MPContext { + struct mpv_global *global; + struct MPOpts *opts; + struct mp_log *log; + struct m_config *mconfig; + struct input_ctx *input; + struct osd_state *osd; + struct mp_osd_msg *osd_msg_stack; + char *terminal_osd_text; + char *last_window_title; + + int add_osd_seek_info; // bitfield of enum mp_osd_seek_info + double osd_visible; // for the osd bar only + int osd_function; + double osd_function_visible; + double osd_last_update; + + struct playlist *playlist; + char *filename; // currently playing file + struct mp_resolve_result *resolve_result; + enum stop_play_reason stop_play; + unsigned int initialized_flags; // which subsystems have been initialized + + // Return code to use with PT_QUIT + enum exit_reason quit_player_rc; + int quit_custom_rc; + bool has_quit_custom_rc; + bool error_playing; + + int64_t shown_vframes, shown_aframes; + + struct demuxer **sources; + int num_sources; + + struct timeline_part *timeline; + int num_timeline_parts; + int timeline_part; + // NOTE: even if num_chapters==0, chapters being not NULL signifies presence + // of chapter metadata + struct chapter *chapters; + int num_chapters; + double video_offset; + + struct stream *stream; + struct demuxer *demuxer; + + struct track **tracks; + int num_tracks; + + char *track_layout_hash; + + // Selected tracks. NULL if no track selected. + struct track *current_track[STREAM_TYPE_COUNT]; + + struct sh_stream *sh[STREAM_TYPE_COUNT]; + + struct dec_video *d_video; + struct dec_audio *d_audio; + struct dec_sub *d_sub; + + // Uses: accessing metadata (consider ordered chapters case, where the main + // demuxer defines metadata), or special purpose demuxers like TV. + struct demuxer *master_demuxer; + + struct mixer *mixer; + struct ao *ao; + struct vo *video_out; + + /* We're starting playback from scratch or after a seek. Show first + * video frame immediately and reinitialize sync. */ + bool restart_playback; + /* Set if audio should be timed to start with video frame after seeking, + * not set when e.g. playing cover art */ + bool sync_audio_to_video; + /* After playback restart (above) or audio stream change, adjust audio + * stream by cutting samples or adding silence at the beginning to make + * audio playback position match video position. */ + bool syncing_audio; + bool hrseek_active; + bool hrseek_framedrop; + double hrseek_pts; + // 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; + // AV sync: time until next frame should be shown + double time_frame; + // How long the last vo flip() call took. Used to adjust timing with + // the goal of making flip() calls finish (rather than start) at the + // specified time. + double last_vo_flip_duration; + // Display duration (as "intended") of the last flipped frame. + double last_frame_duration; + // Set to true some time after a new frame has been shown, and it turns out + // that this frame was the last one before video ends. + bool playing_last_frame; + // How much video timing has been changed to make it match the audio + // timeline. Used for status line information only. + double total_avsync_change; + // Total number of dropped frames that were "approved" to be dropped. + // Actual dropping depends on --framedrop and decoder internals. + int drop_frame_cnt; + // Number of frames dropped in a row. + int dropped_frames; + // A-V sync difference when last frame was displayed. Kept to display + // the same value if the status line is updated at a time where no new + // video frame is shown. + double last_av_difference; + /* Timestamp of the latest image that was queued on the VO, but not yet + * to be flipped. */ + double video_next_pts; + /* timestamp of video frame currently visible on screen + * (or at least queued to be flipped by VO) */ + double video_pts; + double last_seek_pts; + // As video_pts, but is not reset when seeking away. (For the very short + // period of time until a new frame is decoded and shown.) + double last_vo_pts; + // Video PTS, or audio PTS if video has ended. + double playback_pts; + + // History of video frames timestamps that were queued in the VO + // This includes even skipped frames during hr-seek + double vo_pts_history_pts[MAX_NUM_VO_PTS]; + // Whether the PTS at vo_pts_history[n] is after a seek reset + uint64_t vo_pts_history_seek[MAX_NUM_VO_PTS]; + uint64_t vo_pts_history_seek_ts; + uint64_t backstep_start_seek_ts; + bool backstep_active; + + double audio_delay; + + double last_heartbeat; + double last_metadata_update; + + double mouse_timer; + unsigned int mouse_event_ts; + bool mouse_cursor_visible; + + // used to prevent hanging in some error cases + double start_timestamp; + + // Timestamp from the last time some timing functions read the + // current time, in microseconds. + // Used to turn a new time value to a delta from last time. + int64_t last_time; + + // Used to communicate the parameters of a seek between parts + struct seek_params { + enum seek_type type; + double amount; + int exact; // -1 = disable, 0 = default, 1 = enable + // currently not set by commands, only used internally by seek() + int direction; // -1 = backward, 0 = default, 1 = forward + } seek; + + /* Heuristic for relative chapter seeks: keep track which chapter + * the user wanted to go to, even if we aren't exactly within the + * boundaries of that chapter due to an inaccurate seek. */ + int last_chapter_seek; + double last_chapter_pts; + + /* Subtitle renderer. This is separate, because we want to keep fonts + * loaded across ordered chapters, instead of reloading and rescanning + * them on each transition. (Both of these objects contain this state.) + */ + struct ass_renderer *ass_renderer; + struct ass_library *ass_library; + + int last_dvb_step; + + bool paused; + // step this many frames, then pause + int step_frames; + // Counted down each frame, stop playback if 0 is reached. (-1 = disable) + int max_frames; + bool playing_msg_shown; + + bool paused_for_cache; + + // Set after showing warning about decoding being too slow for realtime + // playback rate. Used to avoid showing it multiple times. + bool drop_message_shown; + + struct screenshot_ctx *screenshot_ctx; + struct command_ctx *command_ctx; + struct encode_lavc_context *encode_lavc_ctx; + struct lua_ctx *lua_ctx; + struct mp_nav_state *nav_state; +} MPContext; + +// audio.c +void reinit_audio_chain(struct MPContext *mpctx); +int reinit_audio_filters(struct MPContext *mpctx); +double playing_audio_pts(struct MPContext *mpctx); +int fill_audio_out_buffers(struct MPContext *mpctx, double endpts); +double written_audio_pts(struct MPContext *mpctx); +void clear_audio_output_buffers(struct MPContext *mpctx); +void clear_audio_decode_buffers(struct MPContext *mpctx); + +// configfiles.c +bool mp_parse_cfgfiles(struct MPContext *mpctx); +char *mp_get_playback_resume_config_filename(const char *fname, + struct MPOpts *opts); +void mp_load_per_protocol_config(struct m_config *conf, const char * const file); +void mp_load_per_extension_config(struct m_config *conf, const char * const file); +void mp_load_per_output_config(struct m_config *conf, char *cfg, char *out); +void mp_load_per_file_config(struct m_config *conf, const char * const file, + bool search_file_dir); +void mp_load_playback_resume(struct m_config *conf, const char *file); +void mp_write_watch_later_conf(struct MPContext *mpctx); +struct playlist_entry *mp_resume_playlist(struct playlist *playlist, + struct MPOpts *opts); + +// dvdnav.c +void mp_nav_init(struct MPContext *mpctx); +void mp_nav_reset(struct MPContext *mpctx); +void mp_nav_destroy(struct MPContext *mpctx); +void mp_nav_user_input(struct MPContext *mpctx, char *command); +void mp_handle_nav(struct MPContext *mpctx); + +// loadfile.c +void uninit_player(struct MPContext *mpctx, unsigned int mask); +struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename); +void mp_switch_track(struct MPContext *mpctx, enum stream_type type, + struct track *track); +struct track *mp_track_by_tid(struct MPContext *mpctx, enum stream_type type, + int tid); +bool timeline_set_part(struct MPContext *mpctx, int i, bool force); +double timeline_set_from_time(struct MPContext *mpctx, double pts, bool *need_reset); +struct sh_stream *init_demux_stream(struct MPContext *mpctx, + enum stream_type type); +void cleanup_demux_stream(struct MPContext *mpctx, enum stream_type type); +void add_demuxer_tracks(struct MPContext *mpctx, struct demuxer *demuxer); +bool mp_remove_track(struct MPContext *mpctx, struct track *track); +struct playlist_entry *mp_next_file(struct MPContext *mpctx, int direction, + bool force); +void mp_set_playlist_entry(struct MPContext *mpctx, struct playlist_entry *e); +void mp_play_files(struct MPContext *mpctx); + +// main.c +void mp_print_version(int always); + +// misc.c +double get_start_time(struct MPContext *mpctx); +double get_main_demux_pts(struct MPContext *mpctx); +double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t, + double fallback_time); +double get_play_end_pts(struct MPContext *mpctx); +double get_relative_time(struct MPContext *mpctx); +void merge_playlist_files(struct playlist *pl); +int mp_get_cache_percent(struct MPContext *mpctx); +bool mp_get_cache_idle(struct MPContext *mpctx); +void update_window_title(struct MPContext *mpctx, bool force); +void stream_dump(struct MPContext *mpctx); + +// osd.c +void write_status_line(struct MPContext *mpctx, const char *line); +void print_status(struct MPContext *mpctx); +void set_osd_bar(struct MPContext *mpctx, int type, const char* name, + double min, double max, double val); +void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, + const char* fmt, ...) PRINTF_ATTRIBUTE(5,6); +void rm_osd_msg(struct MPContext *mpctx, int id); +void set_osd_function(struct MPContext *mpctx, int osd_function); +void set_osd_subtitle(struct MPContext *mpctx, const char *text); + +// playloop.c +void pause_player(struct MPContext *mpctx); +void unpause_player(struct MPContext *mpctx); +void add_step_frame(struct MPContext *mpctx, int dir); +void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount, + int exact); +bool mp_seek_chapter(struct MPContext *mpctx, int chapter); +double get_time_length(struct MPContext *mpctx); +double get_current_time(struct MPContext *mpctx); +int get_percent_pos(struct MPContext *mpctx); +double get_current_pos_ratio(struct MPContext *mpctx, bool use_range); +int get_current_chapter(struct MPContext *mpctx); +char *chapter_display_name(struct MPContext *mpctx, int chapter); +char *chapter_name(struct MPContext *mpctx, int chapter); +double chapter_start_time(struct MPContext *mpctx, int chapter); +int get_chapter_count(struct MPContext *mpctx); +void execute_queued_seek(struct MPContext *mpctx); +void run_playloop(struct MPContext *mpctx); +void idle_loop(struct MPContext *mpctx); +void handle_force_window(struct MPContext *mpctx, bool reconfig); +void add_frame_pts(struct MPContext *mpctx, double pts); + +// sub.c +void reset_subtitles(struct MPContext *mpctx); +void uninit_subs(struct demuxer *demuxer); +void reinit_subs(struct MPContext *mpctx); +void update_osd_msg(struct MPContext *mpctx); +void update_subtitles(struct MPContext *mpctx); + +// timeline/tl_matroska.c +void build_ordered_chapter_timeline(struct MPContext *mpctx); +// timeline/tl_mpv_edl.c +void build_mpv_edl_timeline(struct MPContext *mpctx); +// timeline/tl_cue.c +void build_cue_timeline(struct MPContext *mpctx); + +// video.c +int reinit_video_chain(struct MPContext *mpctx); +int reinit_video_filters(struct MPContext *mpctx); +double update_video(struct MPContext *mpctx, double endpts); +void mp_force_video_refresh(struct MPContext *mpctx); +void update_fps(struct MPContext *mpctx); +void video_execute_format_change(struct MPContext *mpctx); + +#endif /* MPLAYER_MP_CORE_H */ diff --git a/player/dvdnav.c b/player/dvdnav.c index 7fe1be3392..f00274a7d0 100644 --- a/player/dvdnav.c +++ b/player/dvdnav.c @@ -18,7 +18,7 @@ #include #include -#include "mp_core.h" +#include "core.h" #include "mpvcore/mp_msg.h" #include "mpvcore/mp_common.h" diff --git a/player/loadfile.c b/player/loadfile.c index 08b245a0ff..b1d4555269 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -55,7 +55,7 @@ #include "video/decode/dec_video.h" #include "video/out/vo.h" -#include "mp_core.h" +#include "core.h" #include "command.h" #if HAVE_DVBIN diff --git a/player/main.c b/player/main.c index 685ae16792..bef1f69351 100644 --- a/player/main.c +++ b/player/main.c @@ -60,7 +60,7 @@ #include "video/decode/dec_video.h" #include "video/out/vo.h" -#include "mp_core.h" +#include "core.h" #include "mp_lua.h" #include "command.h" #include "screenshot.h" diff --git a/player/misc.c b/player/misc.c index e54381d2e2..5f7d252551 100644 --- a/player/misc.c +++ b/player/misc.c @@ -40,7 +40,7 @@ #include "stream/stream.h" #include "video/out/vo.h" -#include "mp_core.h" +#include "core.h" #include "command.h" double get_relative_time(struct MPContext *mpctx) diff --git a/player/mp_core.h b/player/mp_core.h deleted file mode 100644 index e1c7997907..0000000000 --- a/player/mp_core.h +++ /dev/null @@ -1,459 +0,0 @@ -/* - * 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_MP_CORE_H -#define MPLAYER_MP_CORE_H - -#include - -#include "mpvcore/mp_common.h" -#include "mpvcore/options.h" - -// definitions used internally by the core player code - -#define INITIALIZED_VO 1 -#define INITIALIZED_AO 2 -#define INITIALIZED_PLAYBACK 16 -#define INITIALIZED_LIBASS 32 -#define INITIALIZED_STREAM 64 -#define INITIALIZED_DEMUXER 512 -#define INITIALIZED_ACODEC 1024 -#define INITIALIZED_VCODEC 2048 -#define INITIALIZED_SUB 4096 -#define INITIALIZED_ALL 0xFFFF - - -enum stop_play_reason { - KEEP_PLAYING = 0, // must be 0, numeric values of others do not matter - AT_END_OF_FILE, // file has ended, prepare to play next - // also returned on unrecoverable playback errors - PT_NEXT_ENTRY, // prepare to play next entry in playlist - PT_CURRENT_ENTRY, // prepare to play mpctx->playlist->current - PT_STOP, // stop playback, clear playlist - PT_RESTART, // restart previous file - PT_RELOAD_DEMUXER, // restart playback, but keep stream open - PT_QUIT, // stop playback, quit player -}; - -enum exit_reason { - EXIT_NONE, - EXIT_QUIT, - EXIT_PLAYED, - EXIT_ERROR, - EXIT_NOTPLAYED, - EXIT_SOMENOTPLAYED -}; - -struct timeline_part { - double start; - double source_start; - struct demuxer *source; -}; - -struct chapter { - double start; - char *name; -}; - -enum mp_osd_seek_info { - OSD_SEEK_INFO_BAR = 1, - OSD_SEEK_INFO_TEXT = 2, - OSD_SEEK_INFO_CHAPTER_TEXT = 4, - OSD_SEEK_INFO_EDITION = 8, -}; - - -enum { - OSD_MSG_TEXT = 1, - OSD_MSG_SUB_DELAY, - OSD_MSG_SPEED, - OSD_MSG_OSD_STATUS, - OSD_MSG_BAR, - OSD_MSG_PAUSE, - OSD_MSG_RADIO_CHANNEL, - OSD_MSG_TV_CHANNEL, - - // Base id for messages generated from the commmand to property bridge. - OSD_MSG_PROPERTY = 0x100, - OSD_MSG_SUB_BASE = 0x1000, - - // other constants - MAX_OSD_LEVEL = 3, - MAX_TERM_OSD_LEVEL = 1, - OSD_LEVEL_INVISIBLE = 4, - OSD_BAR_SEEK = 256, -}; - -enum seek_type { - MPSEEK_NONE = 0, - MPSEEK_RELATIVE, - MPSEEK_ABSOLUTE, - MPSEEK_FACTOR, -}; - -struct track { - enum stream_type type; - // The type specific ID, also called aid (audio), sid (subs), vid (video). - // For UI purposes only; this ID doesn't have anything to do with any - // IDs coming from demuxers or container files. - int user_tid; - - // Same as stream->demuxer_id. -1 if not set. - int demuxer_id; - - char *title; - bool default_track; - bool attached_picture; - char *lang; - - // If this track is from an external file (e.g. subtitle file). - bool is_external; - char *external_filename; - bool auto_loaded; - - // If the track's stream changes with the timeline (ordered chapters). - bool under_timeline; - - // Value can change if under_timeline==true. - struct demuxer *demuxer; - // Invariant: !stream || stream->demuxer == demuxer - struct sh_stream *stream; - - // For external subtitles, which are read fully on init. Do not attempt - // to read packets from them. - bool preloaded; -}; - -enum { - MAX_NUM_VO_PTS = 100, -}; - -typedef struct MPContext { - struct mpv_global *global; - struct MPOpts *opts; - struct mp_log *log; - struct m_config *mconfig; - struct input_ctx *input; - struct osd_state *osd; - struct mp_osd_msg *osd_msg_stack; - char *terminal_osd_text; - char *last_window_title; - - int add_osd_seek_info; // bitfield of enum mp_osd_seek_info - double osd_visible; // for the osd bar only - int osd_function; - double osd_function_visible; - double osd_last_update; - - struct playlist *playlist; - char *filename; // currently playing file - struct mp_resolve_result *resolve_result; - enum stop_play_reason stop_play; - unsigned int initialized_flags; // which subsystems have been initialized - - // Return code to use with PT_QUIT - enum exit_reason quit_player_rc; - int quit_custom_rc; - bool has_quit_custom_rc; - bool error_playing; - - int64_t shown_vframes, shown_aframes; - - struct demuxer **sources; - int num_sources; - - struct timeline_part *timeline; - int num_timeline_parts; - int timeline_part; - // NOTE: even if num_chapters==0, chapters being not NULL signifies presence - // of chapter metadata - struct chapter *chapters; - int num_chapters; - double video_offset; - - struct stream *stream; - struct demuxer *demuxer; - - struct track **tracks; - int num_tracks; - - char *track_layout_hash; - - // Selected tracks. NULL if no track selected. - struct track *current_track[STREAM_TYPE_COUNT]; - - struct sh_stream *sh[STREAM_TYPE_COUNT]; - - struct dec_video *d_video; - struct dec_audio *d_audio; - struct dec_sub *d_sub; - - // Uses: accessing metadata (consider ordered chapters case, where the main - // demuxer defines metadata), or special purpose demuxers like TV. - struct demuxer *master_demuxer; - - struct mixer *mixer; - struct ao *ao; - struct vo *video_out; - - /* We're starting playback from scratch or after a seek. Show first - * video frame immediately and reinitialize sync. */ - bool restart_playback; - /* Set if audio should be timed to start with video frame after seeking, - * not set when e.g. playing cover art */ - bool sync_audio_to_video; - /* After playback restart (above) or audio stream change, adjust audio - * stream by cutting samples or adding silence at the beginning to make - * audio playback position match video position. */ - bool syncing_audio; - bool hrseek_active; - bool hrseek_framedrop; - double hrseek_pts; - // 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; - // AV sync: time until next frame should be shown - double time_frame; - // How long the last vo flip() call took. Used to adjust timing with - // the goal of making flip() calls finish (rather than start) at the - // specified time. - double last_vo_flip_duration; - // Display duration (as "intended") of the last flipped frame. - double last_frame_duration; - // Set to true some time after a new frame has been shown, and it turns out - // that this frame was the last one before video ends. - bool playing_last_frame; - // How much video timing has been changed to make it match the audio - // timeline. Used for status line information only. - double total_avsync_change; - // Total number of dropped frames that were "approved" to be dropped. - // Actual dropping depends on --framedrop and decoder internals. - int drop_frame_cnt; - // Number of frames dropped in a row. - int dropped_frames; - // A-V sync difference when last frame was displayed. Kept to display - // the same value if the status line is updated at a time where no new - // video frame is shown. - double last_av_difference; - /* Timestamp of the latest image that was queued on the VO, but not yet - * to be flipped. */ - double video_next_pts; - /* timestamp of video frame currently visible on screen - * (or at least queued to be flipped by VO) */ - double video_pts; - double last_seek_pts; - // As video_pts, but is not reset when seeking away. (For the very short - // period of time until a new frame is decoded and shown.) - double last_vo_pts; - // Video PTS, or audio PTS if video has ended. - double playback_pts; - - // History of video frames timestamps that were queued in the VO - // This includes even skipped frames during hr-seek - double vo_pts_history_pts[MAX_NUM_VO_PTS]; - // Whether the PTS at vo_pts_history[n] is after a seek reset - uint64_t vo_pts_history_seek[MAX_NUM_VO_PTS]; - uint64_t vo_pts_history_seek_ts; - uint64_t backstep_start_seek_ts; - bool backstep_active; - - double audio_delay; - - double last_heartbeat; - double last_metadata_update; - - double mouse_timer; - unsigned int mouse_event_ts; - bool mouse_cursor_visible; - - // used to prevent hanging in some error cases - double start_timestamp; - - // Timestamp from the last time some timing functions read the - // current time, in microseconds. - // Used to turn a new time value to a delta from last time. - int64_t last_time; - - // Used to communicate the parameters of a seek between parts - struct seek_params { - enum seek_type type; - double amount; - int exact; // -1 = disable, 0 = default, 1 = enable - // currently not set by commands, only used internally by seek() - int direction; // -1 = backward, 0 = default, 1 = forward - } seek; - - /* Heuristic for relative chapter seeks: keep track which chapter - * the user wanted to go to, even if we aren't exactly within the - * boundaries of that chapter due to an inaccurate seek. */ - int last_chapter_seek; - double last_chapter_pts; - - /* Subtitle renderer. This is separate, because we want to keep fonts - * loaded across ordered chapters, instead of reloading and rescanning - * them on each transition. (Both of these objects contain this state.) - */ - struct ass_renderer *ass_renderer; - struct ass_library *ass_library; - - int last_dvb_step; - - bool paused; - // step this many frames, then pause - int step_frames; - // Counted down each frame, stop playback if 0 is reached. (-1 = disable) - int max_frames; - bool playing_msg_shown; - - bool paused_for_cache; - - // Set after showing warning about decoding being too slow for realtime - // playback rate. Used to avoid showing it multiple times. - bool drop_message_shown; - - struct screenshot_ctx *screenshot_ctx; - struct command_ctx *command_ctx; - struct encode_lavc_context *encode_lavc_ctx; - struct lua_ctx *lua_ctx; - struct mp_nav_state *nav_state; -} MPContext; - -// audio.c -void reinit_audio_chain(struct MPContext *mpctx); -int reinit_audio_filters(struct MPContext *mpctx); -double playing_audio_pts(struct MPContext *mpctx); -int fill_audio_out_buffers(struct MPContext *mpctx, double endpts); -double written_audio_pts(struct MPContext *mpctx); -void clear_audio_output_buffers(struct MPContext *mpctx); -void clear_audio_decode_buffers(struct MPContext *mpctx); - -// configfiles.c -bool mp_parse_cfgfiles(struct MPContext *mpctx); -char *mp_get_playback_resume_config_filename(const char *fname, - struct MPOpts *opts); -void mp_load_per_protocol_config(struct m_config *conf, const char * const file); -void mp_load_per_extension_config(struct m_config *conf, const char * const file); -void mp_load_per_output_config(struct m_config *conf, char *cfg, char *out); -void mp_load_per_file_config(struct m_config *conf, const char * const file, - bool search_file_dir); -void mp_load_playback_resume(struct m_config *conf, const char *file); -void mp_write_watch_later_conf(struct MPContext *mpctx); -struct playlist_entry *mp_resume_playlist(struct playlist *playlist, - struct MPOpts *opts); - -// dvdnav.c -void mp_nav_init(struct MPContext *mpctx); -void mp_nav_reset(struct MPContext *mpctx); -void mp_nav_destroy(struct MPContext *mpctx); -void mp_nav_user_input(struct MPContext *mpctx, char *command); -void mp_handle_nav(struct MPContext *mpctx); - -// loadfile.c -void uninit_player(struct MPContext *mpctx, unsigned int mask); -struct track *mp_add_subtitles(struct MPContext *mpctx, char *filename); -void mp_switch_track(struct MPContext *mpctx, enum stream_type type, - struct track *track); -struct track *mp_track_by_tid(struct MPContext *mpctx, enum stream_type type, - int tid); -bool timeline_set_part(struct MPContext *mpctx, int i, bool force); -double timeline_set_from_time(struct MPContext *mpctx, double pts, bool *need_reset); -struct sh_stream *init_demux_stream(struct MPContext *mpctx, - enum stream_type type); -void cleanup_demux_stream(struct MPContext *mpctx, enum stream_type type); -void add_demuxer_tracks(struct MPContext *mpctx, struct demuxer *demuxer); -bool mp_remove_track(struct MPContext *mpctx, struct track *track); -struct playlist_entry *mp_next_file(struct MPContext *mpctx, int direction, - bool force); -void mp_set_playlist_entry(struct MPContext *mpctx, struct playlist_entry *e); -void mp_play_files(struct MPContext *mpctx); - -// main.c -void mp_print_version(int always); - -// misc.c -double get_start_time(struct MPContext *mpctx); -double get_main_demux_pts(struct MPContext *mpctx); -double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t, - double fallback_time); -double get_play_end_pts(struct MPContext *mpctx); -double get_relative_time(struct MPContext *mpctx); -void merge_playlist_files(struct playlist *pl); -int mp_get_cache_percent(struct MPContext *mpctx); -bool mp_get_cache_idle(struct MPContext *mpctx); -void update_window_title(struct MPContext *mpctx, bool force); -void stream_dump(struct MPContext *mpctx); - -// osd.c -void write_status_line(struct MPContext *mpctx, const char *line); -void print_status(struct MPContext *mpctx); -void set_osd_bar(struct MPContext *mpctx, int type, const char* name, - double min, double max, double val); -void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, - const char* fmt, ...) PRINTF_ATTRIBUTE(5,6); -void rm_osd_msg(struct MPContext *mpctx, int id); -void set_osd_function(struct MPContext *mpctx, int osd_function); -void set_osd_subtitle(struct MPContext *mpctx, const char *text); - -// playloop.c -void pause_player(struct MPContext *mpctx); -void unpause_player(struct MPContext *mpctx); -void add_step_frame(struct MPContext *mpctx, int dir); -void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount, - int exact); -bool mp_seek_chapter(struct MPContext *mpctx, int chapter); -double get_time_length(struct MPContext *mpctx); -double get_current_time(struct MPContext *mpctx); -int get_percent_pos(struct MPContext *mpctx); -double get_current_pos_ratio(struct MPContext *mpctx, bool use_range); -int get_current_chapter(struct MPContext *mpctx); -char *chapter_display_name(struct MPContext *mpctx, int chapter); -char *chapter_name(struct MPContext *mpctx, int chapter); -double chapter_start_time(struct MPContext *mpctx, int chapter); -int get_chapter_count(struct MPContext *mpctx); -void execute_queued_seek(struct MPContext *mpctx); -void run_playloop(struct MPContext *mpctx); -void idle_loop(struct MPContext *mpctx); -void handle_force_window(struct MPContext *mpctx, bool reconfig); -void add_frame_pts(struct MPContext *mpctx, double pts); - -// sub.c -void reset_subtitles(struct MPContext *mpctx); -void uninit_subs(struct demuxer *demuxer); -void reinit_subs(struct MPContext *mpctx); -void update_osd_msg(struct MPContext *mpctx); -void update_subtitles(struct MPContext *mpctx); - -// timeline/tl_matroska.c -void build_ordered_chapter_timeline(struct MPContext *mpctx); -// timeline/tl_mpv_edl.c -void build_mpv_edl_timeline(struct MPContext *mpctx); -// timeline/tl_cue.c -void build_cue_timeline(struct MPContext *mpctx); - -// video.c -int reinit_video_chain(struct MPContext *mpctx); -int reinit_video_filters(struct MPContext *mpctx); -double update_video(struct MPContext *mpctx, double endpts); -void mp_force_video_refresh(struct MPContext *mpctx); -void update_fps(struct MPContext *mpctx); -void video_execute_format_change(struct MPContext *mpctx); - -#endif /* MPLAYER_MP_CORE_H */ diff --git a/player/mp_lua.c b/player/mp_lua.c index 38dc8b2af5..9bae3379ce 100644 --- a/player/mp_lua.c +++ b/player/mp_lua.c @@ -16,7 +16,7 @@ #include "mpvcore/bstr.h" #include "osdep/timer.h" #include "sub/osd.h" -#include "mp_core.h" +#include "core.h" #include "command.h" #include "mp_lua.h" diff --git a/player/osd.c b/player/osd.c index 42409b555f..f2a81b961b 100644 --- a/player/osd.c +++ b/player/osd.c @@ -38,7 +38,7 @@ #include "demux/demux.h" #include "sub/osd.h" -#include "mp_core.h" +#include "core.h" #include "command.h" #define saddf(var, ...) (*(var) = talloc_asprintf_append((*var), __VA_ARGS__)) diff --git a/player/playloop.c b/player/playloop.c index dbc87a7ec6..a2a577ced9 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -46,7 +46,7 @@ #include "video/decode/dec_video.h" #include "video/out/vo.h" -#include "mp_core.h" +#include "core.h" #include "screenshot.h" #include "command.h" diff --git a/player/screenshot.c b/player/screenshot.c index 7aaba5f05a..f501a073b7 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -26,7 +26,7 @@ #include "talloc.h" #include "screenshot.h" -#include "mp_core.h" +#include "core.h" #include "command.h" #include "mpvcore/bstr.h" #include "mpvcore/mp_msg.h" diff --git a/player/sub.c b/player/sub.c index 26c8eebdb9..6270d3e69d 100644 --- a/player/sub.c +++ b/player/sub.c @@ -35,7 +35,7 @@ #include "video/mp_image.h" #include "video/decode/dec_video.h" -#include "mp_core.h" +#include "core.h" void uninit_subs(struct demuxer *demuxer) { diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c index 1a0a547dda..3a6eb379fc 100644 --- a/player/timeline/tl_cue.c +++ b/player/timeline/tl_cue.c @@ -24,7 +24,7 @@ #include "talloc.h" -#include "player/mp_core.h" +#include "player/core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c index c7cc09f2b5..85bdf4e57e 100644 --- a/player/timeline/tl_matroska.c +++ b/player/timeline/tl_matroska.c @@ -30,7 +30,7 @@ #include "talloc.h" -#include "player/mp_core.h" +#include "player/core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c index 321a855f47..aa343a3f47 100644 --- a/player/timeline/tl_mpv_edl.c +++ b/player/timeline/tl_mpv_edl.c @@ -24,7 +24,7 @@ #include "talloc.h" -#include "player/mp_core.h" +#include "player/core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" diff --git a/player/video.c b/player/video.c index e98055d2a9..e94a0db71b 100644 --- a/player/video.c +++ b/player/video.c @@ -41,7 +41,7 @@ #include "video/decode/vd.h" #include "video/out/vo.h" -#include "mp_core.h" +#include "core.h" #include "command.h" void update_fps(struct MPContext *mpctx) -- cgit v1.2.3