Skip to content

Commit dd00f27

Browse files
committed
Ignore placeholder macOS device IDs; clamp end time
1 parent c462bc5 commit dd00f27

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

crates/camera/src/macos.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ impl ModelID {
6262
let vid = unique_id[unique_id.len() - 2 * 4..unique_id.len() - 4].to_string();
6363
let pid = unique_id[unique_id.len() - 4..].to_string();
6464

65+
if vid == "0000" && pid == "0001" {
66+
return None;
67+
}
68+
6569
Some(Self { vid, pid })
6670
}
6771
}

crates/enc-avfoundation/src/mp4.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,11 @@ impl MP4Encoder {
602602

603603
let mut end_session_time = end_timestamp.saturating_sub(self.timestamp_offset);
604604

605+
if let Some(last_video_pts) = self.last_video_pts {
606+
let min_video_end = last_video_pts.saturating_add(self.video_frame_duration());
607+
end_session_time = end_session_time.max(min_video_end);
608+
}
609+
605610
if let Some(audio_end_pts) = self.last_audio_end_pts
606611
&& let Some(timescale) = self.last_audio_timescale
607612
&& timescale > 0

0 commit comments

Comments
 (0)