Changeset 05ed7f5


Ignore:
Timestamp:
Jul 2, 2020, 7:03:56 PM (4 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn, feature/crepe, fix/ffmpeg5, master
Children:
e7c6216
Parents:
7b8e51c (diff), bd183b3 (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 branch 'feature/timestretch'

Files:
11 added
9 edited

Legend:

Unmodified
Added
Removed
  • .circleci/config.yml

    r7b8e51c r05ed7f5  
    33  command: |
    44    sudo apt-get update
    5     sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev libvorbis-dev libflac-dev
     5    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev librubberband-dev libvorbis-dev libflac-dev
    66
    77pip-install: &pip-install
  • .travis.yml

    r7b8e51c r05ed7f5  
    7676    - libasound2-dev
    7777    - libfftw3-dev
     78    - librubberband-dev
    7879    - sox
    7980    - lcov
     
    8586    - libvorbis
    8687    - flac
     88    - libsamplerate
     89    - rubberband
    8790    - lcov
    8891    update: true
  • azure-pipelines.yml

    r7b8e51c r05ed7f5  
    77  steps:
    88  - script: |
    9       sudo apt install libavformat-dev
     9      sudo apt install libavformat-dev librubberband-dev
    1010    displayName: 'deps'
    1111  - script: |
  • python/lib/gen_code.py

    r7b8e51c r05ed7f5  
    2121    'method': '"default"',
    2222    'uri': '"none"',
     23    'transpose': '0.',
    2324    }
    2425
     
    8485        'filterbank': 'self->n_filters',
    8586        'tss': 'self->buf_size',
     87        'pitchshift': 'self->hop_size',
    8688        'dct': 'self->size',
    8789        }
     
    9799        'wavetable': 'self->hop_size',
    98100        'tss': 'self->buf_size / 2 + 1',
     101        'pitchshift': 'self->hop_size',
    99102        }
    100103
     
    291294        if p['type'] == 'char_t*':
    292295            return self.check_valid_char(p)
     296        if p['type'] == 'smpl_t':
     297            return self.check_valid_smpl(p)
    293298        else:
    294299            print ("ERROR, no idea how to check %s for validity" % p['type'])
     
    311316    self->{name} = {defval};
    312317    if ({name} != NULL) {{
     318        self->{name} = {name};
     319    }}
     320""".format(defval = aubiodefvalue[name], name = name)
     321
     322    def check_valid_smpl(self, p):
     323        name = p['name']
     324        return """
     325    self->{name} = {defval};
     326    if ({name} != 0.) {{
    313327        self->{name} = {name};
    314328    }}
  • python/lib/gen_external.py

    r7b8e51c r05ed7f5  
    4747    'audio_unit',
    4848    'spectral_whitening',
     49    'timestretch', # TODO fix parsing of uint_t *read in _do
    4950]
    5051
  • python/lib/moresetuptools.py

    r7b8e51c r05ed7f5  
    7979    packages = ['libavcodec', 'libavformat', 'libavutil',
    8080                'libswresample', 'libavresample',
     81                'jack',
    8182                'sndfile',
     83                'rubberband',
    8284                #'fftw3f',
    8385               ]
     
    101103    if 'samplerate' in ext.libraries:
    102104        ext.define_macros += [('HAVE_SAMPLERATE', 1)]
     105    if 'rubberband' in ext.libraries:
     106        ext.define_macros += [('HAVE_RUBBERBAND', 1)]
    103107    if 'fftw3f' in ext.libraries:
    104108        ext.define_macros += [('HAVE_FFTW3F', 1)]
  • src/aubio.h

    r7b8e51c r05ed7f5  
    221221#include "pitch/pitchspecacf.h"
    222222#include "tempo/beattracking.h"
     223#include "effects/pitchshift.h"
     224#include "effects/timestretch.h"
    223225#include "utils/scale.h"
    224226#include "utils/hist.h"
  • src/wscript_build

    r7b8e51c r05ed7f5  
    77uselib += ['SAMPLERATE']
    88uselib += ['SNDFILE']
     9uselib += ['RUBBERBAND']
    910uselib += ['AVCODEC']
    1011uselib += ['AVFORMAT']
  • wscript

    r7b8e51c r05ed7f5  
    8282            help_str = 'compile with samplerate (auto)',
    8383            help_disable_str = 'disable samplerate')
     84    add_option_enable_disable(ctx, 'rubberband', default = None,
     85            help_str = 'compile with rubberband (auto)',
     86            help_disable_str = 'disable rubberband')
    8487    add_option_enable_disable(ctx, 'memcpy', default = True,
    8588            help_str = 'use memcpy hacks (default)',
     
    141144                'samplerate',
    142145                'jack',
     146                'rubberband',
    143147                'avcodec',
    144148                'blas',
     
    416420                args = '--cflags --libs samplerate >= 0.0.15',
    417421                mandatory = ctx.options.enable_samplerate)
     422
     423    # check for librubberband
     424    if (ctx.options.enable_rubberband != False):
     425        ctx.check_cfg(package = 'rubberband', atleast_version = '1.3',
     426                args = '--cflags --libs',
     427                mandatory = ctx.options.enable_rubberband)
    418428
    419429    # check for jack
Note: See TracChangeset for help on using the changeset viewer.