Mercurial > mplayer.hg
view input/joystick.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 | 4129c8cfa742 |
children | 142c53391eb7 |
line wrap: on
line source
#ifndef MPLAYER_JOYSTICK_H #define MPLAYER_JOYSTICK_H #define JOY_BASE (0x100+128) #define JOY_AXIS0_PLUS (JOY_BASE+0) #define JOY_AXIS0_MINUS (JOY_BASE+1) #define JOY_AXIS1_PLUS (JOY_BASE+2) #define JOY_AXIS1_MINUS (JOY_BASE+3) #define JOY_AXIS2_PLUS (JOY_BASE+4) #define JOY_AXIS2_MINUS (JOY_BASE+5) #define JOY_AXIS3_PLUS (JOY_BASE+6) #define JOY_AXIS3_MINUS (JOY_BASE+7) #define JOY_AXIS4_PLUS (JOY_BASE+8) #define JOY_AXIS4_MINUS (JOY_BASE+9) #define JOY_AXIS5_PLUS (JOY_BASE+10) #define JOY_AXIS5_MINUS (JOY_BASE+11) #define JOY_AXIS6_PLUS (JOY_BASE+12) #define JOY_AXIS6_MINUS (JOY_BASE+13) #define JOY_AXIS7_PLUS (JOY_BASE+14) #define JOY_AXIS7_MINUS (JOY_BASE+15) #define JOY_AXIS8_PLUS (JOY_BASE+16) #define JOY_AXIS8_MINUS (JOY_BASE+17) #define JOY_AXIS9_PLUS (JOY_BASE+18) #define JOY_AXIS9_MINUS (JOY_BASE+19) #define JOY_BTN_BASE ((0x100+148)|MP_NO_REPEAT_KEY) #define JOY_BTN0 (JOY_BTN_BASE+0) #define JOY_BTN1 (JOY_BTN_BASE+1) #define JOY_BTN2 (JOY_BTN_BASE+2) #define JOY_BTN3 (JOY_BTN_BASE+3) #define JOY_BTN4 (JOY_BTN_BASE+4) #define JOY_BTN5 (JOY_BTN_BASE+5) #define JOY_BTN6 (JOY_BTN_BASE+6) #define JOY_BTN7 (JOY_BTN_BASE+7) #define JOY_BTN8 (JOY_BTN_BASE+8) #define JOY_BTN9 (JOY_BTN_BASE+9) int mp_input_joystick_init(char* dev); int mp_input_joystick_read(int fd); #endif /* MPLAYER_JOYSTICK_H */