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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3394
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
1 /*
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
2 * bitstream.c
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
3 * Copyright (C) 2000-2001 Michel Lespinasse <walken@zoy.org>
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
5 *
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
6 * This file is part of a52dec, a free ATSC A-52 stream decoder.
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
7 * See http://liba52.sourceforge.net/ for updates.
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
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
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
13 * a52dec is free software; you can redistribute it and/or modify
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
14 * it under the terms of the GNU General Public License as published by
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
15 * the Free Software Foundation; either version 2 of the License, or
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
16 * (at your option) any later version.
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
17 *
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
18 * a52dec is distributed in the hope that it will be useful,
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
21 * GNU General Public License for more details.
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
22 *
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
23 * You should have received a copy of the GNU General Public License
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
24 * along with this program; if not, write to the Free Software
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
25 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
26 */
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
27
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
28 #include "config.h"
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
29
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
30 #include <inttypes.h>
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
31
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
32 #include "a52.h"
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
33 #include "a52_internal.h"
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
34 #include "bitstream.h"
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
35
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
36 #define BUFFER_SIZE 4096
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
37
3570
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
38 #ifdef ALT_BITSTREAM_READER
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
39 int indx=0;
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
40 uint32_t * buffer_start;
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
41 #else
3394
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
42 static uint32_t * buffer_start;
3570
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
43 #endif
3394
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
44
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
45 uint32_t bits_left;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
46 uint32_t current_word;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
47
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
48 void bitstream_set_ptr (uint8_t * buf)
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
49 {
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
50 int align;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
51
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
52 align = (int)buf & 3;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
53 buffer_start = (uint32_t *) (buf - align);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
54 bits_left = 0;
3570
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
55 #ifdef ALT_BITSTREAM_READER
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
56 indx=0;
c03e0bb35c16 faster (and simpler) bitstream reader (in C)
michael
parents: 3394
diff changeset
57 #endif
3394
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
58 bitstream_get (align * 8);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
59 }
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
60
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
61 static inline void
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
62 bitstream_fill_current()
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
63 {
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
64 uint32_t tmp;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
65
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
66 tmp = *(buffer_start++);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
67 current_word = swab32 (tmp);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
68 }
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
69
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
70 /*
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
71 * The fast paths for _get is in the
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
72 * bitstream.h header file so it can be inlined.
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
73 *
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
74 * The "bottom half" of this routine is suffixed _bh
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
75 *
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
76 * -ah
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
77 */
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
78
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
79 uint32_t
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
80 bitstream_get_bh(uint32_t num_bits)
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
81 {
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
82 uint32_t result;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
83
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
84 num_bits -= bits_left;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
85 result = (current_word << (32 - bits_left)) >> (32 - bits_left);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
86
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
87 bitstream_fill_current();
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
88
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
89 if(num_bits != 0)
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
90 result = (result << num_bits) | (current_word >> (32 - num_bits));
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
91
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
92 bits_left = 32 - num_bits;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
93
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
94 return result;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
95 }
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
96
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
97 int32_t
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
98 bitstream_get_bh_2(uint32_t num_bits)
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
99 {
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
100 int32_t result;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
101
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
102 num_bits -= bits_left;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
103 result = (((int32_t)current_word) << (32 - bits_left)) >> (32 - bits_left);
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
104
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
105 bitstream_fill_current();
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
106
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
107 if(num_bits != 0)
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
108 result = (result << num_bits) | (current_word >> (32 - num_bits));
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
109
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
110 bits_left = 32 - num_bits;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
111
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
112 return result;
35b18ed357c2 imported from liba52 CVS
arpi
parents:
diff changeset
113 }