Mercurial > hg > auditok

changeset 31:77f218f8b9d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update README.md
author Amine SEHILI <amsehili@users.noreply.github.com>
date Sun, 29 Nov 2015 11:59:57 +0100
parents e32c7c349af6
children ea905bc19458
files README.md
diffstat 1 files changed, 0 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Sun Nov 29 11:56:24 2015 +0100
+++ b/README.md	Sun Nov 29 11:59:57 2015 +0100
@@ -172,15 +172,9 @@
 ### Plot signal and detections:
 
 use option `-p`. Requires `matplotlib` and `numpy`.
-<<<<<<< HEAD
 
     auditok ...  -p
 
-=======
-
-    auditok ...  -p
-
->>>>>>> 78ccd74544ffc6f8a251dbcdf9b7019d559a3655
 ### Save plot as image or PDF
 
     auditok ...  --save-image output.png
@@ -216,7 +210,6 @@
     
 Install `pydub` for more audio formats.
 
-<<<<<<< HEAD
 
 Setting detection parameters
 ----------------------------
@@ -233,24 +226,6 @@
 | `-d`   | Drop trailing silence from an accepted audio activity | boolean |   False          |
 | `-a`   | Analysis window length (default value should be good) | second  |   0.01 (10 ms)   |
 
-=======
-
-Setting detection parameters
-----------------------------
-
-Alongside the threshold option `-e` seen so far, a couple of other options can have a great impact on the detector behavior. These options are summarized in the following table:
-
-
-| Option | Description                                           | Unit    | Default          |
-| -------|-------------------------------------------------------|---------|------------------|
-| `-n`   | Minimum length an accepted audio activity should have | second  |   0.2 (200 ms)   |
-| `-m`   | Maximum length an accepted audio activity should reach| second  |   5.             |
-| `-s`   | Maximum length of a continuous silence period within  | second  |   0.3 (300 ms)   |
-|        | an accepted audio activity                            |         |                  |
-| `-d`   | Drop trailing silence from an accepted audio activity | boolean |   False          |
-| `-a`   | Analysis window length (default value should be good) | second  |   0.01 (10 ms)   |
-
->>>>>>> 78ccd74544ffc6f8a251dbcdf9b7019d559a3655
 
 License
 -------
@@ -260,4 +235,3 @@
 ------
 Amine Sehili (<amine.sehili@gmail.com>)
 
-