From 53d5f0e14457452e8b35fe0ea8b81492c6c96adb Mon Sep 17 00:00:00 2001 From: VallierDev <24893073+VallierDev@users.noreply.github.com> Date: Wed, 28 Oct 2026 16:36:35 +0800 Subject: [PATCH] viewer: request key frames until the first frame is shown (#124) A session that joins a host already streaming to another viewer can receive a clean stream with no IDR in flight, so the loss-driven PLI never fired. Ask every 30 access units until something is presented, and warn after 300. Co-Authored-By: Claude Opus 5.5 --- src/viewer/desktop.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/viewer/desktop.rs b/src/viewer/desktop.rs index 2f1ab06..fd7fe4d 100644 --- a/src/viewer/desktop.rs +++ b/src/viewer/desktop.rs @@ -11,8 +11,14 @@ pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<() pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; } /// Counts only (access units, presented frames, decode errors) for the periodic stats line. pub static STATS:[std::sync::atomic::AtomicU64;3]=[std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0),std::sync::atomic::AtomicU64::new(0)]; +fn wants_key_frame(units:u64,presented:u64)->bool {presented==0 && units%30==0} pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:super::media::Codec,pli:&AtomicBool)->Result<(),String> { - STATS[0].fetch_add(1,Ordering::Relaxed); + let units=STATS[0].fetch_add(1,Ordering::Relaxed)+1; + // A later session can join a clean stream with no IDR in flight (#124): keep asking until a frame shows. + if wants_key_frame(units,STATS[1].load(Ordering::Relaxed)) { + pli.store(true,Ordering::Release); + if units==300 { log::warn!("Viewer desktop: no decodable frame after {units} access units; requesting key frames (another session may hold the host)"); } + } // Local diagnostic: UU_VIEWER_DUMP_H264=path appends the first 300 access units (owner's own stream). if codec==super::media::Codec::H264 && STATS[0].load(Ordering::Relaxed)<=300 { if let Some(path)=std::env::var_os("UU_VIEWER_DUMP_H264") { use std::io::Write; if let Ok(mut f)=std::fs::OpenOptions::new().create(true).append(true).open(path){let _=f.write_all(au);} @@ -32,5 +38,9 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s use super::*; struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}} struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}} + #[test] fn requests_key_frames_until_the_first_frame(){ + assert_eq!((1..=90).filter(|&n|wants_key_frame(n,0)).count(),3); + assert!(!(1..=90).any(|n|wants_key_frame(n,1))); + } #[test] fn decode_error_requests_pli_and_recovers(){let mut d=Mock(true);let mut s=Sink(0);let p=AtomicBool::new(false);display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert!(p.load(Ordering::Acquire));display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert_eq!(s.0,1);} }