Mercurial > mplayer.hg
annotate liba52/bitstream.c @ 15567:c8ef0513f470
prefer width&height from bitmapinfoheader for h263 streams
fixes playback of some MOV files
(http://mplayerhq.hu/pipermail/mplayer-dev-eng/2004-July/027777.html)
author | henry |
---|---|
date | Wed, 25 May 2005 09:20:50 +0000 |
parents | 07f1e7669772 |
children | f580a7755ac5 |
rev | line source |
---|---|
3394 | 1 /* |
2 * bitstream.c | |
3 * Copyright (C) 2000-2001 Michel Lespinasse <walken@zoy.org> | |
4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> | |
5 * | |
6 * This file is part of a52dec, a free ATSC A-52 stream decoder. | |
7 * See http://liba52.sourceforge.net/ for updates. | |
8 * | |
14991
07f1e7669772
Mark modified files as such to comply more closely with GPL ¡ø2a.
diego
parents:
3570
diff
changeset
|
9 * Modified for use with MPlayer, changes contained in liba52_changes.diff. |
07f1e7669772
Mark modified files as such to comply more closely with GPL ¡ø2a.
diego
parents:
3570
diff
changeset
|
10 * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ |
07f1e7669772
Mark modified files as such to comply more closely with GPL ¡ø2a.
diego
parents:
3570
diff
changeset
|
11 * $Id$ |
07f1e7669772
Mark modified files as such to comply more closely with GPL ¡ø2a.
diego
parents:
3570
diff
changeset
|
12 * |
3394 | 13 * a52dec is free software; you can redistribute it and/or modify |
14 * it under the terms of the GNU General Public License as published by | |
15 * the Free Software Foundation; either version 2 of the License, or | |
16 * (at your option) any later version. | |
17 * | |
18 * a52dec is distributed in the hope that it will be useful, | |
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 * GNU General Public License for more details. | |
22 * | |
23 * You should have received a copy of the GNU General Public License | |
24 * along with this program; if not, write to the Free Software | |
25 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
26 */ | |
27 | |
28 #include "config.h" | |
29 | |
30 #include <inttypes.h> | |
31 | |
32 #include "a52.h" | |
33 #include "a52_internal.h" | |
34 #include "bitstream.h" | |
35 | |
36 #define BUFFER_SIZE 4096 | |
37 | |
3570 | 38 #ifdef ALT_BITSTREAM_READER |
39 int indx=0; | |
40 uint32_t * buffer_start; | |
41 #else | |
3394 | 42 static uint32_t * buffer_start; |
3570 | 43 #endif |
3394 | 44 |
45 uint32_t bits_left; | |
46 uint32_t current_word; | |
47 | |
48 void bitstream_set_ptr (uint8_t * buf) | |
49 { | |
50 int align; | |
51 | |
52 align = (int)buf & 3; | |
53 buffer_start = (uint32_t *) (buf - align); | |
54 bits_left = 0; | |
3570 | 55 #ifdef ALT_BITSTREAM_READER |
56 indx=0; | |
57 #endif | |
3394 | 58 bitstream_get (align * 8); |
59 } | |
60 | |
61 static inline void | |
62 bitstream_fill_current() | |
63 { | |
64 uint32_t tmp; | |
65 | |
66 tmp = *(buffer_start++); | |
67 current_word = swab32 (tmp); | |
68 } | |
69 | |
70 /* | |
71 * The fast paths for _get is in the | |
72 * bitstream.h header file so it can be inlined. | |
73 * | |
74 * The "bottom half" of this routine is suffixed _bh | |
75 * | |
76 * -ah | |
77 */ | |
78 | |
79 uint32_t | |
80 bitstream_get_bh(uint32_t num_bits) | |
81 { | |
82 uint32_t result; | |
83 | |
84 num_bits -= bits_left; | |
85 result = (current_word << (32 - bits_left)) >> (32 - bits_left); | |
86 | |
87 bitstream_fill_current(); | |
88 | |
89 if(num_bits != 0) | |
90 result = (result << num_bits) | (current_word >> (32 - num_bits)); | |
91 | |
92 bits_left = 32 - num_bits; | |
93 | |
94 return result; | |
95 } | |
96 | |
97 int32_t | |
98 bitstream_get_bh_2(uint32_t num_bits) | |
99 { | |
100 int32_t result; | |
101 | |
102 num_bits -= bits_left; | |
103 result = (((int32_t)current_word) << (32 - bits_left)) >> (32 - bits_left); | |
104 | |
105 bitstream_fill_current(); | |
106 | |
107 if(num_bits != 0) | |
108 result = (result << num_bits) | (current_word >> (32 - num_bits)); | |
109 | |
110 bits_left = 32 - num_bits; | |
111 | |
112 return result; | |
113 } |