Fix ffmpeg audio decoding

dontpanic92 · Mar 31, 2024 · a572060 · a572060
1 parent 6791cd3
commit a572060
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/radiance/radiance/src/imgui/platform/windows.rs b/radiance/radiance/src/imgui/platform/windows.rs
@@ -1,4 +1,4 @@
-use std::{cell::RefCell, collections::HashMap, ptr::null_mut, rc::Rc, time::Duration};
+use std::{cell::RefCell, collections::HashMap, ptr::null_mut, rc::Rc};
 
 use imgui::{BackendFlags, ConfigFlags, Context, Key};
 use winapi::{

diff --git a/radiance/radiance/src/rendering/vulkan/buffer.rs b/radiance/radiance/src/rendering/vulkan/buffer.rs
@@ -4,7 +4,7 @@ use ash::vk;
 use std::error::Error;
 use std::mem::size_of;
 use std::rc::Rc;
-use vma::{self, Alloc};
+use vma::Alloc;
 
 pub enum BufferType {
     Index = 0,

diff --git a/radiance/radiance/src/rendering/vulkan/vulkan_engine.rs b/radiance/radiance/src/rendering/vulkan/vulkan_engine.rs
@@ -20,7 +20,6 @@ use crate::{
 use ash::extensions::ext::DebugUtils;
 use ash::{vk, Entry};
 use crosscom::ComRc;
-use std::iter::Iterator;
 use std::ptr;
 use std::rc::Rc;
 use std::sync::Arc;

diff --git a/yaobow/shared/src/video/ffmpeg.rs b/yaobow/shared/src/video/ffmpeg.rs
@@ -755,13 +755,17 @@ fn resample_source_frame(
     let mut resampled_frame = AudioFrame::empty();
     let mut delay = context.run(source_frame, &mut resampled_frame).unwrap();
     resampled_frames.push(resampled_frame);
-    while let Some(_) = delay {
-        let mut resampled_frame = AudioFrame::empty();
-        resampled_frame.set_channel_layout(audio.target_channel_layout);
-        resampled_frame.set_format(audio.target_format);
-        resampled_frame.set_rate(audio.target_sample_rate);
-        delay = context.flush(&mut resampled_frame).unwrap();
-        resampled_frames.push(resampled_frame);
+    while let Some(d) = delay {
+        if d.input > source_frame.samples() as i64 {
+            let mut resampled_frame = AudioFrame::empty();
+            resampled_frame.set_channel_layout(audio.target_channel_layout);
+            resampled_frame.set_format(audio.target_format);
+            resampled_frame.set_rate(audio.target_sample_rate);
+            delay = context.flush(&mut resampled_frame).unwrap();
+            resampled_frames.push(resampled_frame);
+        } else {
+            break;
+        }
     }
 
     resampled_frames