summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--2021/all-include.md8
-rw-r--r--2021/info/native-schedule.md6
-rw-r--r--2021/schedule-details.md4
-rw-r--r--playbook.org26
4 files changed, 34 insertions, 10 deletions
diff --git a/2021/all-include.md b/2021/all-include.md
index 0bd62591..32da5140 100644
--- a/2021/all-include.md
+++ b/2021/all-include.md
@@ -215,10 +215,10 @@
<div class="files resources"><ul><li><a href="emacsconf-2021-model--extending-the-model-of-emacs-to-other-applications--laszlo-krajnikovszkij--main.webm">Download .webm video (9:49, 8.6MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-model--extending-the-model-of-emacs-to-other-applications--laszlo-krajnikovszkij.org">Download .org</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-model--extending-the-model-of-emacs-to-other-applications--laszlo-krajnikovszkij--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/vsuuxy2SUsWpcLoeAtqJhG">View on Toobnix</a></li></ul></div></div>
</li>
<li><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" poster="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.png" id="mainVideo">
-<source src="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">
+<source src="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.vtt" default>
</video><figcaption><div class="title"><a href="https://emacsconf.org/2021/talks/native">Emacs Lisp native compiler, current status and future developments</a></div></figcaption>
<div class="speakers">Andrea Corallo</div></figure>
-<div class="files resources"><ul><li><a href="emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">Download .webm video (39:08, 40.8MB)</a></li><li><a href="https://toobnix.org/w/aCnFuNEzX1kMKJp3q31YKx">View on Toobnix</a></li></ul></div></div>
+<div class="files resources"><ul><li><a href="emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">Download .webm video (39:08, 40.8MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/aCnFuNEzX1kMKJp3q31YKx">View on Toobnix</a></li></ul></div></div>
</li>
<li><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" poster="https://media.emacsconf.org/2021/emacsconf-2021-form--old-mccarthy-had-a-form--ian-eure--main.png" id="mainVideo">
<source src="https://media.emacsconf.org/2021/emacsconf-2021-form--old-mccarthy-had-a-form--ian-eure--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-form--old-mccarthy-had-a-form--ian-eure--main.vtt" default>
@@ -263,10 +263,10 @@
<div class="files resources"><ul><li><a href="emacsconf-2021-clede--clede-the-common-lisp-emacs-development-environment--fermin-mf--main.webm">Download .webm video (18:55, 24.6MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-clede--clede-the-common-lisp-emacs-development-environment--fermin-mf--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/1HuHMank52gcpHqf4M7Sa5">View on Toobnix</a></li></ul></div></div>
</li>
<li><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" poster="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.png" id="mainVideo">
-<source src="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.vtt" default>
+<source src="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.vtt" default><track kind="chapters" label="Chapters" srclang="en" src="/2021/captions/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--chapters.vtt" default onload="displayChapters(this)">
</video><figcaption><div class="title"><a href="https://emacsconf.org/2021/talks/maintainers">How to help Emacs maintainers?</a></div></figcaption>
<div class="speakers">Bastien Guerry</div></figure>
-<div class="files resources"><ul><li><a href="emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.webm">Download .webm video (10:07, 9.5MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry.org">Download .org</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/naNvWzM2jjj5ownu9zmbAf">View on Toobnix</a></li></ul></div></div>
+<div class="files resources"><ul><li><a href="emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.webm">Download .webm video (10:07, 9.5MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry.org">Download .org</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-maintainers--how-to-help-emacs-maintainers---bastien-guerry--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/naNvWzM2jjj5ownu9zmbAf">View on Toobnix</a></li></ul></div><ol class="chapters"></ol></div>
</li>
<li><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" poster="https://media.emacsconf.org/2021/emacsconf-2021-build--how-to-build-an-emacs--fermin-mf--main.png" id="mainVideo">
<source src="https://media.emacsconf.org/2021/emacsconf-2021-build--how-to-build-an-emacs--fermin-mf--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-build--how-to-build-an-emacs--fermin-mf--main.vtt" default>
diff --git a/2021/info/native-schedule.md b/2021/info/native-schedule.md
index ab340281..6e64e0b9 100644
--- a/2021/info/native-schedule.md
+++ b/2021/info/native-schedule.md
@@ -7,10 +7,10 @@ Duration: 39:08
If you have questions and the speaker has not indicated public contact information on this page, please feel free to e-mail us at <emacsconf-submit@gnu.org> and we'll forward your question to the speaker.
-<div class="mainVideo"><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" id="mainVideo">
-<source src="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">
+<div class="mainVideo"><div class="video-card vid" data-id="mainVideo"><figure><video controls preload="metadata" poster="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.png" id="mainVideo">
+<source src="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm"><track label="English" kind="captions" srclang="en" src="/2021/captions/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.vtt" default>
</video></figure>
-<div class="files resources"><ul><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">Download .webm video (39:08, 40.8MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo.odp">Download .odp</a></li><li><a href="https://toobnix.org/w/aCnFuNEzX1kMKJp3q31YKx">View on Toobnix</a></li></ul></div></div>
+<div class="files resources"><ul><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.webm">Download .webm video (39:08, 40.8MB)</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo.odp">Download .odp</a></li><li><a href="https://media.emacsconf.org/2021/emacsconf-2021-native--emacs-lisp-native-compiler-current-status-and-future-developments--andrea-corallo--main.vtt">Download --main.vtt</a></li><li><a href="https://toobnix.org/w/aCnFuNEzX1kMKJp3q31YKx">View on Toobnix</a></li></ul></div></div>
</div>
# Description
diff --git a/2021/schedule-details.md b/2021/schedule-details.md
index ffd720dc..d5d60c24 100644
--- a/2021/schedule-details.md
+++ b/2021/schedule-details.md
@@ -1,4 +1,4 @@
-<div>45 talks total: 40 captioned (513 min), 5 waiting for captions (117 min)</div>
+<div>45 talks total: 41 captioned (524 min), 4 waiting for captions (106 min)</div>
<table width="100%"><tr><th>Status</th><th>Start</th><th>Title</th><th>Speaker(s)</th></tr><tr><td colspan="4"><strong>Saturday morning<strong></td></tr>
<tr><td></td><td width=100>~ 9:00 AM</td><td><a href="/2021/talks/day1-open">Opening remarks</a></td><td></td></tr>
<tr><td>done</td><td width=100>~ 9:19 AM</td><td><a href="/2021/talks/news">Emacs News Highlights</a></td><td>Sacha Chua</td></tr>
@@ -52,7 +52,7 @@
<tr><td>done</td><td width=100>~ 3:25 PM</td><td><a href="/2021/talks/maintainers">How to help Emacs maintainers?</a></td><td>Bastien Guerry</td></tr>
<tr><td>done</td><td width=100>~ 3:52 PM</td><td><a href="/2021/talks/build">How to build an Emacs</a></td><td>Fermin MF</td></tr>
<tr><td>done</td><td width=100>~ 4:15 PM</td><td><a href="/2021/talks/forever">M-x Forever: Why Emacs will outlast text editor trends</a></td><td>David Wilson (System Crafters)</td></tr>
-<tr><td></td><td width=100>~ 4:56 PM</td><td><a href="/2021/talks/day2-close">Closing remarks day 2</a></td><td></td></tr></table><div class="cancelled">Cancelled:<ul><li><a href="/2021/talks/dsl">Self-Describing Smart DSL's: The Next Magits</a> - Psionic</li>
+<tr><td>now playing</td><td width=100>~ 5:07 PM</td><td><a href="/2021/talks/day2-close">Closing remarks day 2</a></td><td></td></tr></table><div class="cancelled">Cancelled:<ul><li><a href="/2021/talks/dsl">Self-Describing Smart DSL's: The Next Magits</a> - Psionic</li>
<li><a href="/2021/talks/devel">Don't write that package! or: How I learned to stop worrying and love emacs-devel</a> - Stefan Kangas</li>
<li><a href="/2021/talks/rust">Extending Emacs in Rust with Dynamic Modules</a> - Tuấn-Anh Nguyễn</li>
<li><a href="/2021/talks/bug">Let's talk about bug trackers</a> - Bastien Guerry</li></ul></div> \ No newline at end of file
diff --git a/playbook.org b/playbook.org
index ceb50604..db03fac4 100644
--- a/playbook.org
+++ b/playbook.org
@@ -30,6 +30,31 @@
| ${live-alt} | [[/ssh:front:/var/www/live.emacsconf.org/alt.html]] |
| ${profile} | [[/ssh:live:~/.profile]] |
+* After the conference
+** Update captions
+
+- Merge them into the video with =add-captions.sh=
+ #+begin_src sh :eval no
+ #!/usr/bin/zsh
+ BASE="${1%.*}"
+ BASE="${BASE%--main}"
+ ffmpeg -y -i "$1" ${BASE}--main.vtt
+ if [ -f "${BASE}--normalized.webm" ]; then
+ ffmpeg -y -i "$1" -i "${BASE}--normalized.webm" -c:a copy -c:v copy "${BASE}--captioned.webm"
+ else
+ ffmpeg -y -i "$1" -i "${BASE}--compressed.webm" -c:a copy -c:v copy "${BASE}--captioned.webm"
+ fi
+ cp ${BASE}--main.vtt ${BASE}--chapters.vtt ~/vendor/emacsconf-wiki/2021/captions
+ scp "${BASE}--captioned.webm" "${BASE}--main.webm"
+ scp "${BASE}--main.webm" front:~/protected
+ scp "${BASE}--main.vtt" front:~/protected
+ scp "${BASE}--chapters.vtt" front:~/protected
+ ssh front 'cd protected; chmod ugo+r *'
+ #+end_src
+- Update Toobnix and Youtube captions with =conf-video-share=.
+- Update Toobnix and Youtube descriptions with chapters.
+- Update ${conf-year}/${captions}/${slug}.md in the wiki. To make this from scratch, use =M-x conf-prepare-transcript-directives= from the talk heading in the conference Org file.
+
* Thursday or Friday before the conference
:PROPERTIES:
:CUSTOM_ID: days-before
@@ -39,7 +64,6 @@
#+begin_src sh :eval no
rsync -avzue ssh front:/var/www/media.emacsconf.org/2021/protected/*--main.webm .
#+end_src
-
* On the day of the conference
:PROPERTIES:
:CUSTOM_ID: day-of