Mercurial > mplayer.hg
view liba52/a52_internal.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 | 0783dd397f74 |
children | 25337a2147e7 |
line wrap: on
line source
/* * a52_internal.h * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org> * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * * This file is part of a52dec, a free ATSC A-52 stream decoder. * See http://liba52.sourceforge.net/ for updates. * * Modified for use with MPlayer, changes contained in liba52_changes.diff. * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ * $Id$ * * a52dec 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. * * a52dec 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 this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ typedef struct { uint8_t bai; /* fine SNR offset, fast gain */ uint8_t deltbae; /* delta bit allocation exists */ int8_t deltba[50]; /* per-band delta bit allocation */ } ba_t; typedef struct { uint8_t exp[256]; /* decoded channel exponents */ int8_t bap[256]; /* derived channel bit allocation */ } expbap_t; struct a52_state_s { uint8_t fscod; /* sample rate */ uint8_t halfrate; /* halfrate factor */ uint8_t acmod; /* coded channels */ uint8_t lfeon; /* coded lfe channel */ sample_t clev; /* centre channel mix level */ sample_t slev; /* surround channels mix level */ int output; /* type of output */ sample_t level; /* output level */ sample_t bias; /* output bias */ int dynrnge; /* apply dynamic range */ sample_t dynrng; /* dynamic range */ void * dynrngdata; /* dynamic range callback funtion and data */ sample_t (* dynrngcall) (sample_t range, void * dynrngdata); uint8_t chincpl; /* channel coupled */ uint8_t phsflginu; /* phase flags in use (stereo only) */ uint8_t cplstrtmant; /* coupling channel start mantissa */ uint8_t cplendmant; /* coupling channel end mantissa */ uint32_t cplbndstrc; /* coupling band structure */ sample_t cplco[5][18]; /* coupling coordinates */ /* derived information */ uint8_t cplstrtbnd; /* coupling start band (for bit allocation) */ uint8_t ncplbnd; /* number of coupling bands */ uint8_t rematflg; /* stereo rematrixing */ uint8_t endmant[5]; /* channel end mantissa */ uint16_t bai; /* bit allocation information */ uint32_t * buffer_start; uint16_t lfsr_state; /* dither state */ uint32_t bits_left; uint32_t current_word; uint8_t csnroffst; /* coarse SNR offset */ ba_t cplba; /* coupling bit allocation parameters */ ba_t ba[5]; /* channel bit allocation parameters */ ba_t lfeba; /* lfe bit allocation parameters */ uint8_t cplfleak; /* coupling fast leak init */ uint8_t cplsleak; /* coupling slow leak init */ expbap_t cpl_expbap; expbap_t fbw_expbap[5]; expbap_t lfe_expbap; sample_t * samples; int downmixed; }; #define LEVEL_PLUS6DB 2.0 #define LEVEL_PLUS3DB 1.4142135623730951 #define LEVEL_3DB 0.7071067811865476 #define LEVEL_45DB 0.5946035575013605 #define LEVEL_6DB 0.5 #define EXP_REUSE (0) #define EXP_D15 (1) #define EXP_D25 (2) #define EXP_D45 (3) #define DELTA_BIT_REUSE (0) #define DELTA_BIT_NEW (1) #define DELTA_BIT_NONE (2) #define DELTA_BIT_RESERVED (3) #ifdef ARCH_X86_64 # define REG_a "rax" # define REG_d "rdx" # define REG_S "rsi" # define REG_D "rdi" # define REG_BP "rbp" #else # define REG_a "eax" # define REG_d "edx" # define REG_S "esi" # define REG_D "edi" # define REG_BP "ebp" #endif void a52_bit_allocate (a52_state_t * state, ba_t * ba, int bndstart, int start, int end, int fastleak, int slowleak, expbap_t * expbap); int a52_downmix_init (int input, int flags, sample_t * level, sample_t clev, sample_t slev); void downmix_accel_init(uint32_t mm_accel); int a52_downmix_coeff (sample_t * coeff, int acmod, int output, sample_t level, sample_t clev, sample_t slev); extern void (*a52_downmix) (sample_t * samples, int acmod, int output, sample_t bias, sample_t clev, sample_t slev); extern void (*a52_upmix) (sample_t * samples, int acmod, int output); void a52_imdct_init (uint32_t mm_accel); void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias); extern void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias); void imdct_do_512 (sample_t * data, sample_t * delay, sample_t bias);