Skip to content

Commit

Permalink
Merge pull request #52 from CPJKU/feature/refactor_beats_hmm
Browse files Browse the repository at this point in the history
Refactor beats_hmm module to be python only and allow transitions at beat boundaries.
  • Loading branch information
superbock committed Feb 5, 2016
2 parents 5596d0d + 91e80a8 commit 70a6d72
Show file tree
Hide file tree
Showing 15 changed files with 1,221 additions and 847 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ before_install:
- sudo apt-get install -qq ffmpeg
# install numpy etc. via miniconda
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh;
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget http://repo.continuum.io/miniconda/Miniconda3-3.8.3-Linux-x86_64.sh -O miniconda.sh;
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
Expand All @@ -24,7 +24,7 @@ before_install:
- conda update -q conda
- conda config --add channels pypi
- conda info -a
- deps='pip cython numpy scipy nose pep8'
- deps='pip libgfortran cython numpy scipy nose pep8'
- conda create -q -n test-environment "python=$TRAVIS_PYTHON_VERSION" $deps
- source activate test-environment
- pip install codecov
Expand Down
7 changes: 2 additions & 5 deletions bin/GMMPatternTracker
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,15 @@ def main():
Proceedings of the 16th International Society for Music Information
Retrieval Conference (ISMIR), 2015.
This program uses only two rhythmical patterns and allows tempo changes
only at bar boundaries.
This program can be run in 'single' file mode to process a single audio
file and write the detected beats to STDOUT or the given output file.
$ DownBeatTracker single INFILE [-o OUTFILE]
$ GMMPatternTracker single INFILE [-o OUTFILE]
If multiple audio files should be processed, the program can also be run
in 'batch' mode to save the detected beats to files with the given suffix.
$ DownBeatTracker batch [-o OUTPUT_DIR] [-s OUTPUT_SUFFIX] LIST OF FILES
$ GMMPatternTracker batch [-o OUTPUT_DIR] [-s OUTPUT_SUFFIX] LIST OF FILES
If no output directory is given, the program writes the files with the
detected beats to same location as the audio files.
Expand Down
196 changes: 101 additions & 95 deletions madmom/features/beats.py

Large diffs are not rendered by default.

0 comments on commit 70a6d72

Please sign in to comment.