Mercurial > mplayer.hg
annotate libfaad2/is.c @ 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 | 59b6fa5b4201 |
children | e83eef58b30a |
rev | line source |
---|---|
10725 | 1 /* |
2 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding | |
12527 | 3 ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com |
10725 | 4 ** |
5 ** This program is free software; you can redistribute it and/or modify | |
6 ** it under the terms of the GNU General Public License as published by | |
7 ** the Free Software Foundation; either version 2 of the License, or | |
8 ** (at your option) any later version. | |
9 ** | |
10 ** This program is distributed in the hope that it will be useful, | |
11 ** but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 ** GNU General Public License for more details. | |
14 ** | |
15 ** You should have received a copy of the GNU General Public License | |
16 ** along with this program; if not, write to the Free Software | |
17 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
18 ** | |
19 ** Any non-GPL usage of this software or parts of this software is strictly | |
20 ** forbidden. | |
21 ** | |
22 ** Commercial non-GPL licensing of this software is possible. | |
23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | |
24 ** | |
18141 | 25 ** $Id: is.c,v 1.24 2004/09/04 14:56:28 menno Exp $ |
10725 | 26 **/ |
27 | |
28 #include "common.h" | |
29 #include "structs.h" | |
30 | |
31 #include "syntax.h" | |
32 #include "is.h" | |
33 | |
34 #ifdef FIXED_POINT | |
35 static real_t pow05_table[] = { | |
36 COEF_CONST(1.68179283050743), /* 0.5^(-3/4) */ | |
37 COEF_CONST(1.41421356237310), /* 0.5^(-2/4) */ | |
38 COEF_CONST(1.18920711500272), /* 0.5^(-1/4) */ | |
39 COEF_CONST(1.0), /* 0.5^( 0/4) */ | |
40 COEF_CONST(0.84089641525371), /* 0.5^(+1/4) */ | |
41 COEF_CONST(0.70710678118655), /* 0.5^(+2/4) */ | |
42 COEF_CONST(0.59460355750136) /* 0.5^(+3/4) */ | |
43 }; | |
44 #endif | |
45 | |
46 void is_decode(ic_stream *ics, ic_stream *icsr, real_t *l_spec, real_t *r_spec, | |
47 uint16_t frame_len) | |
48 { | |
49 uint8_t g, sfb, b; | |
12527 | 50 uint16_t i; |
10725 | 51 #ifndef FIXED_POINT |
52 real_t scale; | |
53 #else | |
54 int32_t exp, frac; | |
55 #endif | |
56 | |
57 uint16_t nshort = frame_len/8; | |
58 uint8_t group = 0; | |
59 | |
60 for (g = 0; g < icsr->num_window_groups; g++) | |
61 { | |
62 /* Do intensity stereo decoding */ | |
63 for (b = 0; b < icsr->window_group_length[g]; b++) | |
64 { | |
65 for (sfb = 0; sfb < icsr->max_sfb; sfb++) | |
66 { | |
67 if (is_intensity(icsr, g, sfb)) | |
68 { | |
13453
6d50ef45a058
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
diego
parents:
12625
diff
changeset
|
69 #ifdef MAIN_DEC |
10725 | 70 /* For scalefactor bands coded in intensity stereo the |
71 corresponding predictors in the right channel are | |
72 switched to "off". | |
73 */ | |
74 ics->pred.prediction_used[sfb] = 0; | |
75 icsr->pred.prediction_used[sfb] = 0; | |
13453
6d50ef45a058
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
diego
parents:
12625
diff
changeset
|
76 #endif |
10725 | 77 |
78 #ifndef FIXED_POINT | |
79 scale = (real_t)pow(0.5, (0.25*icsr->scale_factors[g][sfb])); | |
80 #else | |
12527 | 81 exp = icsr->scale_factors[g][sfb] >> 2; |
82 frac = icsr->scale_factors[g][sfb] & 3; | |
10725 | 83 #endif |
84 | |
85 /* Scale from left to right channel, | |
86 do not touch left channel */ | |
87 for (i = icsr->swb_offset[sfb]; i < icsr->swb_offset[sfb+1]; i++) | |
88 { | |
89 #ifndef FIXED_POINT | |
12527 | 90 r_spec[(group*nshort)+i] = MUL_R(l_spec[(group*nshort)+i], scale); |
10725 | 91 #else |
92 if (exp < 0) | |
12527 | 93 r_spec[(group*nshort)+i] = l_spec[(group*nshort)+i] << -exp; |
10725 | 94 else |
12527 | 95 r_spec[(group*nshort)+i] = l_spec[(group*nshort)+i] >> exp; |
96 r_spec[(group*nshort)+i] = MUL_C(r_spec[(group*nshort)+i], pow05_table[frac + 3]); | |
10725 | 97 #endif |
98 if (is_intensity(icsr, g, sfb) != invert_intensity(ics, g, sfb)) | |
12527 | 99 r_spec[(group*nshort)+i] = -r_spec[(group*nshort)+i]; |
10725 | 100 } |
101 } | |
102 } | |
103 group++; | |
104 } | |
105 } | |
106 } |