Mercurial > mplayer.hg
annotate libmpeg2/cpu_state.c @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | 25337a2147e7 |
children |
rev | line source |
---|---|
9857 | 1 /* |
2 * cpu_state.c | |
10298
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
3 * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> |
9857 | 4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> |
5 * | |
6 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. | |
7 * See http://libmpeg2.sourceforge.net/ for updates. | |
8 * | |
9 * mpeg2dec is free software; you can redistribute it and/or modify | |
10 * it under the terms of the GNU General Public License as published by | |
11 * the Free Software Foundation; either version 2 of the License, or | |
12 * (at your option) any later version. | |
13 * | |
14 * mpeg2dec is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 * GNU General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
20 * along with this program; if not, write to the Free Software | |
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
22 */ | |
23 | |
24 #include "config.h" | |
25 | |
26 #include <stdlib.h> | |
27 #include <inttypes.h> | |
28 | |
29 #include "mpeg2.h" | |
12932 | 30 #include "attributes.h" |
9857 | 31 #include "mpeg2_internal.h" |
28290 | 32 #if ARCH_X86 || ARCH_X86_64 |
9857 | 33 #include "mmx.h" |
34 #endif | |
35 | |
36 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL; | |
37 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL; | |
38 | |
28290 | 39 #if ARCH_X86 || ARCH_X86_64 |
9857 | 40 static void state_restore_mmx (cpu_state_t * state) |
41 { | |
42 emms (); | |
43 } | |
44 #endif | |
45 | |
28290 | 46 #if ARCH_PPC |
25980
11181df06389
Do not check for __APPLE_ALTIVEC__, just check for __APPLE_CC__.
diego
parents:
21571
diff
changeset
|
47 #if defined(__APPLE_CC__) /* apple */ |
21571 | 48 #define LI(a,b) "li r" #a "," #b "\n\t" |
49 #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" | |
50 #define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t" | |
51 #define LVX0(a,b,c) "lvx v" #a ",0,r" #c "\n\t" | |
52 #define LVX(a,b,c) "lvx v" #a ",r" #b ",r" #c "\n\t" | |
27572 | 53 #else /* gnu */ |
21526 | 54 #define LI(a,b) "li " #a "," #b "\n\t" |
55 #define STVX0(a,b,c) "stvx " #a ",0," #c "\n\t" | |
56 #define STVX(a,b,c) "stvx " #a "," #b "," #c "\n\t" | |
57 #define LVX0(a,b,c) "lvx " #a ",0," #c "\n\t" | |
58 #define LVX(a,b,c) "lvx " #a "," #b "," #c "\n\t" | |
10298
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
59 #endif |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
60 |
9857 | 61 static void state_save_altivec (cpu_state_t * state) |
62 { | |
10298
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
63 asm (LI (9, 16) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
64 STVX0 (20, 0, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
65 LI (11, 32) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
66 STVX (21, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
67 LI (9, 48) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
68 STVX (22, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
69 LI (11, 64) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
70 STVX (23, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
71 LI (9, 80) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
72 STVX (24, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
73 LI (11, 96) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
74 STVX (25, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
75 LI (9, 112) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
76 STVX (26, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
77 LI (11, 128) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
78 STVX (27, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
79 LI (9, 144) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
80 STVX (28, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
81 LI (11, 160) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
82 STVX (29, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
83 LI (9, 176) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
84 STVX (30, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
85 STVX (31, 9, 3)); |
9857 | 86 } |
87 | |
88 static void state_restore_altivec (cpu_state_t * state) | |
89 { | |
10298
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
90 asm (LI (9, 16) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
91 LVX0 (20, 0, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
92 LI (11, 32) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
93 LVX (21, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
94 LI (9, 48) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
95 LVX (22, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
96 LI (11, 64) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
97 LVX (23, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
98 LI (9, 80) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
99 LVX (24, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
100 LI (11, 96) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
101 LVX (25, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
102 LI (9, 112) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
103 LVX (26, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
104 LI (11, 128) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
105 LVX (27, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
106 LI (9, 144) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
107 LVX (28, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
108 LI (11, 160) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
109 LVX (29, 9, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
110 LI (9, 176) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
111 LVX (30, 11, 3) |
4053e9c22c88
apple and gnu style support at the same time (ok, choosen at compile time) -- now altivec works under osx too -- bug noted by Steven Schultz
alex
parents:
9857
diff
changeset
|
112 LVX (31, 9, 3)); |
9857 | 113 } |
114 #endif | |
115 | |
116 void mpeg2_cpu_state_init (uint32_t accel) | |
117 { | |
28290 | 118 #if ARCH_X86 || ARCH_X86_64 |
9857 | 119 if (accel & MPEG2_ACCEL_X86_MMX) { |
120 mpeg2_cpu_state_restore = state_restore_mmx; | |
121 } | |
122 #endif | |
28290 | 123 #if ARCH_PPC |
9857 | 124 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { |
125 mpeg2_cpu_state_save = state_save_altivec; | |
126 mpeg2_cpu_state_restore = state_restore_altivec; | |
127 } | |
128 #endif | |
129 } |