aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-10 18:01:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-10 18:01:26 +0100
commitfca51256d4f4b432f551d24b20570cc79a34d1f8 (patch)
tree878669b7ff96ee6a19358854cb400a45bcfc403f
parent36055aa8764510b3d1803a9ac304960685d385a9 (diff)
downloadffmpeg-fca51256d4f4b432f551d24b20570cc79a34d1f8.tar.gz
swr: rename dither_pos to noise_pos
THis more closely matches what the field represents Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswresample/dither_template.c2
-rw-r--r--libswresample/swresample.c12
-rw-r--r--libswresample/swresample_internal.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/libswresample/dither_template.c b/libswresample/dither_template.c
index 3388aadc56..b98391be89 100644
--- a/libswresample/dither_template.c
+++ b/libswresample/dither_template.c
@@ -30,7 +30,7 @@ void RENAME(swri_noise_shaping)(SwrContext *s, AudioData *srcs, AudioData *noise
float S_1 = s->dither.ns_scale_1;
for (ch=0; ch<srcs->ch_count; ch++) {
- const float *noise = ((const float *)noises->ch[ch]) + s->dither.dither_pos;
+ const float *noise = ((const float *)noises->ch[ch]) + s->dither.noise_pos;
DELEM *data = (DELEM*)srcs->ch[ch];
pos = s->dither.ns_pos;
for (i=0; i<count; i++) {
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index b311419409..75fced43ca 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -657,8 +657,8 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt);
av_assert0(s->dither.noise.ch_count == preout->ch_count);
- if(s->dither.dither_pos + out_count > s->dither.noise.count)
- s->dither.dither_pos = 0;
+ if(s->dither.noise_pos + out_count > s->dither.noise.count)
+ s->dither.noise_pos = 0;
if (s->dither.method < SWR_DITHER_NS){
if (s->mix_2_1_simd) {
@@ -667,13 +667,13 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
if(len1)
for(ch=0; ch<preout->ch_count; ch++)
- s->mix_2_1_simd(preout->ch[ch], preout->ch[ch], s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.dither_pos, s->native_one, 0, 0, len1);
+ s->mix_2_1_simd(preout->ch[ch], preout->ch[ch], s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.noise_pos, s->native_one, 0, 0, len1);
if(out_count != len1)
for(ch=0; ch<preout->ch_count; ch++)
- s->mix_2_1_f(preout->ch[ch] + off, preout->ch[ch] + off, s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.dither_pos + off + len1, s->native_one, 0, 0, out_count - len1);
+ s->mix_2_1_f(preout->ch[ch] + off, preout->ch[ch] + off, s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.noise_pos + off + len1, s->native_one, 0, 0, out_count - len1);
} else {
for(ch=0; ch<preout->ch_count; ch++)
- s->mix_2_1_f(preout->ch[ch], preout->ch[ch], s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.dither_pos, s->native_one, 0, 0, out_count);
+ s->mix_2_1_f(preout->ch[ch], preout->ch[ch], s->dither.noise.ch[ch] + s->dither.noise.bps * s->dither.noise_pos, s->native_one, 0, 0, out_count);
}
} else {
switch(s->int_sample_fmt) {
@@ -683,7 +683,7 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
case AV_SAMPLE_FMT_DBLP :swri_noise_shaping_double(s,preout, &s->dither.noise, out_count); break;
}
}
- s->dither.dither_pos += out_count;
+ s->dither.noise_pos += out_count;
}
//FIXME packed doesnt need more than 1 chan here!
swri_audio_convert(s->out_convert, out, preout, out_count);
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index 8423c3a767..0ec37545ff 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -52,7 +52,7 @@ typedef struct AudioData{
struct DitherContext {
enum SwrDitherType method;
- int dither_pos;
+ int noise_pos;
float scale;
float noise_scale; ///< Noise scale
int ns_taps; ///< Noise shaping dither taps