Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-24 20:48:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

media-converter: Don't hold state lock during pull_range

Browse Source
This commit is contained in:
Arkadiusz Hiler 2023-05-15 21:05:25 +03:00
parent eda653f413
commit 64465e595f
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
media-converter/src/videoconv/imp.rs
View File

@ -571,16 +571,8 @@ impl <'a> Read for StreamSerializer<'a> {
}
impl VideoConv {
fn range(
&self,
_pad: &gst::Pad,
offset: u64,
in_buf: Option<&mut gst::BufferRef>,
requested_size: u32,
) -> Result<gst::PadGetRangeSuccess, gst::FlowError> {
fn get_upstream_range(&self, offset: u64, requested_size: u32) -> Result<(u64, u32), gst::FlowError> {
let mut state = self.state.lock().unwrap();
let state = match &mut *state {
Some(s) => s,
None => { return Err(gst::FlowError::Error); }
@ -593,6 +585,24 @@ impl VideoConv {
let ups_offset = self.duration_ours_to_upstream(state, offset).unwrap();
let ups_requested_size = self.duration_ours_to_upstream(state, requested_size as u64).unwrap() as u32;
Ok((ups_offset, ups_requested_size))
}
fn range(
&self,
_pad: &gst::Pad,
offset: u64,
in_buf: Option<&mut gst::BufferRef>,
requested_size: u32,
) -> Result<gst::PadGetRangeSuccess, gst::FlowError> {
let (ups_offset, ups_requested_size) = self.get_upstream_range(offset, requested_size)?;
let mut state = self.state.lock().unwrap();
let state = match &mut *state {
Some(s) => s,
None => { return Err(gst::FlowError::Error); }
};
/* read and ignore upstream bytes */
self.sinkpad.pull_range(ups_offset, ups_requested_size)?;