Skip to content

Commit a123cb1

Browse files
readbeyondreadbeyond
committed
Merge pull request #24 from readbeyond/devel
Releasing v1.3.1
2 parents ff4971c + 6671e95 commit a123cb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2295
-851
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*.pyo
44
*.swp
55
*.so
6-
MANIFEST
6+
aeneas.egg-info
77
aeneas/build
88
bak
99
build
@@ -14,6 +14,7 @@ tmp
1414
# service scripts
1515
zzz_*.py
1616
zzz_*.sh
17+
zzz_long_tests
1718

1819
# Eclipse/PyDev
1920
.project

‎MANIFEST.in

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
recursive-include aeneas/res *
2+
recursive-include aeneas/tools/res *
3+
include check_dependencies.py
4+
recursive-include docs *
5+
prune docs/build
6+
include LICENSE
7+
recursive-include licenses *
8+
include README.md
9+
include README.txt
10+
include requirements.txt
11+
recursive-include thirdparty *
12+
include VERSION

‎README.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
**aeneas** is a Python library and a set of tools to automagically synchronize audio and text.
44

5-
* Version: 1.3.0
6-
* Date: 2015-10-14
5+
* Version: 1.3.1
6+
* Date: 2015-10-28
77
* Developed by: [ReadBeyond](http://www.readbeyond.it/)
88
* Lead Developer: [Alberto Pettarin](http://www.albertopettarin.it/)
99
* License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -323,13 +323,14 @@ Changelog: [http://www.readbeyond.it/aeneas/docs/changelog.html](http://www.read
323323
* Automated detection of audio head/tail
324324
* MFCC and DTW computed as Python C extensions to reduce the processing time
325325
* On Linux, `espeak` called via a Python C extension for faster audio synthesis
326+
* Output an HTML file (from `finetuneas` project) for fine tuning the sync map manually
326327

327328
## Limitations and Missing Features
328329

329330
* Audio should match the text: large portions of spurious text or audio might produce a wrong sync map
330331
* Audio is assumed to be spoken: not suitable/YMMV for song captioning
331332
* No protection against memory trashing if you feed extremely long audio files
332-
* On Mac OS X and Windows, audio synthesis might be slow (tens of minutes) if you have thousands of text fragments
333+
* On Mac OS X and Windows, audio synthesis might be slow if you have thousands of text fragments
333334

334335
## TODO List
335336

@@ -340,10 +341,10 @@ Changelog: [http://www.readbeyond.it/aeneas/docs/changelog.html](http://www.read
340341
* Reporting the alignment score
341342
* Improving (removing?) dependency from `espeak`, `ffmpeg`, `ffprobe` executables
342343
* Multilevel sync map granularity (e.g., multilevel SMIL output)
343-
* Supporting input text encodings other than UTF-8
344344
* Better documentation
345345
* Testing other approaches, like HMM
346346
* Publishing the package on PyPI
347+
* Publishing the package on Debian repo
347348

348349
Would you like to see one of the above points done?
349350
Consider [sponsoring](#supporting) this project!
@@ -399,6 +400,12 @@ is a verbatim copy from the
399400
[espeak project](http://espeak.sourceforge.net/).
400401
See [`licenses/eSpeak.txt`](licenses/eSpeak.txt) for details.
401402

403+
The HTML file `aeneas/res/finetuneas.html`
404+
is a verbatim copy from the
405+
[finetuneas project](https://github.com/ozdefir/finetuneas),
406+
courtesy of Firat Özdemir.
407+
See [`licenses/finetuneas.txt`](licenses/finetuneas.txt) for details.
408+
402409
Audio files contained in the unit tests `aeneas/tests/res/` directory
403410
are adapted from recordings produced by
404411
the [LibriVox Project](http://www.librivox.org)

‎README.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ aeneas
44
**aeneas** is a Python library and a set of tools to automagically
55
synchronize audio and text.
66

7-
- Version: 1.3.0
8-
- Date: 2015-10-14
7+
- Version: 1.3.1
8+
- Date: 2015-10-28
99
- Developed by: `ReadBeyond <http://www.readbeyond.it/>`__
1010
- Lead Developer: `Alberto Pettarin <http://www.albertopettarin.it/>`__
1111
- License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -352,6 +352,8 @@ Supported Features
352352
time
353353
- On Linux, ``espeak`` called via a Python C extension for faster audio
354354
synthesis
355+
- Output an HTML file (from ``finetuneas`` project) for fine tuning the
356+
sync map manually
355357

356358
Limitations and Missing Features
357359
--------------------------------
@@ -375,7 +377,6 @@ TODO List
375377
- Improving (removing?) dependency from ``espeak``, ``ffmpeg``,
376378
``ffprobe`` executables
377379
- Multilevel sync map granularity (e.g., multilevel SMIL output)
378-
- Supporting input text encodings other than UTF-8
379380
- Better documentation
380381
- Testing other approaches, like HMM
381382
- Publishing the package on PyPI
@@ -432,6 +433,11 @@ The C header ``speak_lib.h`` for ``espeak`` is a verbatim copy from the
432433
`espeak project <http://espeak.sourceforge.net/>`__. See
433434
```licenses/eSpeak.txt`` <licenses/eSpeak.txt>`__ for details.
434435

436+
The HTML file ``aeneas/res/finetuneas.html`` is a verbatim copy from the
437+
`finetuneas project <https://github.com/ozdefir/finetuneas>`__, courtesy
438+
of Firat Özdemir. See
439+
```licenses/finetuneas.txt`` <licenses/finetuneas.txt>`__ for details.
440+
435441
Audio files contained in the unit tests ``aeneas/tests/res/`` directory
436442
are adapted from recordings produced by the `LibriVox
437443
Project <http://www.librivox.org>`__ and they are in the public domain.

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0
1+
1.3.1

‎aeneas/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
5757
"""
5858
__license__ = "GNU AGPL v3"
59-
__version__ = "1.3.0"
59+
__version__ = "1.3.1"
6060
__email__ = "[email protected]"
6161
__status__ = "Production"
6262

‎aeneas/adjustboundaryalgorithm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2020
"""
2121
__license__ = "GNU AGPL v3"
22-
__version__ = "1.3.0"
22+
__version__ = "1.3.1"
2323
__email__ = "[email protected]"
2424
__status__ = "Production"
2525

‎aeneas/analyzecontainer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2424
"""
2525
__license__ = "GNU AGPL v3"
26-
__version__ = "1.3.0"
26+
__version__ = "1.3.1"
2727
__email__ = "[email protected]"
2828
__status__ = "Production"
2929

‎aeneas/audiofile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2828
"""
2929
__license__ = "GNU AGPL v3"
30-
__version__ = "1.3.0"
30+
__version__ = "1.3.1"
3131
__email__ = "[email protected]"
3232
__status__ = "Production"
3333

‎aeneas/cdtw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __copyright__ = """
99
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
1010
"""
1111
__license__ = "GNU AGPL v3"
12-
__version__ = "1.3.0"
12+
__version__ = "1.3.1"
1313
__email__ = "[email protected]"
1414
__status__ = "Production"
1515

‎aeneas/cdtw_setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2323
"""
2424
__license__ = "GNU AGPL v3"
25-
__version__ = "1.3.0"
25+
__version__ = "1.3.1"
2626
__email__ = "[email protected]"
2727
__status__ = "Production"
2828

@@ -38,7 +38,7 @@
3838

3939
setup(
4040
name="cdtw",
41-
version="1.3.0",
41+
version="1.3.1",
4242
description="""
4343
Python C Extension for computing the DTW as fast as your bare metal allows.
4444
""",

‎aeneas/cew.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __copyright__ = """
99
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
1010
"""
1111
__license__ = "GNU AGPL v3"
12-
__version__ = "1.3.0"
12+
__version__ = "1.3.1"
1313
__email__ = "[email protected]"
1414
__status__ = "Production"
1515

‎aeneas/cew_setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2121
"""
2222
__license__ = "GNU AGPL v3"
23-
__version__ = "1.3.0"
23+
__version__ = "1.3.1"
2424
__email__ = "[email protected]"
2525
__status__ = "Production"
2626

@@ -36,7 +36,7 @@
3636

3737
setup(
3838
name="cew",
39-
version="1.3.0",
39+
version="1.3.1",
4040
description="""
4141
Python C Extension for synthesizing text with espeak.
4242
""",

‎aeneas/cmfcc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __copyright__ = """
99
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
1010
"""
1111
__license__ = "GNU AGPL v3"
12-
__version__ = "1.3.0"
12+
__version__ = "1.3.1"
1313
__email__ = "[email protected]"
1414
__status__ = "Production"
1515

‎aeneas/cmfcc_setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2323
"""
2424
__license__ = "GNU AGPL v3"
25-
__version__ = "1.3.0"
25+
__version__ = "1.3.1"
2626
__email__ = "[email protected]"
2727
__status__ = "Production"
2828

@@ -38,7 +38,7 @@
3838

3939
setup(
4040
name="cmfcc",
41-
version="1.3.0",
41+
version="1.3.1",
4242
description="""
4343
Python C Extension for computing the MFCCs as fast as your bare metal allows.
4444
""",

‎aeneas/container.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
3232
"""
3333
__license__ = "GNU AGPL v3"
34-
__version__ = "1.3.0"
34+
__version__ = "1.3.1"
3535
__email__ = "[email protected]"
3636
__status__ = "Production"
3737

‎aeneas/downloader.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
1818
"""
1919
__license__ = "GNU AGPL v3"
20-
__version__ = "1.3.0"
20+
__version__ = "1.3.1"
2121
__email__ = "[email protected]"
2222
__status__ = "Production"
2323

‎aeneas/dtw.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
4343
"""
4444
__license__ = "GNU AGPL v3"
45-
__version__ = "1.3.0"
45+
__version__ = "1.3.1"
4646
__email__ = "[email protected]"
4747
__status__ = "Production"
4848

‎aeneas/espeakwrapper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2323
"""
2424
__license__ = "GNU AGPL v3"
25-
__version__ = "1.3.0"
25+
__version__ = "1.3.1"
2626
__email__ = "[email protected]"
2727
__status__ = "Production"
2828

‎aeneas/executejob.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2626
"""
2727
__license__ = "GNU AGPL v3"
28-
__version__ = "1.3.0"
28+
__version__ = "1.3.1"
2929
__email__ = "[email protected]"
3030
__status__ = "Production"
3131

‎aeneas/executetask.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
3333
"""
3434
__license__ = "GNU AGPL v3"
35-
__version__ = "1.3.0"
35+
__version__ = "1.3.1"
3636
__email__ = "[email protected]"
3737
__status__ = "Production"
3838

‎aeneas/ffmpegwrapper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2020
"""
2121
__license__ = "GNU AGPL v3"
22-
__version__ = "1.3.0"
22+
__version__ = "1.3.1"
2323
__email__ = "[email protected]"
2424
__status__ = "Production"
2525

‎aeneas/ffprobewrapper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
2121
"""
2222
__license__ = "GNU AGPL v3"
23-
__version__ = "1.3.0"
23+
__version__ = "1.3.1"
2424
__email__ = "[email protected]"
2525
__status__ = "Production"
2626

‎aeneas/globalconstants.py

+22-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Copyright 2015, Alberto Pettarin (www.albertopettarin.it)
1414
"""
1515
__license__ = "GNU AGPL v3"
16-
__version__ = "1.3.0"
16+
__version__ = "1.3.1"
1717
__email__ = "[email protected]"
1818
__status__ = "Production"
1919

@@ -721,6 +721,27 @@
721721
722722
"""
723723

724+
PPN_TASK_OS_FILE_ID_REGEX = "os_task_file_id_regex"
725+
"""
726+
Key for the regex to be used for the fragment identifiers
727+
of the sync map output file.
728+
This parameter will be used only
729+
when the input text file has `plain` or `subtitles` format;
730+
for `parsed` and `unparsed` input text files, the identifiers
731+
contained in the input text file will be used instead.
732+
733+
Usage: config string, TXT config file, XML config file
734+
735+
Values: string
736+
737+
Example::
738+
739+
os_task_file_id_regex=f%06d
740+
os_task_file_id_regex=Word%03d
741+
742+
.. versionadded:: 1.3.1
743+
"""
744+
724745
PPN_TASK_OS_FILE_NAME = "os_task_file_name"
725746
"""
726747
Key for the file name of the sync map output file

0 commit comments

Comments
 (0)