annotate resample.c @ 12530:63edd10ad4bc libavcodec tip

Try to fix crashes introduced by r25218 r25218 made assumptions about the existence of past reference frames that weren't necessarily true.
author darkshikari
date Tue, 28 Sep 2010 09:06:22 +0000
parents 776789af0304
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
5355
45d083bbbbe7 typo fixes
diego
parents: 4712
diff changeset
2 * samplerate conversion for both audio and video
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 7470
diff changeset
3 * Copyright (c) 2000 Fabrice Bellard
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
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: 3036
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
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: 3036
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: 2979
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
21
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
22 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 9835
diff changeset
23 * @file
5355
45d083bbbbe7 typo fixes
diego
parents: 4712
diff changeset
24 * samplerate conversion for both audio and video
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
25 */
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
26
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
27 #include "avcodec.h"
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
28 #include "audioconvert.h"
12522
776789af0304 Move AVOptions from libavcodec to libavutil
michael
parents: 11664
diff changeset
29 #include "libavutil/opt.h"
1125
0980ae063f4e restoring OS/2 compatibility patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
michaelni
parents: 1106
diff changeset
30
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
31 struct AVResampleContext;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
33 static const char *context_to_name(void *ptr)
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
34 {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
35 return "audioresample";
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
36 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
37
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
38 static const AVOption options[] = {{NULL}};
11664
3da317f52661 Add version to AVClass so we can add to and use fields of AVClass without ABI issues.
michael
parents: 11644
diff changeset
39 static const AVClass audioresample_context_class = { "ReSampleContext", context_to_name, options, LIBAVUTIL_VERSION_INT };
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
40
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 struct ReSampleContext {
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
42 struct AVResampleContext *resample_context;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
43 short *temp[2];
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
44 int temp_len;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 float ratio;
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 /* channel convert */
986e461dc072 Initial revision
glantau
parents:
diff changeset
47 int input_channels, output_channels, filter_channels;
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
48 AVAudioConvert *convert_ctx[2];
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
49 enum SampleFormat sample_fmt[2]; ///< input and output sample format
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
50 unsigned sample_size[2]; ///< size of one sample in sample_fmt
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
51 short *buffer[2]; ///< buffers used for conversion to S16
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
52 unsigned buffer_size[2]; ///< sizes of allocated buffers
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
53 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
54
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 /* n1: number of samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
56 static void stereo_to_mono(short *output, short *input, int n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
57 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 short *p, *q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 int n = n1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
60
986e461dc072 Initial revision
glantau
parents:
diff changeset
61 p = input;
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 q = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 while (n >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 q[0] = (p[0] + p[1]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 q[1] = (p[2] + p[3]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 q[2] = (p[4] + p[5]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 q[3] = (p[6] + p[7]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 q += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
69 p += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 n -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 while (n > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 q[0] = (p[0] + p[1]) >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 q++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 p += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
76 n--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
78 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
79
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 /* n1: number of samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 static void mono_to_stereo(short *output, short *input, int n1)
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 short *p, *q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 int n = n1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 int v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
86
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 p = input;
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 q = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 while (n >= 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 v = p[0]; q[0] = v; q[1] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 v = p[1]; q[2] = v; q[3] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 v = p[2]; q[4] = v; q[5] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 v = p[3]; q[6] = v; q[7] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 q += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 p += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 n -= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 while (n > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 v = p[0]; q[0] = v; q[1] = v;
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 q += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 p += 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 n--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
105
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 /* XXX: should use more abstract 'N' channels system */
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 static void stereo_split(short *output1, short *output2, short *input, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
110
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 for(i=0;i<n;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 *output1++ = *input++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 *output2++ = *input++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
116
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 static void stereo_mux(short *output, short *input1, short *input2, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
118 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
119 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
120
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 for(i=0;i<n;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 *output++ = *input1++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
123 *output++ = *input2++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
124 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
125 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
126
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
127 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
128 {
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
129 int i;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
130 short l,r;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
131
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
132 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
133 l=*input1++;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
134 r=*input2++;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
135 *output++ = l; /* left */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
136 *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
137 *output++ = r; /* right */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
138 *output++ = 0; /* left surround */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
139 *output++ = 0; /* right surroud */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
140 *output++ = 0; /* low freq */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
141 }
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
142 }
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
143
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
144 ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
145 int output_rate, int input_rate,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
146 enum SampleFormat sample_fmt_out,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
147 enum SampleFormat sample_fmt_in,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
148 int filter_length, int log2_phase_count,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
149 int linear, double cutoff)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 ReSampleContext *s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2522
diff changeset
152
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
153 if ( input_channels > 2)
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
154 {
6023
78b46e3f9df2 Add missing '\n' to log format text
andoma
parents: 5959
diff changeset
155 av_log(NULL, AV_LOG_ERROR, "Resampling with input channels greater than 2 unsupported.\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
156 return NULL;
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
157 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
158
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 s = av_mallocz(sizeof(ReSampleContext));
986e461dc072 Initial revision
glantau
parents:
diff changeset
160 if (!s)
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
161 {
6023
78b46e3f9df2 Add missing '\n' to log format text
andoma
parents: 5959
diff changeset
162 av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for resample context.\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
163 return NULL;
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
164 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
165
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 s->ratio = (float)output_rate / (float)input_rate;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2522
diff changeset
167
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 s->input_channels = input_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 s->output_channels = output_channels;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2522
diff changeset
170
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 s->filter_channels = s->input_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 if (s->output_channels < s->filter_channels)
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 s->filter_channels = s->output_channels;
986e461dc072 Initial revision
glantau
parents:
diff changeset
174
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
175 s->sample_fmt [0] = sample_fmt_in;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
176 s->sample_fmt [1] = sample_fmt_out;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
177 s->sample_size[0] = av_get_bits_per_sample_format(s->sample_fmt[0])>>3;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
178 s->sample_size[1] = av_get_bits_per_sample_format(s->sample_fmt[1])>>3;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
179
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
180 if (s->sample_fmt[0] != SAMPLE_FMT_S16) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
181 if (!(s->convert_ctx[0] = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
182 s->sample_fmt[0], 1, NULL, 0))) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
183 av_log(s, AV_LOG_ERROR,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
184 "Cannot convert %s sample format to s16 sample format\n",
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
185 avcodec_get_sample_fmt_name(s->sample_fmt[0]));
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
186 av_free(s);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
187 return NULL;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
188 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
189 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
190
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
191 if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
192 if (!(s->convert_ctx[1] = av_audio_convert_alloc(s->sample_fmt[1], 1,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
193 SAMPLE_FMT_S16, 1, NULL, 0))) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
194 av_log(s, AV_LOG_ERROR,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
195 "Cannot convert s16 sample format to %s sample format\n",
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
196 avcodec_get_sample_fmt_name(s->sample_fmt[1]));
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
197 av_audio_convert_free(s->convert_ctx[0]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
198 av_free(s);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
199 return NULL;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
200 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
201 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
202
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
203 /*
7470
1a93d3bbe3ee cosmetics: make all references to AC-3 capitalized and hyphenated
jbr
parents: 6023
diff changeset
204 * AC-3 output is the only case where filter_channels could be greater than 2.
1408
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
205 * 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
206 * 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
207 */
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
208 if(s->filter_channels>2)
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
209 s->filter_channels = 2;
4d67eb341a0c AC3 encoding patch ba (Ross Martin <ffmpeg at ross dot interwrx dot com>)
michaelni
parents: 1128
diff changeset
210
4712
5c0c96d437f2 set more reasonable cutoff for audio rate conversion
michael
parents: 3947
diff changeset
211 #define TAPS 16
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
212 s->resample_context= av_resample_init(output_rate, input_rate,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
213 filter_length, log2_phase_count, linear, cutoff);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
214
9835
ff9ae6249d18 Add const in cast. Removes warning:
bcoudurier
parents: 9834
diff changeset
215 *(const AVClass**)s->resample_context = &audioresample_context_class;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2522
diff changeset
216
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 return s;
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
219
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
220 #if LIBAVCODEC_VERSION_MAJOR < 53
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
221 ReSampleContext *audio_resample_init(int output_channels, int input_channels,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
222 int output_rate, int input_rate)
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
223 {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
224 return av_audio_resample_init(output_channels, input_channels,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
225 output_rate, input_rate,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
226 SAMPLE_FMT_S16, SAMPLE_FMT_S16,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
227 TAPS, 10, 0, 0.8);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
228 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
229 #endif
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
230
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 /* resample audio. 'nb_samples' is the number of input samples */
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 /* XXX: optimize it ! */
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples)
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 int i, nb_samples1;
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
236 short *bufin[2];
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
237 short *bufout[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 short *buftmp2[2], *buftmp3[2];
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
239 short *output_bak = NULL;
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
240 int lenout;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
241
2109
84637c6ca74e various resampling fixes
michael
parents: 2084
diff changeset
242 if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 /* nothing to do */
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 memcpy(output, input, nb_samples * s->input_channels * sizeof(short));
986e461dc072 Initial revision
glantau
parents:
diff changeset
245 return nb_samples;
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
247
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
248 if (s->sample_fmt[0] != SAMPLE_FMT_S16) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
249 int istride[1] = { s->sample_size[0] };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
250 int ostride[1] = { 2 };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
251 const void *ibuf[1] = { input };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
252 void *obuf[1];
8911
28b706b75b00 Prevent heap corruption when resampling 8-bit audio.
pross
parents: 8806
diff changeset
253 unsigned input_size = nb_samples*s->input_channels*2;
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
254
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
255 if (!s->buffer_size[0] || s->buffer_size[0] < input_size) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
256 av_free(s->buffer[0]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
257 s->buffer_size[0] = input_size;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
258 s->buffer[0] = av_malloc(s->buffer_size[0]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
259 if (!s->buffer[0]) {
9834
ce317c75222d give s->resample_context to avoid segfault, avclass was moved
bcoudurier
parents: 9252
diff changeset
260 av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
261 return 0;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
262 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
263 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
264
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
265 obuf[0] = s->buffer[0];
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
266
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
267 if (av_audio_convert(s->convert_ctx[0], obuf, ostride,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
268 ibuf, istride, nb_samples*s->input_channels) < 0) {
9834
ce317c75222d give s->resample_context to avoid segfault, avclass was moved
bcoudurier
parents: 9252
diff changeset
269 av_log(s->resample_context, AV_LOG_ERROR, "Audio sample format conversion failed\n");
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
270 return 0;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
271 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
272
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
273 input = s->buffer[0];
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
274 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
275
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
276 lenout= 4*nb_samples * s->ratio + 16;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
277
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
278 if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
279 output_bak = output;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
280
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
281 if (!s->buffer_size[1] || s->buffer_size[1] < lenout) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
282 av_free(s->buffer[1]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
283 s->buffer_size[1] = lenout;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
284 s->buffer[1] = av_malloc(s->buffer_size[1]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
285 if (!s->buffer[1]) {
9834
ce317c75222d give s->resample_context to avoid segfault, avclass was moved
bcoudurier
parents: 9252
diff changeset
286 av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
287 return 0;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
288 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
289 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
290
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
291 output = s->buffer[1];
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
292 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
293
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
294 /* 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
295 for(i=0; i<s->filter_channels; i++){
5958
ed05a3d964fa stupid code (casting of void*) found by checktree.sh
michael
parents: 5502
diff changeset
296 bufin[i]= av_malloc( (nb_samples + s->temp_len) * sizeof(short) );
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
297 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
298 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
299 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2522
diff changeset
300
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
301 /* make some zoom to avoid round pb */
5958
ed05a3d964fa stupid code (casting of void*) found by checktree.sh
michael
parents: 5502
diff changeset
302 bufout[0]= av_malloc( lenout * sizeof(short) );
ed05a3d964fa stupid code (casting of void*) found by checktree.sh
michael
parents: 5502
diff changeset
303 bufout[1]= av_malloc( lenout * sizeof(short) );
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
304
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 if (s->input_channels == 2 &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 s->output_channels == 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 buftmp3[0] = output;
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 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
309 } else if (s->output_channels >= 2 && s->input_channels == 1) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 buftmp3[0] = bufout[0];
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
311 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
312 } else if (s->output_channels >= 2) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 buftmp3[0] = bufout[0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 buftmp3[1] = bufout[1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 stereo_split(buftmp2[0], buftmp2[1], input, nb_samples);
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 buftmp3[0] = output;
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
318 memcpy(buftmp2[0], input, nb_samples*sizeof(short));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
319 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
320
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
321 nb_samples += s->temp_len;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
322
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 /* resample each channel */
986e461dc072 Initial revision
glantau
parents:
diff changeset
324 nb_samples1 = 0; /* avoid warning */
986e461dc072 Initial revision
glantau
parents:
diff changeset
325 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
326 int consumed;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
327 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
328
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
329 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
330 s->temp_len= nb_samples - consumed;
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
331 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
332 memcpy(s->temp[i], bufin[i] + consumed, s->temp_len*sizeof(short));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
334
986e461dc072 Initial revision
glantau
parents:
diff changeset
335 if (s->output_channels == 2 && s->input_channels == 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
336 mono_to_stereo(output, buftmp3[0], nb_samples1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
337 } else if (s->output_channels == 2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 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
339 } 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
340 ac3_5p1_mux(output, buftmp3[0], buftmp3[1], nb_samples1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
342
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
343 if (s->sample_fmt[1] != SAMPLE_FMT_S16) {
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
344 int istride[1] = { 2 };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
345 int ostride[1] = { s->sample_size[1] };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
346 const void *ibuf[1] = { output };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
347 void *obuf[1] = { output_bak };
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
348
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
349 if (av_audio_convert(s->convert_ctx[1], obuf, ostride,
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
350 ibuf, istride, nb_samples1*s->output_channels) < 0) {
9834
ce317c75222d give s->resample_context to avoid segfault, avclass was moved
bcoudurier
parents: 9252
diff changeset
351 av_log(s->resample_context, AV_LOG_ERROR, "Audio sample format convertion failed\n");
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
352 return 0;
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
353 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
354 }
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
355
2084
michael
parents: 2082
diff changeset
356 for(i=0; i<s->filter_channels; i++)
michael
parents: 2082
diff changeset
357 av_free(bufin[i]);
64
5aa6292a1660 win32 fixes
glantau
parents: 0
diff changeset
358
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
359 av_free(bufout[0]);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
360 av_free(bufout[1]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 return nb_samples1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
363
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 void audio_resample_close(ReSampleContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 {
2082
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
366 av_resample_close(s->resample_context);
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
367 av_freep(&s->temp[0]);
3dc9bbe1b152 polyphase kaiser windowed sinc and blackman nuttall windowed sinc audio resample filters
michael
parents: 1598
diff changeset
368 av_freep(&s->temp[1]);
8806
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
369 av_freep(&s->buffer[0]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
370 av_freep(&s->buffer[1]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
371 av_audio_convert_free(s->convert_ctx[0]);
cbeaa8c0fe4f extend resampling API, add S16 internal conversion
bcoudurier
parents: 8718
diff changeset
372 av_audio_convert_free(s->convert_ctx[1]);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 373
diff changeset
373 av_free(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 }