recover from crashed video encoder (security-union#14)

Co-authored-by: Dario Lencina <dario@securityunion.dev>
Eastwooder · Nov 9, 2022 · c863193 · c863193
1 parent e0581c8
commit c863193
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/yew-ui/Cargo.toml b/yew-ui/Cargo.toml
@@ -40,6 +40,7 @@ features = [
     "GainNode",
     "HtmlDocument",
     "console",
+    "CodecState",
     "CanvasRenderingContext2d",
     "EncodedAudioChunk",
     "EncodedAudioChunkInit",

diff --git a/yew-ui/src/components/attendants.rs b/yew-ui/src/components/attendants.rs
@@ -147,8 +147,13 @@ impl Component for AttendandsComponent {
                                 && chunk_type == EncodedVideoChunkType::Key
                                 || !peer.waiting_for_video_keyframe
                             {
-                                peer.video_decoder.decode(&encoded_video_chunk);
-                                peer.waiting_for_video_keyframe = false;
+                                if peer.video_decoder.state() == CodecState::Configured {
+                                    peer.video_decoder.decode(&encoded_video_chunk);
+                                    peer.waiting_for_video_keyframe = false;
+                                } else if peer.video_decoder.state() == CodecState::Closed {
+                                    // Codec crashed, reconfigure it...
+                                    self.connected_peers.remove(&email.clone());
+                                }
                             }
                         }
                         media_packet::MediaType::AUDIO => {

diff --git a/yew-ui/src/components/host.rs b/yew-ui/src/components/host.rs
@@ -197,7 +197,7 @@ impl Component for Host {
                                     let mut opts = VideoEncoderEncodeOptions::new();
                                     counter = (counter + 1) % 50;
                                     opts.key_frame(counter == 0);
-                                    video_encoder.encode(&video_frame);
+                                    video_encoder.encode_with_options(&video_frame, &opts);
                                     video_frame.close();
                                 }
                                 Err(e) => {