annotate resample.c @ 2715:e36446161876 libavcodec

fix decoding of multi-channel vorbis streams
author mru
date Thu, 19 May 2005 11:41:41 +0000
parents e25782262d7d
children ef2149182f1c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * Sample rate convertion for both audio and video
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
19
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
20 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
21 * @file resample.c
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
22 * Sample rate convertion for both audio and video.
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
23 */
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
24
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
25 #include "avcodec.h"
1125
0980ae063f4e restoring OS/2 compatibility patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
michaelni
parents: 1106
diff changeset
26
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
27 struct AVResampleContext;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
28
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 struct ReSampleContext {
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
30 struct AVResampleContext *resample_context;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
31 short *temp[2];
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
32 int temp_len;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 float ratio;
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 /* channel convert */
986e461dc072 Initial revision
glantau
parents:
diff changeset
35 int input_channels, output_channels, filter_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
37
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 /* n1: number of samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 static void stereo_to_mono(short *output, short *input, int n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 short *p, *q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
42 int n = n1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
43
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 p = input;
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 q = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 while (n >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
47 q[0] = (p[0] + p[1]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
48 q[1] = (p[2] + p[3]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
49 q[2] = (p[4] + p[5]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
50 q[3] = (p[6] + p[7]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 q += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 p += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
53 n -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
54 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 while (n > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
56 q[0] = (p[0] + p[1]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
57 q++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 p += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 n--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
61 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
62
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 /* n1: number of samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 static void mono_to_stereo(short *output, short *input, int n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 short *p, *q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 int n = n1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 int v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
69
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 p = input;
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 q = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 while (n >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 v = p[0]; q[0] = v; q[1] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 v = p[1]; q[2] = v; q[3] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 v = p[2]; q[4] = v; q[5] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
76 v = p[3]; q[6] = v; q[7] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 q += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
78 p += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 n -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 while (n > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 v = p[0]; q[0] = v; q[1] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 q += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 p += 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 n--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
88
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 /* XXX: should use more abstract 'N' channels system */
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 static void stereo_split(short *output1, short *output2, short *input, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 for(i=0;i<n;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 *output1++ = *input++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 *output2++ = *input++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
99
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 static void stereo_mux(short *output, short *input1, short *input2, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
103
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 for(i=0;i<n;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 *output++ = *input1++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 *output++ = *input2++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
109
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
110 static void ac3_5p1_mux(short *output, short *input1, short *input2, int n)
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
111 {
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
112 int i;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
113 short l,r;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
114
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
115 for(i=0;i<n;i++) {
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
116 l=*input1++;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
117 r=*input2++;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
118 *output++ = l; /* left */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
119 *output++ = (l/2)+(r/2); /* center */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
120 *output++ = r; /* right */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
121 *output++ = 0; /* left surround */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
122 *output++ = 0; /* right surroud */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
123 *output++ = 0; /* low freq */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
124 }
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
125 }
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
126
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 ReSampleContext *audio_resample_init(int output_channels, int input_channels,
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 int output_rate, int input_rate)
986e461dc072 Initial revision
glantau
parents:
diff changeset
129 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
130 ReSampleContext *s;
986e461dc072 Initial revision
glantau
parents:
diff changeset
131
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
132 if ( input_channels > 2)
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
133 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1446
diff changeset
134 av_log(NULL, AV_LOG_ERROR, "Resampling with input channels greater than 2 unsupported.");
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
135 return NULL;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
136 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
137
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 s = av_mallocz(sizeof(ReSampleContext));
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 if (!s)
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
140 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1446
diff changeset
141 av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for resample context.");
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
142 return NULL;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
143 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
144
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 s->ratio = (float)output_rate / (float)input_rate;
986e461dc072 Initial revision
glantau
parents:
diff changeset
146
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 s->input_channels = input_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 s->output_channels = output_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
149
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 s->filter_channels = s->input_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 if (s->output_channels < s->filter_channels)
986e461dc072 Initial revision
glantau
parents:
diff changeset
152 s->filter_channels = s->output_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
153
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
154 /*
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
155 * ac3 output is the only case where filter_channels could be greater than 2.
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
156 * input channels can't be greater than 2, so resample the 2 channels and then
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
157 * expand to 6 channels after the resampling.
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
158 */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
159 if(s->filter_channels>2)
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
160 s->filter_channels = 2;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
161
2308
de38526a1f3f user selectble cutoff frequency
michael
parents: 2306
diff changeset
162 s->resample_context= av_resample_init(output_rate, input_rate, 16, 10, 0, 1.0);
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
163
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 return s;
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
166
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 /* resample audio. 'nb_samples' is the number of input samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 /* XXX: optimize it ! */
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples)
986e461dc072 Initial revision
glantau
parents:
diff changeset
170 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 int i, nb_samples1;
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
172 short *bufin[2];
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
173 short *bufout[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 short *buftmp2[2], *buftmp3[2];
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
175 int lenout;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
176
2109
84637c6ca74e various resampling fixes
michael
parents: 2084
diff changeset
177 if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 /* nothing to do */
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 memcpy(output, input, nb_samples * s->input_channels * sizeof(short));
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 return nb_samples;
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
182
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
183 /* XXX: move those malloc to resample init code */
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
184 for(i=0; i<s->filter_channels; i++){
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
185 bufin[i]= (short*) av_malloc( (nb_samples + s->temp_len) * sizeof(short) );
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
186 memcpy(bufin[i], s->temp[i], s->temp_len * sizeof(short));
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
187 buftmp2[i] = bufin[i] + s->temp_len;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
188 }
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
189
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
190 /* make some zoom to avoid round pb */
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
191 lenout= (int)(nb_samples * s->ratio) + 16;
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
192 bufout[0]= (short*) av_malloc( lenout * sizeof(short) );
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
193 bufout[1]= (short*) av_malloc( lenout * sizeof(short) );
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
194
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 if (s->input_channels == 2 &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 s->output_channels == 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 buftmp3[0] = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 stereo_to_mono(buftmp2[0], input, nb_samples);
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
199 } else if (s->output_channels >= 2 && s->input_channels == 1) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 buftmp3[0] = bufout[0];
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
201 memcpy(buftmp2[0], input, nb_samples*sizeof(short));
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
202 } else if (s->output_channels >= 2) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 buftmp3[0] = bufout[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 buftmp3[1] = bufout[1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 stereo_split(buftmp2[0], buftmp2[1], input, nb_samples);
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 buftmp3[0] = output;
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
208 memcpy(buftmp2[0], input, nb_samples*sizeof(short));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
210
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
211 nb_samples += s->temp_len;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
212
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 /* resample each channel */
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 nb_samples1 = 0; /* avoid warning */
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 for(i=0;i<s->filter_channels;i++) {
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
216 int consumed;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
217 int is_last= i+1 == s->filter_channels;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
218
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
219 nb_samples1 = av_resample(s->resample_context, buftmp3[i], bufin[i], &consumed, nb_samples, lenout, is_last);
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
220 s->temp_len= nb_samples - consumed;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
221 s->temp[i]= av_realloc(s->temp[i], s->temp_len*sizeof(short));
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
222 memcpy(s->temp[i], bufin[i] + consumed, s->temp_len*sizeof(short));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
224
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 if (s->output_channels == 2 && s->input_channels == 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 mono_to_stereo(output, buftmp3[0], nb_samples1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 } else if (s->output_channels == 2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 stereo_mux(output, buftmp3[0], buftmp3[1], nb_samples1);
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
229 } else if (s->output_channels == 6) {
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
230 ac3_5p1_mux(output, buftmp3[0], buftmp3[1], nb_samples1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
232
2084
michael
parents: 2082
diff changeset
233 for(i=0; i<s->filter_channels; i++)
michael
parents: 2082
diff changeset
234 av_free(bufin[i]);
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
235
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
236 av_free(bufout[0]);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
237 av_free(bufout[1]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 return nb_samples1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
240
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 void audio_resample_close(ReSampleContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 {
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
243 av_resample_close(s->resample_context);
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
244 av_freep(&s->temp[0]);
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
245 av_freep(&s->temp[1]);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
246 av_free(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 }