mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 10:02:17 +00:00
89a5714893
Remove subtitle selection code setting osd->ass_track directly and
vf_ass/vf_vo code rendering the track directly with libass. Instead,
do track selection and rendering with dec_sub.c functions.
Before, mpctx->set_of_ass_tracks[] contained bare libass tracks
generated from external subtitle files. For use with dec_sub.c, it now
contains struct sh_sub instances with decoder already initialized.
This commit breaks the sub_step command ('g' and 'y' keys) for
libass-rendered subtitles. It could be fixed, but it's so useless -
especially as with the existing implementation there's no practical
way to get subtitle delay back to normal after using it - that I
didn't bother.
Conflicts:
command.c
mp_core.h
mplayer.c
77 lines
2.0 KiB
C
77 lines
2.0 KiB
C
#include <stddef.h>
|
|
|
|
#include "config.h"
|
|
#include "defaultopts.h"
|
|
#include "options.h"
|
|
|
|
void set_default_mplayer_options(struct MPOpts *opts)
|
|
{
|
|
*opts = (const struct MPOpts){
|
|
.audio_driver_list = NULL,
|
|
.video_driver_list = NULL,
|
|
.fixed_vo = 1,
|
|
.softvol = 1,
|
|
.softvol_max = 200,
|
|
.ao_buffersize = -1,
|
|
.vo_wintitle = "mplayer - ${filename}",
|
|
.monitor_pixel_aspect = 1.0,
|
|
.vo_panscanrange = 1.0,
|
|
.cursor_autohide_delay = 1000,
|
|
.vo_gamma_gamma = 1000,
|
|
.vo_gamma_brightness = 1000,
|
|
.vo_gamma_contrast = 1000,
|
|
.vo_gamma_saturation = 1000,
|
|
.vo_gamma_hue = 1000,
|
|
.osd_level = 1,
|
|
.osd_duration = 1000,
|
|
.loop_times = -1,
|
|
.ordered_chapters = 1,
|
|
.chapter_merge_threshold = 100,
|
|
.stream_cache_min_percent = 20.0,
|
|
.stream_cache_seek_min_percent = 50.0,
|
|
.chapterrange = {-1, -1},
|
|
.edition_id = -1,
|
|
.user_correct_pts = -1,
|
|
.initial_audio_sync = 1,
|
|
.term_osd = 2,
|
|
.consolecontrols = 1,
|
|
.doubleclick_time = 300,
|
|
.audio_id = -1,
|
|
.video_id = -1,
|
|
.sub_id = -1,
|
|
.sub_visibility = 1,
|
|
.extension_parsing = 1,
|
|
.audio_output_channels = 2,
|
|
.audio_output_format = -1, // AF_FORMAT_UNKNOWN
|
|
.playback_speed = 1.,
|
|
.drc_level = 1.,
|
|
.movie_aspect = -1.,
|
|
.flip = -1,
|
|
.vd_use_slices = 1,
|
|
.sub_auto = 1,
|
|
#ifdef CONFIG_ASS
|
|
.ass_enabled = 1,
|
|
#endif
|
|
.ass_font_scale = 1,
|
|
.ass_vsfilter_aspect_compat = 1,
|
|
.use_embedded_fonts = 1,
|
|
|
|
.lavc_param = {
|
|
.workaround_bugs = 1, // autodetect
|
|
.error_concealment = 3,
|
|
},
|
|
.input = {
|
|
.key_fifo_size = 7,
|
|
.ar_delay = 100,
|
|
.ar_rate = 8,
|
|
.use_joystick = 1,
|
|
.use_lirc = 1,
|
|
.use_lircc = 1,
|
|
#ifdef CONFIG_APPLE_REMOTE
|
|
.use_ar = 1,
|
|
#endif
|
|
.default_bindings = 1,
|
|
}
|
|
};
|
|
}
|