Mercurial > mplayer.hg
view drivers/mga_vid.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 | 03f571138664 |
children | 29dc134ae9b3 |
line wrap: on
line source
/* * Matrox MGA G200/G400 YUV Video Interface module Version 0.1.0 * BES == Back End Scaler * * Copyright (C) 1999 Aaron Holtzman * * This file is part of mga_vid. * * mga_vid 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. * * mga_vid 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 mga_vid; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MGA_VID_H #define MGA_VID_H typedef struct mga_vid_config_s { uint16_t version; uint16_t card_type; uint32_t ram_size; uint32_t src_width; uint32_t src_height; uint32_t dest_width; uint32_t dest_height; uint32_t x_org; uint32_t y_org; uint8_t colkey_on; uint8_t colkey_red; uint8_t colkey_green; uint8_t colkey_blue; uint32_t format; uint32_t frame_size; uint32_t num_frames; uint32_t capabilities; } mga_vid_config_t; /* supported FOURCCs */ #define MGA_VID_FORMAT_YV12 0x32315659 #define MGA_VID_FORMAT_IYUV (('I'<<24)|('Y'<<16)|('U'<<8)|'V') #define MGA_VID_FORMAT_I420 (('I'<<24)|('4'<<16)|('2'<<8)|'0') #define MGA_VID_FORMAT_YUY2 (('Y'<<24)|('U'<<16)|('Y'<<8)|'2') #define MGA_VID_FORMAT_UYVY (('U'<<24)|('Y'<<16)|('V'<<8)|'Y') /* ioctl commands */ #define MGA_VID_GET_VERSION _IOR ('J', 1, uint32_t) #define MGA_VID_CONFIG _IOWR('J', 2, mga_vid_config_t) #define MGA_VID_ON _IO ('J', 3) #define MGA_VID_OFF _IO ('J', 4) #define MGA_VID_FSEL _IOW ('J', 5, uint32_t) #define MGA_VID_GET_LUMA _IOR ('J', 6, uint32_t) #define MGA_VID_SET_LUMA _IOW ('J', 7, uint32_t) /* card identifiers */ #define MGA_G200 0x1234 #define MGA_G400 0x5678 // currently unused, G450 are mapped to MGA_G400 // #define MGA_G450 0x9ABC #define MGA_G550 0xDEF0 /* version of the mga_vid_config struct */ #define MGA_VID_VERSION 0x0202 #endif /* MGA_VID_H */