Fix bitstream codec fallback and video stream detection

Author: Soddentrough

src/audio.rs

@@ -1329,12 +1329,22 @@ pub fn start_audio_thread(file_path: &str, mic: bool, shared_state: Arc<Mutex<Ap
         if passthrough {
             let (tx, rx) = bounded::<DspMessage>(32);
             let stop_token = Arc::new(std::sync::atomic::AtomicBool::new(false));
-            if let Ok((handle, decoder_rate)) = crate::bitstream::start_bitstream_thread(file_path, shared_state.clone(), tx.clone(), stop_token.clone()) {
+            if let Ok((handle, decoder_rate, codec_name, has_video)) = crate::bitstream::start_bitstream_thread(file_path, shared_state.clone(), tx.clone(), stop_token.clone()) {
                 let max_frequency = shared_state.lock().unwrap().max_frequency;
                 let sample_rate = decoder_rate;
                 let window_size = (((sample_rate as f32 * 0.185).round() as usize) / 2) * 2;
                 let window_size = window_size.max(2048).min(65536);
 
+                let display_name = match codec_name.as_str() {
+                    "truehd" => "TrueHD / Dolby Atmos",
+                    "eac3" => "E-AC3 / Dolby Digital Plus",
+                    "dts" => "DTS",
+                    "ac3" => "AC3 / Dolby Digital",
+                    _ => &codec_name,
+                }.to_string();
+                
+                let video_suffix = if has_video { " (Video stream available)" } else { "" };
+                
                 {
                     let mut state = shared_state.lock().unwrap();
                     state.artist = "Bitstream Active".to_string();
@@ -1346,7 +1356,7 @@ pub fn start_audio_thread(file_path: &str, mic: bool, shared_state: Arc<Mutex<Ap
                     state.hardware_channels = 8;
                     state.channel_vus = vec![0.0; 8];
                     state.peak_vus = vec![0.0; 8];
-                    state.video_info = Some("TrueHD/Atmos".to_string());
+                    state.video_info = Some(format!("{}{}", display_name, video_suffix));
                 }
 
                 spawn_dsp_thread(rx, shared_state.clone(), sample_rate, max_frequency, window_size);

src/bitstream.rs

@@ -4,7 +4,7 @@ pub fn start_bitstream_thread(
     _shared_state: std::sync::Arc<std::sync::Mutex<crate::state::AppState>>,
     tx: crossbeam_channel::Sender<crate::audio::DspMessage>,
     stop_token: std::sync::Arc<std::sync::atomic::AtomicBool>,
-) -> anyhow::Result<(std::thread::JoinHandle<()>, u32)> {
+) -> anyhow::Result<(std::thread::JoinHandle<()>, u32, String, bool)> {
     use anyhow::Context;
 
     println!("[bitstream] Probing codec via ffmpeg-next on Linux...");
@@ -29,6 +29,8 @@ pub fn start_bitstream_thread(
         _ => return Err(anyhow::anyhow!("Unsupported codec for bitstreaming: {:?}", codec_id)),
     }.to_string();
 
+    let has_video = ictx.streams().best(ffmpeg_next::media::Type::Video).is_some();
+
     let parameters = best_audio.parameters();
     let best_audio_index = best_audio.index();
 
@@ -193,7 +195,7 @@ pub fn start_bitstream_thread(
         println!("[bitstream] FFmpeg thread finished on Linux.");
     });
 
-    Ok((ffmpeg_thread, decoder_sample_rate as u32))
+    Ok((ffmpeg_thread, decoder_sample_rate as u32, codec_name, has_video))
 }
 
 #[cfg(not(any(target_os = "windows", target_os = "linux")))]
@@ -202,7 +204,7 @@ pub fn start_bitstream_thread(
     _shared_state: std::sync::Arc<std::sync::Mutex<crate::state::AppState>>,
     _tx: crossbeam_channel::Sender<crate::audio::DspMessage>,
     _stop_token: std::sync::Arc<std::sync::atomic::AtomicBool>,
-) -> anyhow::Result<(std::thread::JoinHandle<()>, u32)> {
+) -> anyhow::Result<(std::thread::JoinHandle<()>, u32, String, bool)> {
     Err(anyhow::anyhow!("Bitstream passthrough is not supported on this platform."))
 }
 #[cfg(windows)]
@@ -397,7 +399,7 @@ mod wasapi_bitstream {
 
     // ─── Main bitstream pump ─────────────────────────────────────────
 
-    pub fn start_bitstream_thread(file_path: &str, _shared_state: Arc<Mutex<AppState>>, tx: Sender<DspMessage>, stop_token: Arc<AtomicBool>) -> Result<(std::thread::JoinHandle<()>, u32)> {
+    pub fn start_bitstream_thread(file_path: &str, _shared_state: Arc<Mutex<AppState>>, tx: Sender<DspMessage>, stop_token: Arc<AtomicBool>) -> Result<(std::thread::JoinHandle<()>, u32, String, bool)> {
         unsafe { let _ = CoInitializeEx(None, COINIT_MULTITHREADED); }
 
         // ── Probe codec via ffmpeg-next ─────────────────────────────
@@ -420,9 +422,11 @@ mod wasapi_bitstream {
             ffmpeg_next::codec::Id::EAC3 => "eac3",
             ffmpeg_next::codec::Id::DTS => "dts",
             ffmpeg_next::codec::Id::AC3 => "ac3",
-            _ => "unknown",
+            _ => return Err(anyhow::anyhow!("Unsupported codec for bitstreaming: {:?}", codec_id)),
         }.to_string();
 
+        let has_video = ictx.streams().best(ffmpeg_next::media::Type::Video).is_some();
+
         let profiles = detect_codec_profile(&codec_name);
         println!("Detected codec: {}", codec_name);
         for p in &profiles {
@@ -779,7 +783,7 @@ mod wasapi_bitstream {
             println!("Bitstream thread finished.");
         });
 
-        Ok((handle, decoder_sample_rate))
+        Ok((handle, decoder_sample_rate, profile.name.to_string(), has_video))
     }
 }