Fix hevc decode error "Could not find ref with POC" (rustdesk#9960)

1. Dropping frames can cause this error, reset encoder when this happens. 2. There are some logic error for clear video queue, because video queue message is not cleared. This need to be fixed. Signed-off-by: 21pages <[email protected]>
MatthK · Nov 18, 2024 · c5426b0 · c5426b0
1 parent 8b710f6
commit c5426b0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs
@@ -15,7 +15,7 @@ use hbb_common::{
 };
 use hwcodec::{
     common::{
-        DataFormat,
+        DataFormat, HwcodecErrno,
         Quality::{self, *},
         RateControl::{self, *},
     },
@@ -31,6 +31,7 @@ const DEFAULT_PIXFMT: AVPixelFormat = AVPixelFormat::AV_PIX_FMT_NV12;
 pub const DEFAULT_FPS: i32 = 30;
 const DEFAULT_GOP: i32 = i32::MAX;
 const DEFAULT_HW_QUALITY: Quality = Quality_Default;
+pub const ERR_HEVC_POC: i32 = HwcodecErrno::HWCODEC_ERR_HEVC_COULD_NOT_FIND_POC as i32;
 
 crate::generate_call_macro!(call_yuv, false);
 

diff --git a/src/client.rs b/src/client.rs
@@ -2417,6 +2417,24 @@ where
                                     // to-do: fix the error
                                     log::error!("handle video frame error, {}", e);
                                     session.refresh_video(display as _);
+                                    #[cfg(feature = "hwcodec")]
+                                    if format == CodecFormat::H265 {
+                                        if let Some(&scrap::hwcodec::ERR_HEVC_POC) =
+                                            e.downcast_ref::<i32>()
+                                        {
+                                            for (i, handler_controler) in
+                                                handler_controller_map.iter_mut()
+                                            {
+                                                if *i != display
+                                                    && handler_controler.handler.decoder.format()
+                                                        == CodecFormat::H265
+                                                {
+                                                    log::info!("refresh video {} due to hevc poc not found", i);
+                                                    session.refresh_video(*i as _);
+                                                }
+                                            }
+                                        }
+                                    }
                                 }
                                 _ => {}
                             }

diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs
@@ -1146,9 +1146,13 @@ impl<T: InvokeUiSession> Remote<T> {
                             .ok();
                     } else {
                         if let Some(video_queue) = video_queue_write.get_mut(&display) {
-                            video_queue.force_push(vf);
+                            if video_queue.force_push(vf).is_some() {
+                                while let Some(_) = video_queue.pop() {}
+                                self.handler.refresh_video(display as _);
+                            } else {
+                                self.video_sender.send(MediaData::VideoQueue(display)).ok();
+                            }
                         }
-                        self.video_sender.send(MediaData::VideoQueue(display)).ok();
                     }
                     self.fps_control
                         .last_active_time