Skip to content

mxl-sink: Fix wrong write video/audio offset #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pedro-alves-ferreira wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mxl-sink: Fix wrong write video/audio offset #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 69 additions & 12 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rust/gst-mxl-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ license.workspace = true
ignored = ["regex"]

[dependencies]
crossbeam = "0.8.4"
glib = "0.21.5"
gstreamer = "0.24.4"
gstreamer-audio = "0.24.4"
Expand Down
55 changes: 34 additions & 21 deletions rust/gst-mxl-rs/src/mxlsink/imp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,20 @@ impl BaseSinkImpl for MxlSink {
)
})?;
let instance = init_mxl_instance(&settings)?;
let pipeline = self
.obj()
.parent()
.and_then(|p| p.downcast::<gst::Pipeline>().ok())
.ok_or(gst::error_msg!(
gst::CoreError::Failed,
["Failed to get pipeline"]
))?;
context.state = Some(State {
instance,
flow: None,
video: None,
audio: None,
pipeline,
});

Ok(())
Expand All @@ -276,29 +285,33 @@ impl BaseSinkImpl for MxlSink {
))?;

if state.audio.is_some() {
state
.audio
.take()
.ok_or(gst::error_msg!(
gst::CoreError::Failed,
["Failed to get audio state"]
))?
.writer
.destroy()
.map_err(|_| gst::error_msg!(gst::CoreError::Failed, ["Failed to destroy flow"]))?
};
let audio = state.audio.take().ok_or(gst::error_msg!(
gst::CoreError::Failed,
["Failed to get audio state"]
))?;
let (lock, cvar) = &*audio.sleep_flag;

let mut flag = lock.lock().map_err(|_| {
gst::error_msg!(gst::CoreError::Failed, ["Failed to get audio sleep lock"])
})?;
*flag = true;
cvar.notify_all();
drop(audio.tx);
}

if state.video.is_some() {
state
.video
.take()
.ok_or(gst::error_msg!(
gst::CoreError::Failed,
["Failed to get video state"]
))?
.writer
.destroy()
.map_err(|_| gst::error_msg!(gst::CoreError::Failed, ["Failed to destroy flow"]))?
let video = state.video.take().ok_or(gst::error_msg!(
gst::CoreError::Failed,
["Failed to get video state"]
))?;
let (lock, cvar) = &*video.sleep_flag;

let mut flag = lock.lock().map_err(|_| {
gst::error_msg!(gst::CoreError::Failed, ["Failed to get video sleep lock"])
})?;
*flag = true;
cvar.notify_all();
drop(video.tx);
}

gst::info!(CAT, imp = self, "Stopped");
Expand Down
Loading
Loading