Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add audio and audio mixing #118

Merged
merged 27 commits into from
Mar 28, 2023
Merged

Add audio and audio mixing #118

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
65e7d04
Add Audio and MixingInstruction to the class diagram
nigelmegitt Mar 1, 2023
0297c6b
WIP commit
nigelmegitt Mar 9, 2023
96eaf6c
Show shared properties in italics
nigelmegitt Mar 10, 2023
0e75f77
WIP changes
nigelmegitt Mar 10, 2023
7853b5f
Define TTML representation of Synthesized Audio
nigelmegitt Mar 10, 2023
d3d70fc
Note that Audio is abstract
nigelmegitt Mar 13, 2023
b6d585a
Label tidying
nigelmegitt Mar 13, 2023
739c06f
Add Audio Recording representation
nigelmegitt Mar 13, 2023
d6b1bdd
Add `xml:lang` constraints
nigelmegitt Mar 14, 2023
bb0f4f2
Add informative section explaining audio mixing
nigelmegitt Mar 14, 2023
9a65aa9
Reference audio recording question issues
nigelmegitt Mar 15, 2023
e4e3271
Reference issue #117.
nigelmegitt Mar 16, 2023
7d224cf
Add embedded audio example, clarify multiple Source, re-add content p…
nigelmegitt Mar 16, 2023
882a90d
Remove unnecessary conformance keywords
nigelmegitt Mar 16, 2023
53dabaa
Add `#source-data` extension and prohibit it
nigelmegitt Mar 16, 2023
9dd9524
Add and prohibit `#xmlLang-audio-nonMatching` extension
nigelmegitt Mar 16, 2023
91a0b7f
Fix up feature support for inline-only animation for mixing instructions
nigelmegitt Mar 17, 2023
461c571
Add issue #116 link below data model diagram
nigelmegitt Mar 17, 2023
585f100
Additional examples of audio
nigelmegitt Mar 17, 2023
16547a6
Show Source as an array not one property value
nigelmegitt Mar 17, 2023
9c4b250
Fix linting issues
nigelmegitt Mar 17, 2023
e4e8aea
Audio sources are not nodes
nigelmegitt Mar 17, 2023
fa49f45
Add note about extended descriptions
nigelmegitt Mar 17, 2023
35e9db3
Remove weird duplicate Layout section
nigelmegitt Mar 17, 2023
88a376b
Add space before : in enum abnf of `daptm:eventType`
nigelmegitt Mar 28, 2023
f2d0194
Move Audio Mixing to appendix
nigelmegitt Mar 28, 2023
1d7aa37
Address verbal review feedback
nigelmegitt Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions examples/audio-multiple-embedded-referenced-source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<tt>
<head>
<resources>
<data type="audio/wave" xml:id="audio1wav">
[base64-encoded WAV audio resource]
</data>
<data type="audio/mpeg" xml:id="audio1mp3">
[base64-encoded MP3 audio resource]
</data>
</resources>
</head>
<body>
..
<audio>
<source src="#audio1wav"/>
<source src="#audio1mp3"/>
</audio>
..
</body>
</tt>
4 changes: 4 additions & 0 deletions examples/audio-multiple-external-source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<audio>
<source src="https://example.com/audio.wav" type="audio/wave"/>
<source src="https://example.com/audio.aac" type="audio/aac"/>
</audio>
7 changes: 7 additions & 0 deletions examples/audio-single-embedded-inline-source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<audio>
<source>
<data type="audio/wave">
[base64-encoded WAV audio resource]
</data>
</source>
</audio>
14 changes: 14 additions & 0 deletions examples/audio-single-embedded-referenced-source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<tt>
<head>
<resources>
<data type="audio/wave" xml:id="audio1">
[base64-encoded WAV audio resource]
</data>
</resources>
</head>
<body>
..
<audio src="#audio1"/>
..
</body>
</tt>
1 change: 1 addition & 0 deletions examples/audio-single-external-source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<audio src="https://example.com/audio.wav" type="audio/wave"/>
13 changes: 13 additions & 0 deletions examples/intro-script-with-embedded-audio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
...
<div begin="25s" end="28s">
<p daptm:langSrc="original">
<animate begin="0.0s" end="0.3s" tta:gain="1;0.39" fill="freeze"/>
<animate begin="2.7s" end="3s" tta:gain="0.39;1"/>
<span begin="0.3s" end="2.7s">
<audio><source><data type="audio/wave">
[base64-encoded audio data]
</data></source></audio>
The sails billow in the wind.</span>
</p>
</div>
...
260 changes: 260 additions & 0 deletions figures/audio-mixing.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading