Skip to content

Commit

Permalink
Updates to copyright information
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyP103 committed Jan 30, 2019
1 parent e4045c2 commit e91419d
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## AudioCommons Timbral Models
The timbral models were devleoped by the [Institute of Sound Recording (IoSR)](http://www.iosr.uk/projects/AudioCommons/) at the University of Surrey, and was completed as part of the [AudioCommons project](https://www.audiocommons.org).
The timbral models were devleoped by the [Institute of Sound Recording (IoSR)](http://www.iosr.uk/AudioCommons/) at the University of Surrey, and was completed as part of the [AudioCommons project](https://www.audiocommons.org).

The current distribution contains python scripts for predicting eight timbral characteristics: *hardness*, *depth*, *brightness*, *roughness*, *warmth*, *sharpness*, *booming*, and *reverberation*.

Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Booming.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def timbral_booming(fname, fs=0, dev_output=False, phase_correction=False, clip_
:return float, apparent boominess of the audio file.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Brightness.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def timbral_brightness(fname, fs=0, dev_output=False, clip_output=False, phase_c
:return: Apparent brightness of audio file, float.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Depth.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def timbral_depth(fname, fs=0, dev_output=False, phase_correction=False, clip_ou
:return: float, aparent depth of audio file, float.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 2 additions & 0 deletions timbral_models/Timbral_Extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def timbral_extractor(fname, fs=0, dev_output=False, phase_correction=False, cli
:return: timbre the results from all timbral attributes as either a dictionary or list, depending
on output_type.
Copyright 2019 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
"""
'''
Check output_type before calculating anything
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Hardness.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def timbral_hardness(fname, fs=0, dev_output=False, phase_correction=False, clip
With dev_output set to True returns the weighted mean bandwidth,
mean attack time, harmonic-percussive ratio, and unitless attack centroid.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
5 changes: 4 additions & 1 deletion timbral_models/Timbral_Reverb.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ def timbral_reverb(fname, fs=0, dev_output=False, phase_correction=False, clip_o
:param clip_output: Has no effect on the code. Implemented for consistency with other timbral
functions.
:return:
:return: predicted reverb of audio file. 1 represents the files osunds reverberant, 0
represents the files does not sound reverberant.
Copyright 2019 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
"""
# needs to accept the input as audio file
raw_audio_samples, fs = timbral_util.file_read(fname, fs=fs, phase_correction=False, mono_sum=False, loudnorm=False)
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Roughness.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def timbral_roughness(fname, dev_output=False, phase_correction=False, clip_outp
:return: Roughness of the audio signal.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Sharpness.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def timbral_sharpness(fname, dev_output=False, phase_correction=False, clip_outp
:return Apparent sharpness of the audio file.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Warmth.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def timbral_warmth(fname, dev_output=False, phase_correction=False, clip_output=
:return: Estimated warmth of audio file.
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion timbral_models/timbral_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Version 0.4
Copyright 2018 Andy Pearce
Copyright 2018 Andy Pearce, Institute of Sound Recording, University of Surrey, UK.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down

0 comments on commit e91419d

Please sign in to comment.