Merge branch 'rustdesk:master' into master

zhangbo8418 · Nov 22, 2024 · 0648aca · 0648aca
2 parents 7d3a0cb + 28d38cd
commit 0648aca
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 19 deletions.
diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
@@ -24,8 +24,8 @@ env:
   SCITER_ARMV7_CMAKE_VERSION: "3.29.7"
   SCITER_NASM_DEBVERSION: "2.14-1"
   LLVM_VERSION: "15.0.6"
-  FLUTTER_VERSION: "3.24.4"
-  ANDROID_FLUTTER_VERSION: "3.24.4"
+  FLUTTER_VERSION: "3.24.5"
+  ANDROID_FLUTTER_VERSION: "3.24.5"
   # for arm64 linux because official Dart SDK does not work
   FLUTTER_ELINUX_VERSION: "3.16.9"
   TAG_NAME: "${{ inputs.upload-tag }}"
@@ -118,7 +118,7 @@ jobs:
         run: |
           cp .github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff $(dirname $(dirname $(which flutter)))
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@v1
@@ -495,7 +495,7 @@ jobs:
       - name: Patch flutter
         run: |
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       - name: Setup vcpkg with Github Actions binary cache
         uses: lukka/run-vcpkg@v11
@@ -701,7 +701,7 @@ jobs:
       - name: Patch flutter
         run: |
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       - name: Workaround for flutter issue
         shell: bash
@@ -942,7 +942,7 @@ jobs:
       - name: Patch flutter
         run: |
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
@@ -1219,7 +1219,7 @@ jobs:
       - name: Patch flutter
         run: |
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       - name: Restore bridge files
         uses: actions/download-artifact@master
@@ -1570,7 +1570,7 @@ jobs:
               ;;
             esac
 
-            if [[ "3.24.4" == ${{ env.FLUTTER_VERSION }} ]]; then
+            if [[ "3.24.5" == ${{ env.FLUTTER_VERSION }} ]]; then
               case ${{ matrix.job.arch }} in
                 aarch64)
                   pushd /opt/flutter-elinux/flutter
@@ -2057,7 +2057,7 @@ jobs:
         shell: bash
         run: |
           cd $(dirname $(dirname $(which flutter)))
-          [[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
+          [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 
       # https://rustdesk.com/docs/en/dev/build/web/
       - name: Build web

diff --git a/libs/scrap/src/common/record.rs b/libs/scrap/src/common/record.rs
@@ -158,6 +158,7 @@ impl Recorder {
                 #[cfg(not(feature = "hwcodec"))]
                 _ => bail!("unsupported codec type"),
             };
+            // pts is None when new inner is created
             self.pts = None;
             self.send_state(RecordState::NewFile(ctx2.filename.clone()));
         }
@@ -194,33 +195,33 @@ impl Recorder {
         match frame {
             video_frame::Union::Vp8s(vp8s) => {
                 for f in vp8s.frames.iter() {
-                    self.check_pts(f.pts, w, h, format)?;
+                    self.check_pts(f.pts, f.key, w, h, format)?;
                     self.as_mut().map(|x| x.write_video(f));
                 }
             }
             video_frame::Union::Vp9s(vp9s) => {
                 for f in vp9s.frames.iter() {
-                    self.check_pts(f.pts, w, h, format)?;
+                    self.check_pts(f.pts, f.key, w, h, format)?;
                     self.as_mut().map(|x| x.write_video(f));
                 }
             }
             video_frame::Union::Av1s(av1s) => {
                 for f in av1s.frames.iter() {
-                    self.check_pts(f.pts, w, h, format)?;
+                    self.check_pts(f.pts, f.key, w, h, format)?;
                     self.as_mut().map(|x| x.write_video(f));
                 }
             }
             #[cfg(feature = "hwcodec")]
             video_frame::Union::H264s(h264s) => {
                 for f in h264s.frames.iter() {
-                    self.check_pts(f.pts, w, h, format)?;
+                    self.check_pts(f.pts, f.key, w, h, format)?;
                     self.as_mut().map(|x| x.write_video(f));
                 }
             }
             #[cfg(feature = "hwcodec")]
             video_frame::Union::H265s(h265s) => {
                 for f in h265s.frames.iter() {
-                    self.check_pts(f.pts, w, h, format)?;
+                    self.check_pts(f.pts, f.key, w, h, format)?;
                     self.as_mut().map(|x| x.write_video(f));
                 }
             }
@@ -230,8 +231,18 @@ impl Recorder {
         Ok(())
     }
 
-    fn check_pts(&mut self, pts: i64, w: usize, h: usize, format: CodecFormat) -> ResultType<()> {
+    fn check_pts(
+        &mut self,
+        pts: i64,
+        key: bool,
+        w: usize,
+        h: usize,
+        format: CodecFormat,
+    ) -> ResultType<()> {
         // https://stackoverflow.com/questions/76379101/how-to-create-one-playable-webm-file-from-two-different-video-tracks-with-same-c
+        if self.pts.is_none() && !key {
+            bail!("first frame is not key frame");
+        }
         let old_pts = self.pts;
         self.pts = Some(pts);
         if old_pts.clone().unwrap_or_default() > pts {
@@ -342,7 +353,7 @@ impl Drop for WebmRecorder {
 
 #[cfg(feature = "hwcodec")]
 struct HwRecorder {
-    muxer: Muxer,
+    muxer: Option<Muxer>,
     ctx: RecorderContext,
     ctx2: RecorderContext2,
     written: bool,
@@ -362,7 +373,7 @@ impl RecorderApi for HwRecorder {
         })
         .map_err(|_| anyhow!("Failed to create hardware muxer"))?;
         Ok(HwRecorder {
-            muxer,
+            muxer: Some(muxer),
             ctx,
             ctx2,
             written: false,
@@ -376,7 +387,11 @@ impl RecorderApi for HwRecorder {
             self.key = true;
         }
         if self.key {
-            let ok = self.muxer.write_video(&frame.data, frame.key).is_ok();
+            let ok = self
+                .muxer
+                .as_mut()
+                .map(|m| m.write_video(&frame.data, frame.key).is_ok())
+                .unwrap_or_default();
             if ok {
                 self.written = true;
             }
@@ -390,9 +405,11 @@ impl RecorderApi for HwRecorder {
 #[cfg(feature = "hwcodec")]
 impl Drop for HwRecorder {
     fn drop(&mut self) {
-        self.muxer.write_tail().ok();
+        self.muxer.as_mut().map(|m| m.write_tail().ok());
         let mut state = RecordState::WriteTail;
         if !self.written || self.start.elapsed().as_secs() < MIN_SECS {
+            // The process cannot access the file because it is being used by another process
+            self.muxer = None;
             std::fs::remove_file(&self.ctx2.filename).ok();
             state = RecordState::RemoveFile;
         }