caption nangulator

2 files changed, 92 insertions, 74 deletions

diff --git a/playbook.md b/playbook.md
index 3e682542..23809cb1 100644
--- a/playbook.md
+++ b/playbook.md
@@ -53,8 +53,8 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left">STREAM</td>
-<td class="org-left">main organizer</td>
+<td class="org-left">B</td>
+<td class="org-left">&#xa0;</td>
 <td class="org-left">bandali</td>
 </tr>
 
@@ -68,7 +68,7 @@
 
 <tr>
 <td class="org-left">HOST</td>
-<td class="org-left">hosting, intros, reading, moving questions/answers around</td>
+<td class="org-left">hosting, streaming, intros, reading, moving questions/answers around</td>
 <td class="org-left">zaeph</td>
 </tr>
 </tbody>
@@ -154,7 +154,8 @@
     -   Share ${upcoming}, ${playbook}, and ${conf} via CRDT: `conf-crdt-connect-and-share`
         -   Current schedule, filenames/commands for playing, Q&A preference, IRC nick, pronunciation, intro notes, prerec duration, emergency contact information
         -   `conf-upcoming-add-subtree`
-    -   Have #emacsconf-org and #emacsconf open
+    -   Have #emacsconf-org, #emacsconf, #emacsconf-accessible, and #emacsconf-questions open
+    -   Use `/opall` to get op privileges in all the channels
     -   Start backup process for pad
         
             while true; do
@@ -165,6 +166,7 @@
         -   Open browser for joining BBB
         -   Open MPV for playing <https://live0.emacsconf.org/main.webm>
 -   HOST:
+    -   rsync the newest &#x2013;main.webm from front: rsync -avze ssh front:/var/www/media.emacsconf.org/2021/protected/\*&#x2013;main.webm .
     -   Check OBS scenes for sharing windows/tabs as a virtual camera:
         -   chat.emacsconf.org with #emacsconf
         -   Etherpad
@@ -175,25 +177,17 @@
         -   ${upcoming}
         -   \#emacsconf-org and #emacsconf channels
     -   (?) Join organizer room S
--   STREAM:
-    -   (?) Join organizer BBB room
-    -   Check OBS scenes
-        -   Prerecorded video in MPV
-        -   HOST's stream in MPV
-    -   Backchannel for easy viewing
 
 
 <a id="start-streaming"></a>
 
 ### Start streaming     :stream:
 
--   HOST: Display getting-ready message and start streaming to Icecast
--   STREAM: Load HOST stream in MPV
--   STREAM: Start streaming from OBS to local Icecast, relay to live0 icecast
+-   HOST: Display getting-ready message and start streaming to main.webm
 -   HOST: Confirm that the stream is live at <https://live.emacsconf.org/main.webm>
--   STREAM: Update ${status} to say that the stream is live
+-   B: Update ${status} to say that the stream is live
 -   CHECK: Start low-resolution stream, confirm at <https://live.emacsconf.org/main-480p.webm>
-    Call this on live0 with $CONF480PASS as the first parameter. The Icecast configuration is on `live0` at `/etc/icecast2/icecast.xml`.
+    Call this on live0 with $CONF480PASS as the first parameter. The Icecast configuration is on `live0` at <file:///ssh:live|sudo:/etc/icecast2/icecast.xml>=.
     
         PASS=$1
         while true; do ffmpeg -loglevel 24 -f webm -reconnect_at_eof 1 -reconnect_streamed 1  -re -i http://localhost:8000/main.webm -vf scale=854:480 -f webm -c:a copy -b:v 500k -maxrate 1M -bufsize 1M  -content_type video/webm -c:v libvpx icecast://ec2020main480pmu:$PASS@localhost:8000/main-480p.webm; done
@@ -202,8 +196,11 @@
         MOUNT=$1
         while true; do ffmpeg -loglevel 24 -i http://localhost:8000/main.webm -cluster_size_limit 2M -cluster_time_limit 5100 -b:v 1M -crf 30 -g 125 -deadline good -threads 4 -vcodec libx264 -acodec libmp3lame -f flv $MOUNT; done
 -   CHECK: Verify YouTube and Toobnix streams and the CPU load on live0.
--   HOST: Verify with #emacsconf that the stream is active.
+-   CHECK: Set the YouTube and Toobnix streams to public.
+-   B: Verify with #emacsconf that the stream is active.
 -   CHECK: Play main stream on alternate laptop. Start alternate stream and verify. Update ${status}.
+-   CHECK: Announce on Twitter (@emacs, @emacsconf, @sachac) and in #emacs
+    EmacsConf 2021 starting now: <https://emacsconf.org/2021/>
 
 
 <a id="talk"></a>
@@ -220,13 +217,30 @@ Exception: [CHECK is unavailable](#check-gone)
 -   Speaker checks in on #emacsconf-org via IRC or via e-mail ~30m before
 -   CHECK notes IRC nick for speaker.
 -   CHECK confirms Q&A preference: live/IRC/Etherpad, preferred way of getting questions
--   [? unknown] How would you like to handle questions today? Live video, #emacsconf, Etherpad?
--   [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help or if you want to get set up for live Q&A! (If the volume gets overwhelming, we can copy questions into #emacsconf-questions for you.)
--   [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help or if you want to get set up for live Q&A!
--   [? live] Are you thinking of handling questions over a web
-    conference? I'll set you up in a BigBlueButton room so that you can
-    get settled in. Let us know if you want to handle questions by IRC
-    or Etherpad instead.
+-   [? unknown] Thanks for checking in! How would you like to handle Q&A
+    today - live video, the collaborative Etherpad at
+    <https://etherpad.wikimedia.org/p/emacsconf-2021> , or IRC (like
+    this)?
+-   [? IRC] Thanks for checking in! Feel free to keep an eye on
+    \#emacsconf for questions and discussion, and we'll copy things from
+    the pad to there. If the volume gets overwhelming, let us know and
+    we can forward questions to #emacsconf-questions for you. If you'd
+    like to try Q&A over live video or the collaborative pad instead, or
+    if you need help, please let us know.
+-   [? Etherpad] Thanks for checking in! The collaborative pad we'll be
+    using for questions is at
+    <https://etherpad.wikimedia.org/p/emacsconf-2021> . We'll collect
+    questions from #emacsconf and put them there. If you'd like to jump
+    to your part of the document, you might be able to keep an eye on
+    questions. Please let us know if you need help, or if you want to
+    switch to live Q&A.
+-   [? live] Thanks for checking in! I'll send you some private messages
+    with instructions, so please check there. Let me know if you don't
+    get them.
+    -   Private messages:
+        -   (erc-message "PRIVMSG" (format "%s You can use this BBB room: %s . I'll join you there shortly to set up the room and do the last-minute tech check." nick room-url))
+        -   (erc-message "PRIVMSG" (format "%s The collaborative pad we'll be using for questions is at %s . We'll collect questions from #emacsconf and put them there. If you'd like to jump to your part of the document, you might be able to keep an eye on questions. Alternatively, we can read questions to you." nick conf-collaborative-pad))
+        -   (erc-message "PRIVMSG" (format "%s Leo Vivier will join when it's time, and he will give you the go-ahead when it's time to present. See you in the BBB room!" nick))
     -   CHECK directs speaker to available room with `/checkin <room> <nick>`
     -   Speaker joins talk room
     -   CHECK makes speaker presenter and moderator, does last-minute tech check
@@ -258,18 +272,17 @@ Exception: [CHECK is unavailable](#check-gone)
 -   CHECK announces the next talk on IRC and marks the previous talk as done. (`conf-announce`)
 -   PAD clears pad colours.
 -   [? prerec]
-    -   (TODO: needed?) STREAM and HOST switch to the organizer room in BBB.
-    -   STREAM switches to MPV scene in OBS and plays the video (with captions if available).
+    -   HOST switches to MPV scene in OBS and plays the video (with captions if available).
         -   Exception: [Last-minute prerecording submission](#last-minute-prerec)
         -   Exception: [Last-minute caption update](#last-minute-captions)
     -   [CHECK publishes information](#publish)
     -   [HOST gets a head start on handling Q&A](#questions)
-    -   When prerec finishes, STREAM switches to HOST stream in MPV.
+    -   When prerec finishes, HOST switches the OBS scene to show BBB.
 -   [? live]
     -   Exception: [Speaker does not have a prerec and has not checked in](#really-missing)
-    -   HOST joins the BBB room and double-checks that recording is on
+    -   HOST joins the BBB room and double-checks that recording is on.
     -   CHECK-alternate joins the BBB room and pauses main MPV.
-    -   STREAM switches to HOST stream in MPV.
+    -   HOST switches to OBS scene for BBB.
     -   Speaker presents.
         -   Exception: [Technical issues during a live presentation](#live-issues)
     -   [? talk needs to be wrapped up]
@@ -324,7 +337,7 @@ Exceptions:
     -   CHECK-alternate joins the BBB room and pauses MPV.
     -   HOST joins the BBB room
     -   HOST starts recording in BBB or confirms that it's already recording
-    -   STREAM switches to the HOST stream and gives HOST the go-ahead via IRC.
+    -   HOST switches to the BBB scene in OBS.
     -   HOST describes how to ask questions.
     -   [? No questions yet]
         -   HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
@@ -336,7 +349,6 @@ Exceptions:
     -   CHECK notes the time that the live Q&A finished and switches back to the main stream on CHECK-alternate.
 -   [? IRC/pad]
     -   HOST switches to pad/chat OBS scene.
-    -   STREAM switches to HOST view and gives HOST the go-ahead.
     -   HOST describes Q&A method and shows it on the screen.
     -   While there's buffer time before the next talk, HOST can read out
         questions and answers, or transition to the next talk early
@@ -345,11 +357,10 @@ Exceptions:
         so on IRC or the pad.
 -   [? speaker will answer after the conference]
     -   HOST switches to pad/chat OBS scene.
-    -   STREAM switches to HOST view and gives HOST the go-ahead.
     -   HOST says the speaker is not available right now, but we'll
         forward the questions to the speaker and we'll post the speaker's
         answers on the wiki page. Leave your contact information if you
-        want to be notified, or subscribe to the emacsconf-? mailing
+        want to be notified, or subscribe to the emacsconf-discuss mailing
         list to get the announcement. Please feel free to continue
         discussing the talk on IRC or the pad.
 -   [Present next talk](#present)
@@ -425,7 +436,7 @@ Exceptions:
 
 <a id="reallocated-prerec"></a>
 
-### CANCELLED Speaker whose talk was reallocated shows up and has a prerec
+### Speaker whose talk was reallocated shows up and has a prerec
 
 -   CHECK copies it to ${protected}
 -   Plan to play prerec at the end of the day, or in any gaps if a live talk falls through
@@ -433,7 +444,7 @@ Exceptions:
 
 <a id="reallocated-live"></a>
 
-### CANCELLED Speaker whose talk was reallocated shows up and wants to do it live
+### Speaker whose talk was reallocated shows up and wants to do it live
 
 -   See if there's enough time if buffers are shuffled back; if so, set up for a live presentation
 -   Check for alternate stream volunteers
@@ -515,8 +526,8 @@ Exceptions:
 
 ### HOST is unavailable
 
--   STREAM joins the BBB room and streams directly from there
--   Either STREAM or CHECK does hosting
+-   STREAM joins the BBB room and streams directly from there (or streams the prerecs).
+-   STREAM will do the hosting.
 
 
 <a id="live-issues"></a>
@@ -538,7 +549,7 @@ Exceptions:
 
 ### Big technical issues with streaming
 
--   HOST notifies #emacsconf and #emacsconf-org and pad
+-   HOST notifies #emacsconf and #emacsconf-org and adds a note at the top of the ${pad}.
 -   HOST updates the 2021.md wiki page
 -   CHECK publishes prerecordings
     -   media.emacsconf.org
diff --git a/playbook.org b/playbook.org
index 4f26ade4..d98e311d 100644
--- a/playbook.org
+++ b/playbook.org
@@ -13,9 +13,9 @@
 :CUSTOM_ID: roles
 :END:
 
-| STREAM | main organizer                                            | bandali |
-| CHECK  | check-ins                                                 | sachac  |
-| HOST   | hosting, intros, reading, moving questions/answers around | zaeph   |
+| B     |                                                                      | bandali |
+| CHECK | check-ins                                                            | sachac  |
+| HOST  | hosting, streaming, intros, reading, moving questions/answers around | zaeph   |
 
 | ${protected}     | [[/ssh:front:/var/www/media.emacsconf.org/2021/protected/]] |
 | ${stream-status} | [[/ssh:front:/var/www/live.emacsconf.org/index.html]] |
@@ -65,6 +65,7 @@
     - Open browser for joining BBB
     - Open MPV for playing https://live0.emacsconf.org/main.webm
 - HOST:
+  - rsync the newest --main.webm from front: rsync -avze ssh front:/var/www/media.emacsconf.org/2021/protected/*--main.webm .
   - Check OBS scenes for sharing windows/tabs as a virtual camera:
     - chat.emacsconf.org with #emacsconf
     - Etherpad
@@ -75,25 +76,17 @@
     - ${upcoming}
     - #emacsconf-org and #emacsconf channels
   - (?) Join organizer room S
-- STREAM:
-  - (?) Join organizer BBB room
-  - Check OBS scenes
-    - Prerecorded video in MPV
-    - HOST's stream in MPV
-  - Backchannel for easy viewing
     
 *** Start streaming                                                :stream:
 :PROPERTIES:
 :CUSTOM_ID: start-streaming
 :END:
 
-- HOST: Display getting-ready message and start streaming to Icecast
-- STREAM: Load HOST stream in MPV
-- STREAM: Start streaming from OBS to local Icecast, relay to live0 icecast
+- HOST: Display getting-ready message and start streaming to main.webm
 - HOST: Confirm that the stream is live at https://live.emacsconf.org/main.webm
-- STREAM: Update ${status} to say that the stream is live
+- B: Update ${status} to say that the stream is live
 - CHECK: Start low-resolution stream, confirm at https://live.emacsconf.org/main-480p.webm
-  Call this on live0 with $CONF480PASS as the first parameter. The Icecast configuration is on =live0= at =/etc/icecast2/icecast.xml=.
+  Call this on live0 with $CONF480PASS as the first parameter. The Icecast configuration is on =live0= at [[file:/ssh:live|sudo:/etc/icecast2/icecast.xml]]=.
   #+begin_src sh :eval no :tangle "playbook/restream-lowres.sh"
      PASS=$1
      while true; do ffmpeg -loglevel 24 -f webm -reconnect_at_eof 1 -reconnect_streamed 1  -re -i http://localhost:8000/main.webm -vf scale=854:480 -f webm -c:a copy -b:v 500k -maxrate 1M -bufsize 1M  -content_type video/webm -c:v libvpx icecast://ec2020main480pmu:$PASS@localhost:8000/main-480p.webm; done
@@ -105,7 +98,7 @@
   #+end_src
 - CHECK: Verify YouTube and Toobnix streams and the CPU load on live0.
 - CHECK: Set the YouTube and Toobnix streams to public.
-- HOST: Verify with #emacsconf that the stream is active.
+- B: Verify with #emacsconf that the stream is active.
 - CHECK: Play main stream on alternate laptop. Start alternate stream and verify. Update ${status}.
 - CHECK: Announce on Twitter (@emacs, @emacsconf, @sachac) and in #emacs
   EmacsConf 2021 starting now: https://emacsconf.org/2021/
@@ -124,13 +117,30 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
 - Speaker checks in on #emacsconf-org via IRC or via e-mail ~30m before
 - CHECK notes IRC nick for speaker.
 - CHECK confirms Q&A preference: live/IRC/Etherpad, preferred way of getting questions
-- [? unknown] How would you like to handle questions today? Live video, #emacsconf, Etherpad?
-- [? IRC] You can keep an eye on #emacsconf for questions and discussions related to your talk. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. We'll also copy questions from the Etherpad so that you can see them in one place. Let us know if you need help or if you want to get set up for live Q&A! (If the volume gets overwhelming, we can copy questions into #emacsconf-questions for you.)
-- [? Etherpad] The Etherpad is at ${etherpad-url} . Would you like to find the section for your talk and get comfortable? We'll copy questions from IRC over to the pad so that you can see them. Feel free to answer, skip answering, tell people that you'll follow up afterwards, etc. Let us know if you need help or if you want to get set up for live Q&A!
-- [? live] Are you thinking of handling questions over a web
-  conference? I'll set you up in a BigBlueButton room so that you can
-  get settled in. Let us know if you want to handle questions by IRC
-  or Etherpad instead.
+- [? unknown] Thanks for checking in! How would you like to handle Q&A
+          today - live video, the collaborative Etherpad at
+          https://etherpad.wikimedia.org/p/emacsconf-2021 , or IRC (like
+          this)?
+- [? IRC] Thanks for checking in! Feel free to keep an eye on
+          #emacsconf for questions and discussion, and we'll copy things from
+          the pad to there. If the volume gets overwhelming, let us know and
+          we can forward questions to #emacsconf-questions for you. If you'd
+          like to try Q&A over live video or the collaborative pad instead, or
+          if you need help, please let us know.
+- [? Etherpad] Thanks for checking in! The collaborative pad we'll be
+          using for questions is at
+          https://etherpad.wikimedia.org/p/emacsconf-2021 . We'll collect
+          questions from #emacsconf and put them there. If you'd like to jump
+          to your part of the document, you might be able to keep an eye on
+          questions. Please let us know if you need help, or if you want to
+          switch to live Q&A.
+- [? live] Thanks for checking in! I'll send you some private messages
+          with instructions, so please check there. Let me know if you don't
+          get them.
+  - Private messages:
+    - (erc-message "PRIVMSG" (format "%s You can use this BBB room: %s . I'll join you there shortly to set up the room and do the last-minute tech check." nick room-url))
+    - (erc-message "PRIVMSG" (format "%s The collaborative pad we'll be using for questions is at %s . We'll collect questions from #emacsconf and put them there. If you'd like to jump to your part of the document, you might be able to keep an eye on questions. Alternatively, we can read questions to you." nick conf-collaborative-pad))
+    - (erc-message "PRIVMSG" (format "%s Leo Vivier will join when it's time, and he will give you the go-ahead when it's time to present. See you in the BBB room!" nick))
   - CHECK directs speaker to available room with =/checkin <room> <nick>=
   - Speaker joins talk room
   - CHECK makes speaker presenter and moderator, does last-minute tech check
@@ -162,18 +172,17 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
 - CHECK announces the next talk on IRC and marks the previous talk as done. (=conf-announce=)
 - PAD clears pad colours.
 - [? prerec]
-  - (TODO: needed?) STREAM and HOST switch to the organizer room in BBB.
-  - STREAM switches to MPV scene in OBS and plays the video (with captions if available).
+  - HOST switches to MPV scene in OBS and plays the video (with captions if available).
     - Exception: [[*Last-minute prerecording submission][Last-minute prerecording submission]]
     - Exception: [[*Last-minute caption update][Last-minute caption update]]
   - [[*Publish information][CHECK publishes information]]
   - [[*Handle Q&A][HOST gets a head start on handling Q&A]]
-  - When prerec finishes, STREAM switches to HOST stream in MPV.
+  - When prerec finishes, HOST switches the OBS scene to show BBB.
 - [? live]
   - Exception: [[*Speaker does not have a prerec and has not checked in][Speaker does not have a prerec and has not checked in]]
-  - HOST joins the BBB room and double-checks that recording is on
+  - HOST joins the BBB room and double-checks that recording is on.
   - CHECK-alternate joins the BBB room and pauses main MPV.
-  - STREAM switches to HOST stream in MPV.
+  - HOST switches to OBS scene for BBB.
   - Speaker presents.
     - Exception: [[*Technical issues during a live presentation][Technical issues during a live presentation]]
   - [? talk needs to be wrapped up]
@@ -228,7 +237,7 @@ Exceptions:
   - CHECK-alternate joins the BBB room and pauses MPV.
   - HOST joins the BBB room
   - HOST starts recording in BBB or confirms that it's already recording
-  - STREAM switches to the HOST stream and gives HOST the go-ahead via IRC.
+  - HOST switches to the BBB scene in OBS.
   - HOST describes how to ask questions.
   - [? No questions yet]
     - HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
@@ -240,7 +249,6 @@ Exceptions:
   - CHECK notes the time that the live Q&A finished and switches back to the main stream on CHECK-alternate.
 - [? IRC/pad]
   - HOST switches to pad/chat OBS scene.
-  - STREAM switches to HOST view and gives HOST the go-ahead.
   - HOST describes Q&A method and shows it on the screen.
   - While there's buffer time before the next talk, HOST can read out
     questions and answers, or transition to the next talk early
@@ -249,11 +257,10 @@ Exceptions:
     so on IRC or the pad.
 - [? speaker will answer after the conference]
   - HOST switches to pad/chat OBS scene.
-  - STREAM switches to HOST view and gives HOST the go-ahead.
   - HOST says the speaker is not available right now, but we'll
     forward the questions to the speaker and we'll post the speaker's
     answers on the wiki page. Leave your contact information if you
-    want to be notified, or subscribe to the emacsconf-? mailing
+    want to be notified, or subscribe to the emacsconf-discuss mailing
     list to get the announcement. Please feel free to continue
     discussing the talk on IRC or the pad.
 - [[*Present talk][Present next talk]]
@@ -321,13 +328,13 @@ Exceptions:
       - invite another speaker for an impromptu extension; mplsCorwin will keep a list of possible speakers who are still active
       - replay a short prerec
       - let mplsCorwin or zaeph fill in
-*** CANCELLED Speaker whose talk was reallocated shows up and has a prerec
+*** Speaker whose talk was reallocated shows up and has a prerec
 :PROPERTIES:
 :CUSTOM_ID: reallocated-prerec
 :END:
 - CHECK copies it to ${protected}
 - Plan to play prerec at the end of the day, or in any gaps if a live talk falls through
-*** CANCELLED Speaker whose talk was reallocated shows up and wants to do it live
+*** Speaker whose talk was reallocated shows up and wants to do it live
 :PROPERTIES:
 :CUSTOM_ID: reallocated-live
 :END:
@@ -410,9 +417,9 @@ Exceptions:
 :CUSTOM_ID: host-gone
 :END:
 
-- STREAM joins the BBB room and streams directly from there
-- Either STREAM or CHECK does hosting
-    
+- STREAM joins the BBB room and streams directly from there (or streams the prerecs).
+- STREAM will do the hosting.
+      
 *** Technical issues during a live presentation
 :PROPERTIES:
 :CUSTOM_ID: live-issues
@@ -433,7 +440,7 @@ Exceptions:
 :CUSTOM_ID: stream-issues
 :END:
 
-- HOST notifies #emacsconf and #emacsconf-org and pad
+- HOST notifies #emacsconf and #emacsconf-org and adds a note at the top of the ${pad}.
 - HOST updates the 2021.md wiki page
 - CHECK publishes prerecordings
   - media.emacsconf.org