Changeset 3d5cddf for src/io

Timestamp:

Dec 6, 2013, 5:12:11 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

1fe3ac2

Parents:

0044b43

Message:

src/io/source_avcodec.c: let avresample do the conversion to float

File:

• src/io/source_avcodec.c (modified) (6 diffs)

src/io/source_avcodec.c

@@ -38 +38 @@
 #define AUBIO_AVCODEC_MIN_BUFFER_SIZE FF_MIN_BUFFER_SIZE
 
-#define SHORT_TO_FLOAT(x) (smpl_t)(x * 3.0517578125e-05)
-
 struct _aubio_source_avcodec_t {
   uint_t hop_size;
@@ -55 +53 @@
   AVFrame *avFrame;
   AVAudioResampleContext *avr;
-  int16_t *output;
+  float *output;
   uint_t read_samples;
   uint_t read_index;
@@ -173 +171 @@
   av_opt_set_int(avr, "out_sample_rate",    s->samplerate,          0);
   av_opt_set_int(avr, "in_sample_fmt",      avCodecCtx->sample_fmt, 0);
-  av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_S16,      0);
+  av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_FLTP,     0);
   if ( ( err = avresample_open(avr) ) < 0) {
     uint8_t errorstr_len = 128;
@@ -192 +190 @@
 
   /* allocate output for avr */
-  s->output = (int16_t *)av_malloc(AUBIO_AVCODEC_MIN_BUFFER_SIZE * sizeof(int16_t));
+  s->output = (float *)av_malloc(AUBIO_AVCODEC_MIN_BUFFER_SIZE * sizeof(float));
 
   s->read_samples = 0;
@@ -222 +220 @@
   av_init_packet (&avPacket);
   AVAudioResampleContext *avr = s->avr;
-  int16_t *output = s->output;
+  float *output = s->output;
 
   do
@@ -304 +302 @@
     end = MIN(s->read_samples - s->read_index, s->hop_size - total_wrote);
     for (i = 0; i < end; i++) {
-      read_data->data[i + total_wrote] = SHORT_TO_FLOAT(s->output[i + s->read_index]);
+      read_data->data[i + total_wrote] = s->output[i + s->read_index];
     }
     total_wrote += end;