mirror of
https://github.com/mpv-player/mpv
synced 2024-11-14 22:48:35 +01: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.
174 lines
4.9 KiB
C
174 lines
4.9 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_SUB_H
|
|
#define MPLAYER_SUB_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
typedef struct mp_osd_bbox_s {
|
|
int x1,y1,x2,y2;
|
|
} mp_osd_bbox_t;
|
|
|
|
#define OSDTYPE_OSD 1
|
|
#define OSDTYPE_SUBTITLE 2
|
|
#define OSDTYPE_PROGBAR 3
|
|
#define OSDTYPE_SPU 4
|
|
#define OSDTYPE_DVDNAV 5
|
|
#define OSDTYPE_TELETEXT 6
|
|
|
|
#define OSDFLAG_VISIBLE 1
|
|
#define OSDFLAG_CHANGED 2
|
|
#define OSDFLAG_BBOX 4
|
|
#define OSDFLAG_OLD_BBOX 8
|
|
#define OSDFLAG_FORCE_UPDATE 16
|
|
|
|
#define MAX_UCS 1600
|
|
#define MAX_UCSLINES 16
|
|
|
|
typedef struct mp_osd_obj_s {
|
|
struct mp_osd_obj_s* next;
|
|
unsigned char type;
|
|
unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center
|
|
unsigned short flags;
|
|
int x,y;
|
|
int dxs,dys;
|
|
mp_osd_bbox_t bbox; // bounding box
|
|
mp_osd_bbox_t old_bbox; // the renderer will save bbox here
|
|
union {
|
|
struct {
|
|
void* sub; // value of vo_sub at last update
|
|
int utbl[MAX_UCS+1]; // subtitle text
|
|
int xtbl[MAX_UCSLINES]; // x positions
|
|
int lines; // no. of lines
|
|
} subtitle;
|
|
struct {
|
|
int elems;
|
|
} progbar;
|
|
} params;
|
|
int stride;
|
|
|
|
int allocated;
|
|
unsigned char *alpha_buffer;
|
|
unsigned char *bitmap_buffer;
|
|
} mp_osd_obj_t;
|
|
|
|
struct osd_state {
|
|
struct ass_library *ass_library;
|
|
// flag to signal reinitialization due to ass-related option changes
|
|
bool ass_force_reload;
|
|
char *osd_text;
|
|
struct font_desc *sub_font;
|
|
struct ass_track *ass_track;
|
|
double pts;
|
|
double sub_offset;
|
|
bool ass_track_changed;
|
|
bool vsfilter_aspect;
|
|
};
|
|
|
|
#include "subreader.h"
|
|
|
|
extern subtitle* vo_sub;
|
|
|
|
extern void* vo_osd_teletext_page;
|
|
extern int vo_osd_teletext_half;
|
|
extern int vo_osd_teletext_mode;
|
|
extern int vo_osd_teletext_format;
|
|
|
|
extern int vo_osd_progbar_type;
|
|
extern int vo_osd_progbar_value; // 0..255
|
|
|
|
extern void* vo_spudec;
|
|
extern void* vo_vobsub;
|
|
|
|
#define OSD_PLAY 0x01
|
|
#define OSD_PAUSE 0x02
|
|
#define OSD_STOP 0x03
|
|
#define OSD_REW 0x04
|
|
#define OSD_FFW 0x05
|
|
#define OSD_CLOCK 0x06
|
|
#define OSD_CONTRAST 0x07
|
|
#define OSD_SATURATION 0x08
|
|
#define OSD_VOLUME 0x09
|
|
#define OSD_BRIGHTNESS 0x0A
|
|
#define OSD_HUE 0x0B
|
|
#define OSD_BALANCE 0x0C
|
|
#define OSD_PANSCAN 0x50
|
|
|
|
#define OSD_PB_START 0x10
|
|
#define OSD_PB_0 0x11
|
|
#define OSD_PB_END 0x12
|
|
#define OSD_PB_1 0x13
|
|
|
|
/* now in textform */
|
|
extern char * const sub_osd_names[];
|
|
extern char * const sub_osd_names_short[];
|
|
|
|
extern int sub_unicode;
|
|
extern int sub_utf8;
|
|
|
|
extern char *sub_cp;
|
|
extern int sub_pos;
|
|
extern int sub_width_p;
|
|
extern int sub_alignment;
|
|
extern int sub_visibility;
|
|
extern int sub_bg_color; /* subtitles background color */
|
|
extern int sub_bg_alpha;
|
|
extern int spu_alignment;
|
|
extern int spu_aamode;
|
|
extern float spu_gaussvar;
|
|
|
|
void osd_draw_text(struct osd_state *osd, int dxs, int dys,
|
|
void (*draw_alpha)(void *ctx, int x0, int y0, int w, int h,
|
|
unsigned char* src, unsigned char *srca,
|
|
int stride),
|
|
void *ctx);
|
|
void osd_draw_text_ext(struct osd_state *osd, int dxs, int dys,
|
|
int left_border, int top_border, int right_border,
|
|
int bottom_border, int orig_w, int orig_h,
|
|
void (*draw_alpha)(void *ctx, int x0, int y0, int w,
|
|
int h, unsigned char* src,
|
|
unsigned char *srca,
|
|
int stride),
|
|
void *ctx);
|
|
void osd_remove_text(struct osd_state *osd, int dxs, int dys,
|
|
void (*remove)(int x0, int y0, int w, int h));
|
|
|
|
struct osd_state *osd_create(void);
|
|
void osd_set_text(struct osd_state *osd, const char *text);
|
|
int osd_update(struct osd_state *osd, int dxs, int dys);
|
|
int vo_osd_changed(int new_value);
|
|
int vo_osd_check_range_update(int,int,int,int);
|
|
void osd_free(struct osd_state *osd);
|
|
|
|
extern int vo_osd_changed_flag;
|
|
|
|
unsigned utf8_get_char(const char **str);
|
|
|
|
#ifdef CONFIG_DVDNAV
|
|
#include <inttypes.h>
|
|
void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey);
|
|
#endif
|
|
|
|
|
|
#ifdef IS_OLD_VO
|
|
#define vo_remove_text(...) osd_remove_text(global_osd, __VA_ARGS__)
|
|
#endif
|
|
|
|
#endif /* MPLAYER_SUB_H */
|