Changeset fc117d0 for src

Timestamp:

Feb 11, 2013, 11:06:28 AM (12 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:

050a8f3

Parents:

5314432 (diff), 88fc249 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from develop

Location:

src

Files:

• Makefile.am (deleted)
• aubio.h (modified) (1 diff)
• io/sink.c (modified) (1 diff)
• io/sink_apple_audio.c (modified) (3 diffs)
• io/source.c (modified) (1 diff)
• io/source.h (modified) (1 diff)
• io/source_apple_audio.c (modified) (3 diffs)
• io/source_apple_audio.h (modified) (1 diff)
• io/source_sndfile.c (modified) (3 diffs)
• io/source_sndfile.h (modified) (1 diff)
• tempo/beattracking.c (modified) (4 diffs)
• temporal/resampler.c (modified) (2 diffs)
• wscript_build (modified) (1 diff)

src/aubio.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.

src/io/sink.c

@@ -45 +45 @@
 #endif /* HAVE_SNDFILE */
 #endif /* __APPLE__ */
-  AUBIO_ERROR("failed creating aubio sink with %s", uri);
+  AUBIO_ERROR("failed creating aubio sink with %s\n", uri);
   AUBIO_FREE(s);
   return NULL;

src/io/sink_apple_audio.c

@@ -53 +53 @@
 aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(char_t * uri, uint_t samplerate) {
   aubio_sink_apple_audio_t * s = AUBIO_NEW(aubio_sink_apple_audio_t);
-  s->samplerate;
+  s->samplerate = samplerate;
   s->channels = 1;
   s->path = uri;
@@ -59 +59 @@
 
   AudioStreamBasicDescription clientFormat;
-  UInt32 propSize = sizeof(clientFormat);
   memset(&clientFormat, 0, sizeof(AudioStreamBasicDescription));
   clientFormat.mFormatID         = kAudioFormatLinearPCM;
@@ -78 +77 @@
      overwrite ? kAudioFileFlags_EraseFile : 0, &s->audioFile);
   if (err) {
-    AUBIO_ERR("error when trying to access %s, in ExtAudioFileOpenURL, %d\n", s->path, (int)err);
+    AUBIO_ERR("error when trying to create %s, in ExtAudioFileCreateWithURL, %d\n", s->path, (int)err);
     goto beach;
   }

src/io/source.c

@@ -45 +45 @@
 #endif /* HAVE_SNDFILE */
 #endif /* __APPLE__ */
-  AUBIO_ERROR("failed creating aubio source with %s", uri);
+  AUBIO_ERROR("failed creating aubio source with %s\n", uri);
   AUBIO_FREE(s);
   return NULL;

src/io/source.h

@@ -38 +38 @@
 void del_aubio_source(aubio_source_t * s);
 
+uint_t aubio_source_get_samplerate(aubio_source_t * s);
+
 #ifdef __cplusplus
 }

src/io/source_apple_audio.c

@@ -55 +55 @@
 
   s->path = path;
-  s->samplerate = samplerate;
   s->block_size = block_size;
   s->channels = 1;
@@ -61 +60 @@
   OSStatus err = noErr;
   UInt32 propSize;
-
-  AudioStreamBasicDescription clientFormat;
-  propSize = sizeof(clientFormat);
-  memset(&clientFormat, 0, sizeof(AudioStreamBasicDescription));
-  clientFormat.mFormatID         = kAudioFormatLinearPCM;
-  clientFormat.mSampleRate       = (Float64)(s->samplerate);
-  clientFormat.mFormatFlags      = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-  clientFormat.mChannelsPerFrame = s->channels;
-  clientFormat.mBitsPerChannel   = sizeof(short) * 8;
-  clientFormat.mFramesPerPacket  = 1;
-  clientFormat.mBytesPerFrame    = clientFormat.mBitsPerChannel * clientFormat.mChannelsPerFrame / 8;
-  clientFormat.mBytesPerPacket   = clientFormat.mFramesPerPacket * clientFormat.mBytesPerFrame;
-  clientFormat.mReserved         = 0;
 
   // open the resource url
@@ -90 +76 @@
   if (err) { AUBIO_ERROR("error in ExtAudioFileGetProperty, %d\n", (int)err); goto beach;}
 
-  if (s->samplerate == 1) {
-    clientFormat.mSampleRate = fileFormat.mSampleRate;
-    s->samplerate = fileFormat.mSampleRate;
+  if (samplerate == 0) {
+    samplerate = fileFormat.mSampleRate;
+    //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
   }
+  s->samplerate = samplerate;
+
+  AudioStreamBasicDescription clientFormat;
+  propSize = sizeof(clientFormat);
+  memset(&clientFormat, 0, sizeof(AudioStreamBasicDescription));
+  clientFormat.mFormatID         = kAudioFormatLinearPCM;
+  clientFormat.mSampleRate       = (Float64)(s->samplerate);
+  clientFormat.mFormatFlags      = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
+  clientFormat.mChannelsPerFrame = s->channels;
+  clientFormat.mBitsPerChannel   = sizeof(short) * 8;
+  clientFormat.mFramesPerPacket  = 1;
+  clientFormat.mBytesPerFrame    = clientFormat.mBitsPerChannel * clientFormat.mChannelsPerFrame / 8;
+  clientFormat.mBytesPerPacket   = clientFormat.mFramesPerPacket * clientFormat.mBytesPerFrame;
+  clientFormat.mReserved         = 0;
 
   // set the client format description

src/io/source_apple_audio.h

@@ -28 +28 @@
 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s);
 
+uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s);
+
 #endif /* _AUBIO_SOURCE_APPLE_AUDIO_H */

src/io/source_sndfile.c

@@ -70 +70 @@
 
   s->hop_size = hop_size;
-  s->samplerate = samplerate;
   s->channels = 1;
   s->path = path;
@@ -90 +89 @@
   s->input_format     = sfinfo.format;
 
-  if (s->samplerate == 1) s->samplerate = s->input_samplerate;
-
+  if (samplerate == 0) {
+    samplerate = s->input_samplerate;
+    //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
+  }
+  s->samplerate = samplerate;
   /* compute input block size required before resampling */
   s->ratio = s->samplerate/(float)s->input_samplerate;
@@ -192 +194 @@
 }
 
+uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s) {
+  return s->samplerate;
+}
+
 #endif /* HAVE_SNDFILE */

src/io/source_sndfile.h

@@ -28 +28 @@
 void del_aubio_source_sndfile(aubio_source_sndfile_t * s);
 
+uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s);
+
 #endif /* _AUBIO_SOURCE_SNDFILE_H */

src/tempo/beattracking.c

@@ -136 +136 @@
   smpl_t beat;                  // beat position 
   smpl_t bp;                    // beat period
-  uint_t a; sint_t b;           // used to build shift invariant comb filterbank
+  uint_t a, b;                  // used to build shift invariant comb filterbank
   uint_t kmax;                  // number of elements used to find beat phase
 
@@ -160 +160 @@
   for (i = 1; i < laglen - 1; i++) {
     for (a = 1; a <= numelem; a++) {
-      for (b = (1 - a); b < (sint_t)a; b++) {
-        bt->acfout->data[i] += bt->acf->data[a * (i + 1) + b - 1]
+      for (b = 1; b < 2 * a; b++) {
+        bt->acfout->data[i] += bt->acf->data[i * a + b - 1]
             * 1. / (2. * a - 1.);
       }
@@ -276 +276 @@
 aubio_beattracking_checkstate (aubio_beattracking_t * bt)
 {
-  uint_t i, j, a; sint_t b;
+  uint_t i, j, a, b;
   uint_t flagconst = 0;
   sint_t counter = bt->counter;
@@ -300 +300 @@
     for (i = 1; i < laglen - 1; i++) {
       for (a = 1; a <= bt->timesig; a++) {
-        for (b = (1 - a); b < (sint_t)a; b++) {
-          acfout->data[i] += acf->data[a * (i + 1) + b - 1];
+        for (b = 1; b < 2 * a; b++) {
+          acfout->data[i] += acf->data[i * a + b - 1];
         }
       }

src/temporal/resampler.c

@@ -43 +43 @@
   int error = 0;
   s->stat = src_new (type, 1, &error);  /* only one channel */
+  if (error) {
+    AUBIO_ERR ("Failed creating resampler: %s\n", src_strerror (error));
+    del_aubio_resampler(s);
+    return NULL;
+  }
   s->proc = AUBIO_NEW (SRC_DATA);
-  if (error)
-    AUBIO_ERR ("%s\n", src_strerror (error));
   s->ratio = ratio;
   return s;
@@ -53 +56 @@
 del_aubio_resampler (aubio_resampler_t * s)
 {
-  src_delete (s->stat);
+  if (s->stat) src_delete (s->stat);
   AUBIO_FREE (s->proc);
   AUBIO_FREE (s);

src/wscript_build

@@ -25 +25 @@
 # install headers, except _priv.h ones
 ctx.install_files('${PREFIX}/include/aubio/',
-        ctx.path.ant_glob('**/*.h',
-        exclude = ['_priv.h', 'config.h']),
-        relative_trick=True)
+
+    ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
+    relative_trick=True)