Mercurial > libavcodec.hg
annotate rangecoder.c @ 4686:3a891d2379ce libavcodec
AC-3 encoded volume is too high. Revert revision 7160:
bring AC3 encoder output up to input volume level
patch by Bill O'Shaughnessy % bill P oshaughnessy A gmail.com %
+ reg tests update gruntwork by me
Original thread:
date: Nov 21, 2006 11:36PM
subject: [Ffmpeg-devel] Simpler Patch to bring AC3 encoder output up to input level
author | jbr |
---|---|
date | Sun, 18 Mar 2007 23:18:05 +0000 |
parents | b1314834b3a7 |
children | f99e40a7155b |
rev | line source |
---|---|
2334 | 1 /* |
2 * Range coder | |
3 * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at> | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
2334 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
2334 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
2334 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3184
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2967
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2334 | 20 * |
21 */ | |
2967 | 22 |
2334 | 23 /** |
24 * @file rangecoder.c | |
25 * Range coder. | |
26 * based upon | |
27 * "Range encoding: an algorithm for removing redundancy from a digitised | |
28 * message. | |
29 * G. N. N. Martin Presented in March 1979 to the Video & | |
30 * Data Recording Conference, | |
31 * IBM UK Scientific Center held in Southampton July 24-27 1979." | |
32 * | |
33 */ | |
34 | |
35 #include <string.h> | |
36 | |
37 #include "avcodec.h" | |
38 #include "common.h" | |
39 #include "rangecoder.h" | |
40 | |
41 | |
42 void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){ | |
2967 | 43 c->bytestream_start= |
2334 | 44 c->bytestream= buf; |
45 c->bytestream_end= buf + buf_size; | |
46 | |
47 c->low= 0; | |
48 c->range= 0xFF00; | |
49 c->outstanding_count= 0; | |
50 c->outstanding_byte= -1; | |
51 } | |
52 | |
53 void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){ | |
2864
95bac7109ff0
Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents:
2522
diff
changeset
|
54 /* cast to avoid compiler warning */ |
95bac7109ff0
Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents:
2522
diff
changeset
|
55 ff_init_range_encoder(c, (uint8_t *) buf, buf_size); |
2334 | 56 |
57 c->low =(*c->bytestream++)<<8; | |
58 c->low+= *c->bytestream++; | |
59 } | |
60 | |
61 void ff_build_rac_states(RangeCoder *c, int factor, int max_p){ | |
62 const int64_t one= 1LL<<32; | |
63 int64_t p; | |
2522
e25782262d7d
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2334
diff
changeset
|
64 int last_p8, p8, i; |
2334 | 65 |
66 memset(c->zero_state, 0, sizeof(c->zero_state)); | |
67 memset(c-> one_state, 0, sizeof(c-> one_state)); | |
68 | |
69 last_p8= 0; | |
70 p= one/2; | |
71 for(i=0; i<128; i++){ | |
72 p8= (256*p + one/2) >> 32; //FIXME try without the one | |
73 if(p8 <= last_p8) p8= last_p8+1; | |
74 if(last_p8 && last_p8<256 && p8<=max_p) | |
75 c->one_state[last_p8]= p8; | |
2967 | 76 |
2334 | 77 p+= ((one-p)*factor + one/2) >> 32; |
78 last_p8= p8; | |
79 } | |
4410 | 80 |
2334 | 81 for(i=256-max_p; i<=max_p; i++){ |
2967 | 82 if(c->one_state[i]) |
2334 | 83 continue; |
84 | |
85 p= (i*one + 128) >> 8; | |
86 p+= ((one-p)*factor + one/2) >> 32; | |
87 p8= (256*p + one/2) >> 32; //FIXME try without the one | |
88 if(p8 <= i) p8= i+1; | |
89 if(p8 > max_p) p8= max_p; | |
90 c->one_state[ i]= p8; | |
91 } | |
2967 | 92 |
3184
68d7896a08e4
fixing out of array access (only cosmetic, this should never have had a end user vissible effect)
michael
parents:
3036
diff
changeset
|
93 for(i=1; i<255; i++) |
2334 | 94 c->zero_state[i]= 256-c->one_state[256-i]; |
95 } | |
96 | |
97 /** | |
98 * | |
99 * @return the number of bytes written | |
100 */ | |
101 int ff_rac_terminate(RangeCoder *c){ | |
102 c->range=0xFF; | |
103 c->low +=0xFF; | |
104 renorm_encoder(c); | |
105 c->range=0xFF; | |
106 renorm_encoder(c); | |
107 | |
108 assert(c->low == 0); | |
109 assert(c->range >= 0x100); | |
110 | |
111 return c->bytestream - c->bytestream_start; | |
112 } | |
113 | |
114 #if 0 //selftest | |
115 #define SIZE 10240 | |
116 int main(){ | |
117 RangeCoder c; | |
118 uint8_t b[9*SIZE]; | |
119 uint8_t r[9*SIZE]; | |
120 int i; | |
121 uint8_t state[10]= {0}; | |
2967 | 122 |
2334 | 123 ff_init_range_encoder(&c, b, SIZE); |
124 ff_build_rac_states(&c, 0.05*(1LL<<32), 128+64+32+16); | |
2967 | 125 |
2334 | 126 memset(state, 128, sizeof(state)); |
127 | |
128 for(i=0; i<SIZE; i++){ | |
129 r[i]= random()%7; | |
130 } | |
2967 | 131 |
2334 | 132 for(i=0; i<SIZE; i++){ |
133 START_TIMER | |
134 put_rac(&c, state, r[i]&1); | |
135 STOP_TIMER("put_rac") | |
136 } | |
137 | |
138 ff_put_rac_terminate(&c); | |
2967 | 139 |
2334 | 140 ff_init_range_decoder(&c, b, SIZE); |
2967 | 141 |
2334 | 142 memset(state, 128, sizeof(state)); |
2967 | 143 |
2334 | 144 for(i=0; i<SIZE; i++){ |
145 START_TIMER | |
146 if( (r[i]&1) != get_rac(&c, state) ) | |
147 av_log(NULL, AV_LOG_DEBUG, "rac failure at %d\n", i); | |
148 STOP_TIMER("get_rac") | |
149 } | |
2967 | 150 |
2334 | 151 return 0; |
152 } | |
153 #endif |