annotate vorbis.c @ 10244:ae97152542d1 libavcodec

Add checks for per-packet mode indexes and per-header mode mapping indexes. 12_vorbis_mode_indexes.patch by chrome maybe exploitable
author michael
date Wed, 23 Sep 2009 12:09:33 +0000
parents 8078ecd2fe4c
children d157ccc267e7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
1 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8306
diff changeset
2 * @file libavcodec/vorbis.c
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
3 * Common code for Vorbis I encoder and decoder
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
4 * @author Denes Balatoni ( dbalatoni programozo hu )
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
5
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
6 * This file is part of FFmpeg.
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
7 *
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
12 *
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
16 * Lesser General Public License for more details.
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
17 *
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
21 */
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
22
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
23 #undef V_DEBUG
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
24 //#define V_DEBUG
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
25
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
26 #define ALT_BITSTREAM_READER_LE
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
27 #include "avcodec.h"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 8718
diff changeset
28 #include "get_bits.h"
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
29
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
30 #include "vorbis.h"
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
31
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
32
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
33 /* Helper functions */
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
34
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
35 unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) { // x^(1/n)
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
36 unsigned int ret=0, i, j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
37
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
38 do {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
39 ++ret;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
40 for(i=0,j=ret;i<n-1;i++) j*=ret;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
41 } while (j<=x);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
42
6750
c93570aeb3eb Remove unnecessary parentheses from return calls.
diego
parents: 6340
diff changeset
43 return ret - 1;
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
44 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
45
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
46 // Generate vlc codes from vorbis huffman code lengths
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
47
9934
ff96ee73b08b Add extra validation checks to ff_vorbis_len2vlc.
reimar
parents: 9428
diff changeset
48 // the two bits[p] > 32 checks should be redundant, all calling code should
ff96ee73b08b Add extra validation checks to ff_vorbis_len2vlc.
reimar
parents: 9428
diff changeset
49 // already ensure that, but since it allows overwriting the stack it seems
ff96ee73b08b Add extra validation checks to ff_vorbis_len2vlc.
reimar
parents: 9428
diff changeset
50 // reasonable to check redundantly.
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
51 int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
52 uint_fast32_t exit_at_level[33]={404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
53 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
54
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
55 uint_fast8_t i,j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
56 uint_fast32_t code,p;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
57
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
58 #ifdef V_DEBUG
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
59 GetBitContext gb;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
60 #endif
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
61
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
62 for(p=0;(bits[p]==0) && (p<num);++p);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
63 if (p==num) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
64 // av_log(vc->avccontext, AV_LOG_INFO, "An empty codebook. Heh?! \n");
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
65 return 0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
66 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
67
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
68 codes[p]=0;
9934
ff96ee73b08b Add extra validation checks to ff_vorbis_len2vlc.
reimar
parents: 9428
diff changeset
69 if (bits[p] > 32) return 1;
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
70 for(i=0;i<bits[p];++i) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
71 exit_at_level[i+1]=1<<i;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
72 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
73
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
74 #ifdef V_DEBUG
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
75 av_log(NULL, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
76 init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
77 for(i=0;i<bits[p];++i) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
78 av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
79 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
80 av_log(NULL, AV_LOG_INFO, "\n");
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
81 #endif
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
82
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
83 ++p;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
84
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
85 for(;p<num;++p) {
9934
ff96ee73b08b Add extra validation checks to ff_vorbis_len2vlc.
reimar
parents: 9428
diff changeset
86 if (bits[p] > 32) return 1;
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
87 if (bits[p]==0) continue;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
88 // find corresponding exit(node which the tree can grow further from)
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
89 for(i=bits[p];i>0;--i) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
90 if (exit_at_level[i]) break;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
91 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
92 if (!i) return 1; // overspecified tree
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
93 code=exit_at_level[i];
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
94 exit_at_level[i]=0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
95 // construct code (append 0s to end) and introduce new exits
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
96 for(j=i+1;j<=bits[p];++j) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
97 exit_at_level[j]=code+(1<<(j-1));
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
98 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
99 codes[p]=code;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
100
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
101 #ifdef V_DEBUG
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
102 av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
103 init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
104 for(i=0;i<bits[p];++i) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
105 av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
106 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
107 av_log(NULL, AV_LOG_INFO, "\n");
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
108 #endif
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
109
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
110 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
111
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
112 //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC)
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
113 for (p=1; p<33; p++)
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
114 if (exit_at_level[p]) return 1;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
115
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
116 return 0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
117 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
118
8306
ddecbc18fe94 Rename all vorbis encoder related typedefs to not use _t for POSIX compatibility
ods15
parents: 6750
diff changeset
119 void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) {
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
120 int i;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
121 list[0].sort = 0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
122 list[1].sort = 1;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
123 for (i = 2; i < values; i++) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
124 int j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
125 list[i].low = 0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
126 list[i].high = 1;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
127 list[i].sort = i;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
128 for (j = 2; j < i; j++) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
129 int tmp = list[j].x;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
130 if (tmp < list[i].x) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
131 if (tmp > list[list[i].low].x) list[i].low = j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
132 } else {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
133 if (tmp < list[list[i].high].x) list[i].high = j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
134 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
135 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
136 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
137 for (i = 0; i < values - 1; i++) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
138 int j;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
139 for (j = i + 1; j < values; j++) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
140 if (list[list[i].sort].x > list[list[j].sort].x) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
141 int tmp = list[i].sort;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
142 list[i].sort = list[j].sort;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
143 list[j].sort = tmp;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
144 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
145 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
146 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
147 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
148
10102
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
149 static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1, intptr_t sy, int ady, int adx, float * buf) {
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
150 int err = -adx;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
151 x -= x1-1;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
152 buf += x1-1;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
153 while (++x < 0) {
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
154 err += ady;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
155 if (err >= 0) {
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
156 err += ady - adx;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
157 y += sy;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
158 buf[x++] = ff_vorbis_floor1_inverse_db_table[y];
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
159 }
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
160 buf[x] = ff_vorbis_floor1_inverse_db_table[y];
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
161 }
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
162 if (x <= 0) {
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
163 if (err + ady >= 0)
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
164 y += sy;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
165 buf[x] = ff_vorbis_floor1_inverse_db_table[y];
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
166 }
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
167 }
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
168
6340
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
169 static void render_line(int x0, int y0, int x1, int y1, float * buf) {
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
170 int dy = y1 - y0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
171 int adx = x1 - x0;
10102
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
172 int ady = FFABS(dy);
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
173 int sy = dy<0 ? -1 : 1;
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
174 buf[x0] = ff_vorbis_floor1_inverse_db_table[y0];
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
175 if(ady*2<=adx) { // optimized common case
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
176 render_line_unrolled(x0, y0, x1, sy, ady, adx, buf);
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
177 } else {
10103
lorenm
parents: 10102
diff changeset
178 int base = dy / adx;
lorenm
parents: 10102
diff changeset
179 int x = x0;
lorenm
parents: 10102
diff changeset
180 int y = y0;
lorenm
parents: 10102
diff changeset
181 int err = -adx;
lorenm
parents: 10102
diff changeset
182 ady -= FFABS(base) * adx;
lorenm
parents: 10102
diff changeset
183 while (++x < x1) {
lorenm
parents: 10102
diff changeset
184 y += base;
lorenm
parents: 10102
diff changeset
185 err += ady;
lorenm
parents: 10102
diff changeset
186 if (err >= 0) {
lorenm
parents: 10102
diff changeset
187 err -= adx;
lorenm
parents: 10102
diff changeset
188 y += sy;
lorenm
parents: 10102
diff changeset
189 }
lorenm
parents: 10102
diff changeset
190 buf[x] = ff_vorbis_floor1_inverse_db_table[y];
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
191 }
10102
76eeb9e3599b 1.5x faster ff_vorbis_floor1_render_list, 5% faster vorbis decoding on Core2.
lorenm
parents: 9934
diff changeset
192 }
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
193 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
194
8306
ddecbc18fe94 Rename all vorbis encoder related typedefs to not use _t for POSIX compatibility
ods15
parents: 6750
diff changeset
195 void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples) {
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
196 int lx, ly, i;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
197 lx = 0;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
198 ly = y_list[0] * multiplier;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
199 for (i = 1; i < values; i++) {
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
200 int pos = list[i].sort;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
201 if (flag[pos]) {
6340
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
202 int x1 = list[pos].x;
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
203 int y1 = y_list[pos] * multiplier;
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
204 if (lx < samples)
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
205 render_line(lx, ly, FFMIN(x1,samples), y1, out);
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
206 lx = x1;
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
207 ly = y1;
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
208 }
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
209 if (lx >= samples) break;
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
210 }
6340
575e0a847f0c 30% faster ff_vorbis_floor1_render_list, 3% faster overall
lorenm
parents: 5215
diff changeset
211 if (lx < samples) render_line(lx, ly, samples, ly, out);
4971
cb647e7b4b8b loosen vorbis_enc.c dependencies by spliting vorbis.c
aurel
parents:
diff changeset
212 }