Mercurial > mplayer.hg
view stream/pvr.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 | a26e50cae389 |
children | 0f1b5b68af32 |
line wrap: on
line source
/* * stream layer for hardware MPEG 1/2/4 encoders a.k.a PVR * (such as WinTV PVR-150/250/350/500 (a.k.a IVTV), pvrusb2 and cx88) * See http://ivtvdriver.org/index.php/Main_Page for more details on the * cards supported by the ivtv driver. * * Copyright (C) 2006 Benjamin Zores * Copyright (C) 2007 Sven Gothel (Channel Navigation) * * 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_PVR_H #define MPLAYER_PVR_H #include "stream.h" #include "tv.h" /** * @brief Get the current station name. * The pointer is valid, till the stream is closed. * @return The stream's station name */ const char *pvr_get_current_stationname (stream_t *stream); /** * @brief Get the current channel name. * The pointer is valid, till the stream is closed. * @return The stream's channel name */ const char *pvr_get_current_channelname (stream_t *stream); /** * @brief Get the current frequency. * @return frequency */ int pvr_get_current_frequency (stream_t *stream); /** * @brief Set the current station using the channel name. * This function will fail, * if the channel does not exist, or the station is not enabled * @return 0 if the station is available, otherwise -1 */ int pvr_set_channel (stream_t *stream, const char *channel); /** * @brief Set the current station using to the last set channel * @return 0 if the station is available, otherwise -1 */ int pvr_set_lastchannel (stream_t *stream); /** * @brief Set the current channel using the frequency. * This function will fail, * if the frequency does not exist, or the station is not enabled * @return 0 if the station is available, otherwise -1 */ int pvr_set_freq (stream_t *stream, int freq); /** * @brief Set the current station while stepping. * This function will fail, * if the station does not exist, or the station is not enabled * @return 0 if the station is available, otherwise -1 */ int pvr_set_channel_step (stream_t *stream, int step); /** * @brief Set the current frequency while stepping * This function will fail, * if the frequency is invalid, i.e. <0 * @return 0 if success, otherwise -1 */ int pvr_force_freq_step (stream_t *stream, int step); #endif /* MPLAYER_PVR_H */