unom/punktfunk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 26 Wiki Activity

fix(qsv): end the inner borrow before the retarget param rebuild

Browse Source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Enrico Bühler
2026-07-17 19:39:08 +02:00
parent 55e7f3fca9
commit 75d1322b8a
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pf-encode/src/enc/windows/qsv.rs
+7 -1
View File
@@ -1401,6 +1401,10 @@ impl Encoder for QsvEncoder {
/// requires completed sync operations, so the in-flight window is drained (into `ready`) /// requires completed sync operations, so the in-flight window is drained (into `ready`)
/// first; a drain that can't finish inside the budget falls back to the caller's rebuild. /// first; a drain that can't finish inside the budget falls back to the caller's rebuild.
fn reconfigure_bitrate(&mut self, bps: u64) -> bool { fn reconfigure_bitrate(&mut self, bps: u64) -> bool {
// Drain phase in its own scope so the `inner` borrow ends before the param rebuild
// below reads `self` again (the raw session pointer stays valid — `self.inner` is not
// touched in between).
let session = {
let Some(inner) = self.inner.as_mut() else { let Some(inner) = self.inner.as_mut() else {
self.bitrate_bps = bps; self.bitrate_bps = bps;
return true; return true;
@@ -1425,6 +1429,8 @@ impl Encoder for QsvEncoder {
} }
} }
} }
inner.session.0
};
let old = self.bitrate_bps; let old = self.bitrate_bps;
self.bitrate_bps = bps; self.bitrate_bps = bps;
let cfg = self.encode_config(); let cfg = self.encode_config();
@@ -1441,7 +1447,7 @@ impl Encoder for QsvEncoder {
set.par.NumExtParam = set.ptrs.len() as u16; set.par.NumExtParam = set.ptrs.len() as u16;
// SAFETY: session live on this thread, no operation in flight (drained above); the // SAFETY: session live on this thread, no operation in flight (drained above); the
// param block + ext chain outlive the synchronous call. // param block + ext chain outlive the synchronous call.
let sts = unsafe { vpl::MFXVideoENCODE_Reset(inner.session.0, &mut set.par) }; let sts = unsafe { vpl::MFXVideoENCODE_Reset(session, &mut set.par) };
if sts < vpl::MFX_ERR_NONE { if sts < vpl::MFX_ERR_NONE {
tracing::warn!( tracing::warn!(
mbps = bps / 1_000_000, mbps = bps / 1_000_000,