Skip to content

fix(ffi): name the binary config type at catalog call sites #4171

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

Closed
kixelated wants to merge 1 commit into from
+5 −4
Closed

fix(ffi): name the binary config type at catalog call sites #4171

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
9 changes: 5 additions & 4 deletions rs/moq-ffi/src/binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

use std::sync::Arc;

use moq_mux::binary::Config;
use moq_mux::catalog::hang::Extra;

use crate::error::MoqError;
Expand All @@ -25,9 +26,9 @@ pub struct MoqBinaryConfig {
pub mime: Option<String>,
}

impl From<MoqBinaryConfig> for moq_mux::binary::Config {
impl From<MoqBinaryConfig> for Config {
fn from(config: MoqBinaryConfig) -> Self {
let mut out = moq_mux::binary::Config::default().with_compression(config.compression);
let mut out = Config::default().with_compression(config.compression);
if let Some(mime) = config.mime {
out = out.with_mime(mime);
}
Expand All @@ -48,7 +49,7 @@ impl MoqBroadcastProducer {
let _guard = crate::ffi::enter();
self.with_state(|state| {
let track = state.broadcast.create_track(name, None)?;
let producer = state.catalog.binary_snapshot(track, config.into())?;
let producer = state.catalog.binary_snapshot(track, Config::from(config))?;
Ok(Arc::new(MoqBinarySnapshotProducer {
inner: std::sync::Mutex::new(Some(producer)),
}))
Expand All @@ -66,7 +67,7 @@ impl MoqBroadcastProducer {
let _guard = crate::ffi::enter();
self.with_state(|state| {
let track = state.broadcast.create_track(name, None)?;
let producer = state.catalog.binary_stream(track, config.into())?;
let producer = state.catalog.binary_stream(track, Config::from(config))?;
Ok(Arc::new(MoqBinaryStreamProducer {
inner: std::sync::Mutex::new(Some(producer)),
}))
Expand Down
Loading