Mercurial > mplayer.hg
view libmenu/menu.h @ 27518:e54c9b7eb0d8
Revert bad changes to SSA/ASS subtitle packet format
The following commits are reverted partially or completely:
"a valid ASS line contains 9 ',' before actual text"
"demux_mkv: output correctly formated ASS packets"
"libass: add a new ass_process_data() to process demuxed subtitle packets"
These commits converted the internal representation of SSA/ASS
subtitle packets from the format used by Matroska to a custom format
where each packet has contents exactly matching one line in complete
SSA script files. AFAIK no files natively use such a format for muxed
subtitles. The stated reason for this change was to use a format that
could in principle be muxed into a maximal number of containers. SSA
subtitles do not have an implicit duration so both start time and
duration or end time need to be specified explicitly; the new format
moved timing information inside the codec packet data so it could be
muxed without modification into containers that can represent only
start time at the container level. However such a change is wrong from
the viewpoint of program architecture. Timing information belongs to
the demuxer level, but these commits moved not only the duration but
also the authoritative value of the start time to inside the codec
data. Additionally the new format lost the value of the Matroska
ReadOrder field which is used by MPlayer.
This commit changes the internal packet format back to that used by
Matroska and makes the internal Matroska demuxer output that format
again. Libavformat still outputs the "new" format; it could be
converted back to the Matroska format in demux_lavf.c, but I'm not
adding that code at least yet. The current lavf code has similar
problems as the reverted code in MPlayer, and it also currently fails
to provide any way to access the value of the ReadOrder field. I hope
that the lavf side will be improved; if it isn't conversion can be
added later. For now I'll make MPlayer default to the internal Matroska
demuxer instead of the lavf one in a separate commit.
author | uau |
---|---|
date | Mon, 08 Sep 2008 21:26:22 +0000 |
parents | 4ebf3c3f2bf6 |
children | f8b6c7045cf8 |
line wrap: on
line source
#ifndef MPLAYER_MENU_H #define MPLAYER_MENU_H #include "m_struct.h" #include "libmpcodecs/mp_image.h" struct menu_priv_s; typedef struct menu_s menu_t; typedef struct menu_def_st menu_def_t; struct m_struct_st; struct menu_s { struct MPContext *ctx; void (*draw)(menu_t* menu,mp_image_t* mpi); void (*read_cmd)(menu_t* menu,int cmd); int (*read_key)(menu_t* menu,int cmd); void (*close)(menu_t* menu); struct m_struct_st* priv_st; struct menu_priv_s* priv; int show; // Draw it ? int cl; // Close request (user sent a close cmd or menu_t* parent; menu_def_t *type; }; typedef struct menu_info_s { const char *info; const char *name; const char *author; const char *comment; struct m_struct_st priv_st; // Config struct definition // cfg is a config struct as defined in cfg_st, it may be used as a priv struct // cfg is filled from the attributs found in the cfg file // the args param hold the content of the balise in the cfg file (if any) int (*open)(menu_t* menu, char* args); } menu_info_t; #define MENU_CMD_UP 0 #define MENU_CMD_DOWN 1 #define MENU_CMD_OK 2 #define MENU_CMD_CANCEL 3 #define MENU_CMD_LEFT 4 #define MENU_CMD_RIGHT 5 #define MENU_CMD_ACTION 6 #define MENU_CMD_HOME 7 #define MENU_CMD_END 8 #define MENU_CMD_PAGE_UP 9 #define MENU_CMD_PAGE_DOWN 10 #define MENU_CMD_CLICK 11 /// Global init/uninit int menu_init(struct MPContext *mpctx, char* cfg_file); void menu_uninit(void); /// Open a menu defined in the config file menu_t* menu_open(char *name); void menu_draw(menu_t* menu,mp_image_t* mpi); void menu_read_cmd(menu_t* menu,int cmd); void menu_close(menu_t* menu); int menu_read_key(menu_t* menu,int cmd); //// Default implementation int menu_dflt_read_key(menu_t* menu,int cmd); /// Receive mouse position events. void menu_update_mouse_pos(double x, double y); /////////// Helpers #define MENU_TEXT_TOP (1<<0) #define MENU_TEXT_VCENTER (1<<1) #define MENU_TEXT_BOT (1<<2) #define MENU_TEXT_VMASK (MENU_TEXT_TOP|MENU_TEXT_VCENTER|MENU_TEXT_BOT) #define MENU_TEXT_LEFT (1<<3) #define MENU_TEXT_HCENTER (1<<4) #define MENU_TEXT_RIGHT (1<<5) #define MENU_TEXT_HMASK (MENU_TEXT_LEFT|MENU_TEXT_HCENTER|MENU_TEXT_RIGHT) #define MENU_TEXT_CENTER (MENU_TEXT_VCENTER|MENU_TEXT_HCENTER) void menu_draw_text(mp_image_t* mpi, char* txt, int x, int y); int menu_text_length(char* txt); int menu_text_num_lines(char* txt, int max_width); void menu_text_size(char* txt,int max_width, int vspace, int warp, int* _w, int* _h); void menu_draw_text_full(mp_image_t* mpi,char* txt, int x, int y,int w, int h, int vspace, int warp, int align, int anchor); void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h); #endif /* MPLAYER_MENU_H */