mirror of
https://github.com/mpv-player/mpv
synced 2024-07-31 16:29:58 +02:00
06e3dc8eba
Timeline handling converted the pts values from demuxed subtitles to timeline scale. Change the code to do most subtitle handling in original subtitle source pts, and instead convert current playback timeline pts to those units when deciding which subtitle to show. The main functionality changes are that now demuxed subtitles which overlap chapter boundaries are handled correctly (at least for libass subtitles), and external subtitles are assumed to use same pts scale as current source (this needs improvements later). Before, a video subtitle that had a duration continuing past the end of the chapter would continue to be shown for the original duration, even if the chapter ended and playback switched to a position in the source where the subtitle shouldn't exist. Now, the subtitle will correctly end. Before, external subtitle files were interpreted as specifying pts values in timeline scale. Now, they're interpreted as specifying pts values in source file time scale, for _every_ source file. This is probably more likely to be what the user wants for the "main" source file in case there is one, but almost certainly not quite right for multiple source files where the same subs could be shown over different scenes. If the user wants them to match some main source file, it's probably still better to have incorrect extra subs for video from some files than to have every subtitle appearing at the wrong time. The new code makes it easier to change the interpretation of the subtitle times, and some configurability should be added in the future.
267 lines
8.7 KiB
C
267 lines
8.7 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_MP_CORE_H
|
|
#define MPLAYER_MP_CORE_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "options.h"
|
|
#include "mixer.h"
|
|
#include "sub/subreader.h"
|
|
#include "sub/find_subfiles.h"
|
|
|
|
// definitions used internally by the core player code
|
|
|
|
#define INITIALIZED_VO 1
|
|
#define INITIALIZED_AO 2
|
|
|
|
#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_SUB 4096
|
|
#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,
|
|
};
|
|
|
|
enum exit_reason {
|
|
EXIT_NONE,
|
|
EXIT_QUIT,
|
|
EXIT_EOF,
|
|
EXIT_ERROR
|
|
};
|
|
|
|
struct content_source {
|
|
struct stream *stream;
|
|
struct demuxer *demuxer;
|
|
};
|
|
|
|
struct timeline_part {
|
|
double start;
|
|
double source_start;
|
|
struct content_source *source;
|
|
};
|
|
|
|
struct chapter {
|
|
double start;
|
|
char *name;
|
|
};
|
|
|
|
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;
|
|
struct sub_data *subdata; // current sub_data style subtitles if any
|
|
// last sub_data style sub line if any, used by log_sub() only
|
|
struct subtitle *vo_sub_last;
|
|
|
|
bool add_osd_seek_info;
|
|
// if nonzero, hide current OSD contents when GetTimerMS() reaches this
|
|
unsigned int osd_show_percentage_until;
|
|
unsigned int osd_visible;
|
|
|
|
int osd_function;
|
|
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 content_source *sources;
|
|
int num_sources;
|
|
struct timeline_part *timeline;
|
|
int num_timeline_parts;
|
|
int timeline_part;
|
|
struct chapter *chapters;
|
|
int num_chapters;
|
|
double video_offset;
|
|
|
|
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 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;
|
|
/* 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
|
|
float 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.
|
|
float last_vo_flip_duration;
|
|
// How much video timing has been changed to make it match the audio
|
|
// timeline. Used for status line information only.
|
|
double total_avsync_change;
|
|
// 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 video frame currently visible on screen
|
|
* (or at least queued to be flipped by VO) */
|
|
double video_pts;
|
|
double last_seek_pts;
|
|
|
|
// used to prevent hanging in some error cases
|
|
unsigned int start_timestamp;
|
|
|
|
// 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
|
|
struct seek_params {
|
|
enum seek_type {
|
|
MPSEEK_NONE, MPSEEK_RELATIVE, MPSEEK_ABSOLUTE, MPSEEK_FACTOR
|
|
} 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;
|
|
|
|
float begin_skip; ///< start time of the current skip while on edlout 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 sub_counts[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 *set_of_ass_tracks[MAX_SUBTITLE_FILES];
|
|
sub_data* set_of_subtitles[MAX_SUBTITLE_FILES];
|
|
bool track_was_native_ass[MAX_SUBTITLE_FILES];
|
|
struct ass_library *ass_library;
|
|
|
|
int file_format;
|
|
|
|
int last_dvb_step;
|
|
int dvbin_reopen;
|
|
|
|
int paused;
|
|
// step this many frames, then pause
|
|
int step_frames;
|
|
|
|
bool status_printed;
|
|
int paused_cache_fill;
|
|
|
|
// 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;
|
|
|
|
#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;
|
|
|
|
|
|
// should not be global
|
|
extern FILE *edl_fd;
|
|
// These appear in options list
|
|
extern int forced_subs_only;
|
|
|
|
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, enum exit_reason how, int rc);
|
|
void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr);
|
|
int reinit_video_chain(struct MPContext *mpctx);
|
|
void pause_player(struct MPContext *mpctx);
|
|
void unpause_player(struct MPContext *mpctx);
|
|
void add_step_frame(struct MPContext *mpctx);
|
|
void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount,
|
|
int exact);
|
|
int seek_chapter(struct MPContext *mpctx, int chapter, double *seek_pts);
|
|
double get_time_length(struct MPContext *mpctx);
|
|
double get_current_time(struct MPContext *mpctx);
|
|
int get_percent_pos(struct MPContext *mpctx);
|
|
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 update_subtitles(struct MPContext *mpctx, double refpts, bool reset);
|
|
|
|
|
|
// timeline/tl_matroska.c
|
|
void build_ordered_chapter_timeline(struct MPContext *mpctx);
|
|
// timeline/tl_edl.c
|
|
void build_edl_timeline(struct MPContext *mpctx);
|
|
|
|
#endif /* MPLAYER_MP_CORE_H */
|