servius/jello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add keybinds to minimal example

Browse Source
This commit is contained in:
uttarayan21
2025-12-25 21:43:55 +05:30
parent a2491695b3
commit 4ed15c97f0
13 changed files with 156 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -3388,7 +3388,7 @@ dependencies = [
"gstreamer 0.24.4", "gstreamer 0.24.4",
"gstreamer-app 0.24.4", "gstreamer-app 0.24.4",
"gstreamer-base 0.24.4", "gstreamer-base 0.24.4",
"gstreamer-video 0.23.6", "gstreamer-video 0.24.4",
"pollster 0.4.0", "pollster 0.4.0",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",

50
crates/iced-video/examples/minimal.rs
View File

@@ -10,7 +10,37 @@ pub fn main() -> iced::Result {
) )
.with(tracing_subscriber::EnvFilter::from_default_env()) .with(tracing_subscriber::EnvFilter::from_default_env())
.init(); .init();
iced::application(State::new, update, view).run() iced::application(State::new, update, view)
.subscription(keyboard_event)
.run()
}
fn keyboard_event(state: &State) -> iced::Subscription<Message> {
use iced::keyboard::{Key, key::Named};
iced::keyboard::listen().map(move |event| match event {
iced::keyboard::Event::KeyPressed { key, .. } => {
let key = key.as_ref();
match key {
Key::Named(Named::Escape) | Key::Character("q") => Message::Quit,
Key::Named(Named::Space) => Message::Toggle,
_ => Message::Load,
}
// if key == &space {
// // Toggle play/pause
// let is_playing = state
// .video
// .source()
// .is_playing()
// .expect("Failed to get playing state");
// if is_playing {
// Message::Pause
// } else {
// Message::Play
// }
// }
}
_ => Message::Load,
})
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -22,6 +52,8 @@ impl State {
pub fn new() -> Self { pub fn new() -> Self {
let video = VideoHandle::new("https://jellyfin.tsuba.darksailor.dev/Items/6010382cf25273e624d305907010d773/Download?api_key=036c140222464878862231ef66a2bc9c") let video = VideoHandle::new("https://jellyfin.tsuba.darksailor.dev/Items/6010382cf25273e624d305907010d773/Download?api_key=036c140222464878862231ef66a2bc9c")
.expect("Failed to create video handle"); .expect("Failed to create video handle");
// let video = VideoHandle::new("file:///run/user/1000/gvfs/smb-share:server=tsuba.darksailor.dev,share=nas/Movies/Spider-Man - No Way Home (2021)/Spider-Man.No.Way.Home.2021.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR.mkv")
// .expect("Failed to create video handle");
Self { video } Self { video }
} }
} }
@@ -30,16 +62,18 @@ impl State {
pub enum Message { pub enum Message {
Play, Play,
Pause, Pause,
Loaded, Toggle,
Load, Load,
Quit,
} }
pub fn update(state: &mut State, message: Message) -> iced::Task<Message> { pub fn update(state: &mut State, message: Message) -> iced::Task<Message> {
match message { match message {
Message::Load => { Message::Load => {
// does stuff // does stuff
let src = state.video.source().clone(); // let src = state.video.source().clone();
iced::Task::perform(src.wait(), |_| Message::Loaded) // iced::Task::perform(src.wait(), |_| Message::Loaded)
iced::Task::none()
} }
Message::Play => { Message::Play => {
state.video.source().play().expect("Failed to play video"); state.video.source().play().expect("Failed to play video");
@@ -49,10 +83,14 @@ pub fn update(state: &mut State, message: Message) -> iced::Task<Message> {
state.video.source().pause().expect("Failed to pause video"); state.video.source().pause().expect("Failed to pause video");
iced::Task::none() iced::Task::none()
} }
Message::Loaded => { Message::Toggle => {
// Video loaded state.video.source().toggle().expect("Failed to stop video");
iced::Task::none() iced::Task::none()
} }
Message::Quit => {
state.video.source().stop().expect("Failed to stop video");
std::process::exit(0);
}
} }
} }

11
crates/iced-video/src/primitive.rs
View File

@@ -9,7 +9,7 @@ pub struct VideoFrame {
pub id: id::Id, pub id: id::Id,
pub size: wgpu::Extent3d, pub size: wgpu::Extent3d,
pub ready: Arc<AtomicBool>, pub ready: Arc<AtomicBool>,
pub frame: Arc<Mutex<gst::app::Sample>>, pub frame: Arc<Mutex<gst::Sample>>,
} }
impl iced_wgpu::Primitive for VideoFrame { impl iced_wgpu::Primitive for VideoFrame {
@@ -97,7 +97,6 @@ impl iced_wgpu::Primitive for VideoFrame {
video.bind_group = new_bind_group; video.bind_group = new_bind_group;
} }
if video.ready.load(std::sync::atomic::Ordering::SeqCst) { if video.ready.load(std::sync::atomic::Ordering::SeqCst) {
let now = std::time::Instant::now();
let frame = self.frame.lock().expect("BUG: Mutex poisoned"); let frame = self.frame.lock().expect("BUG: Mutex poisoned");
let buffer = frame let buffer = frame
.buffer() .buffer()
@@ -110,7 +109,6 @@ impl iced_wgpu::Primitive for VideoFrame {
video video
.ready .ready
.store(false, std::sync::atomic::Ordering::SeqCst); .store(false, std::sync::atomic::Ordering::SeqCst);
tracing::info!("{:?} Taken to write to surface texture", now.elapsed());
} }
} }
@@ -148,12 +146,7 @@ impl iced_wgpu::Primitive for VideoFrame {
view: target, view: target,
resolve_target: None, resolve_target: None,
ops: wgpu::Operations { ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(wgpu::Color { load: wgpu::LoadOp::Load,
r: 0.1,
g: 0.2,
b: 0.3,
a: 1.0,
}),
store: wgpu::StoreOp::Store, store: wgpu::StoreOp::Store,
}, },
depth_slice: None, depth_slice: None,

69
crates/iced-video/src/source.rs
View File

@@ -13,11 +13,11 @@ use std::sync::{Arc, Mutex, atomic::AtomicBool};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct VideoSource { pub struct VideoSource {
pub(crate) playbin: Playbin3, pub(crate) playbin: Playbin3,
// pub(crate) videoconvert: VideoConvert, pub(crate) videoconvert: VideoConvert,
pub(crate) appsink: AppSink, pub(crate) appsink: AppSink,
pub(crate) bus: Bus, pub(crate) bus: Bus,
pub(crate) ready: Arc<AtomicBool>, pub(crate) ready: Arc<AtomicBool>,
pub(crate) frame: Arc<Mutex<gst::app::Sample>>, pub(crate) frame: Arc<Mutex<gst::Sample>>,
} }
impl VideoSource { impl VideoSource {
@@ -26,31 +26,35 @@ impl VideoSource {
/// now. /// now.
pub fn new(url: impl AsRef<str>) -> Result<Self> { pub fn new(url: impl AsRef<str>) -> Result<Self> {
Gst::new(); Gst::new();
// let videoconvert = VideoConvert::new("iced-video-convert") let videoconvert = VideoConvert::new("iced-video-convert")
// // .change_context(Error)? // .change_context(Error)?
// // .with_output_format(gst::plugins::videoconvertscale::VideoFormat::Rgba) // .with_output_format(gst::plugins::videoconvertscale::VideoFormat::Rgba)
// .change_context(Error)?; .change_context(Error)?;
let appsink = AppSink::new("iced-video-sink") let mut appsink = AppSink::new("iced-video-sink").change_context(Error)?;
.change_context(Error)? appsink
.with_drop(true); .drop(true)
// .with_caps( .sync(true)
// Caps::builder(CapsType::Video) .async_(true)
// .field("format", "RGBA") .emit_signals(true)
// .build(), .caps(
// ); Caps::builder(CapsType::Video)
// let video_sink = videoconvert.link(&appsink).change_context(Error)?; .field("format", "RGBA")
.build(),
);
let video_sink = videoconvert.link(&appsink).change_context(Error)?;
let playbin = gst::plugins::playback::Playbin3::new("iced-video") let playbin = gst::plugins::playback::Playbin3::new("iced-video")
.change_context(Error)? .change_context(Error)?
.with_uri(url.as_ref()) .with_uri(url.as_ref())
.with_buffer_duration(core::time::Duration::from_secs(2)) .with_buffer_duration(core::time::Duration::from_secs(2))
.with_buffer_size(2000000) .with_buffer_size(4096 * 4096 * 4 * 3)
.with_video_sink(&appsink); .with_ring_buffer_max_size(4096 * 4096 * 4 * 3)
.with_video_sink(&video_sink);
let bus = playbin.bus().change_context(Error)?; let bus = playbin.bus().change_context(Error)?;
playbin.pause().change_context(Error)?; playbin.pause().change_context(Error)?;
let ready = Arc::new(AtomicBool::new(false)); let ready = Arc::new(AtomicBool::new(false));
let frame = Arc::new(Mutex::new(gst::app::Sample::new())); let frame = Arc::new(Mutex::new(gst::Sample::new()));
let appsink = appsink.on_new_frame({ appsink.on_new_frame({
let ready = Arc::clone(&ready); let ready = Arc::clone(&ready);
let frame = Arc::clone(&frame); let frame = Arc::clone(&frame);
move |appsink| { move |appsink| {
@@ -63,14 +67,13 @@ impl VideoSource {
core::mem::replace(&mut *guard, sample); core::mem::replace(&mut *guard, sample);
ready.store(true, std::sync::atomic::Ordering::Relaxed); ready.store(true, std::sync::atomic::Ordering::Relaxed);
} }
Ok(()) Ok(())
} }
}); });
Ok(Self { Ok(Self {
playbin, playbin,
// videoconvert, videoconvert,
appsink, appsink,
bus, bus,
ready, ready,
@@ -86,6 +89,23 @@ impl VideoSource {
.attach("Failed to wait for video initialisation") .attach("Failed to wait for video initialisation")
} }
pub fn is_playing(&self) -> Result<bool> {
let state = self
.playbin
.state(core::time::Duration::from_millis(0))
.change_context(Error)?;
Ok(state == gst::State::Playing)
}
pub fn toggle(&self) -> Result<()> {
if self.is_playing()? {
self.pause()?;
} else {
self.play()?;
}
Ok(())
}
pub fn play(&self) -> Result<()> { pub fn play(&self) -> Result<()> {
self.playbin self.playbin
.play() .play()
@@ -100,6 +120,13 @@ impl VideoSource {
.attach("Failed to pause video") .attach("Failed to pause video")
} }
pub fn stop(&self) -> Result<()> {
self.playbin
.stop()
.change_context(Error)
.attach("Failed to stop video")
}
pub fn size(&self) -> Result<(i32, i32)> { pub fn size(&self) -> Result<(i32, i32)> {
let caps = self let caps = self
.appsink .appsink

8
examples/hdr-gstreamer-wgpu/Cargo.toml
View File

@@ -6,10 +6,10 @@ edition = "2024"
[dependencies] [dependencies]
# gst = { workspace = true } # gst = { workspace = true }
wgpu = "*" wgpu = "*"
gstreamer = "*" gstreamer = { version = "0.24.4", features = ["v1_26"] }
gstreamer-video = "*" gstreamer-app = { version = "0.24.4", features = ["v1_26"] }
gstreamer-app = "*" gstreamer-base = { version = "0.24.4", features = ["v1_26"] }
gstreamer-base = "*" gstreamer-video = { version = "0.24.4", features = ["v1_26"] }
winit = { version = "*", features = ["wayland"] } winit = { version = "*", features = ["wayland"] }
anyhow = "*" anyhow = "*"
pollster = "0.4.0" pollster = "0.4.0"

28
examples/hdr-gstreamer-wgpu/src/main.rs
View File

@@ -77,7 +77,7 @@ impl State {
.await .await
.context("Failed to request wgpu device")?; .context("Failed to request wgpu device")?;
let surface_caps = surface.get_capabilities(&adapter); let surface_caps = surface.get_capabilities(&adapter);
dbg!(&surface_caps); tracing::info!("Caps: {:#?}", &surface_caps);
let surface_format = surface_caps let surface_format = surface_caps
.formats .formats
.iter() .iter()
@@ -85,6 +85,7 @@ impl State {
.find(|f| f.is_hdr_format()) .find(|f| f.is_hdr_format())
.expect("HDR format not supported") .expect("HDR format not supported")
.clone(); .clone();
tracing::info!("Using surface format: {:?}", surface_format);
let size = window.inner_size(); let size = window.inner_size();
let config = wgpu::SurfaceConfiguration { let config = wgpu::SurfaceConfiguration {
usage: wgpu::TextureUsages::RENDER_ATTACHMENT, usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -411,9 +412,8 @@ impl State {
}, },
texture.size(), texture.size(),
); );
drop(map); // drop(map);
// drop(buffer); // drop(frame);
drop(frame);
Ok(()) Ok(())
} }
@@ -426,11 +426,11 @@ impl ApplicationHandler<State> for App {
let window = Arc::new(event_loop.create_window(window_attributes).unwrap()); let window = Arc::new(event_loop.create_window(window_attributes).unwrap());
let monitor = event_loop // let monitor = event_loop
.primary_monitor() // .primary_monitor()
.or_else(|| window.current_monitor()); // .or_else(|| window.current_monitor());
// window.set_fullscreen(None); // window.set_fullscreen(None);
window.set_fullscreen(Some(winit::window::Fullscreen::Borderless(monitor))); // window.set_fullscreen(Some(winit::window::Fullscreen::Borderless(monitor)));
self.state = Some(pollster::block_on(State::new(window)).expect("Failed to block")); self.state = Some(pollster::block_on(State::new(window)).expect("Failed to block"));
} }
@@ -528,7 +528,7 @@ impl Video {
gst::init()?; gst::init()?;
use gst::prelude::*; use gst::prelude::*;
let pipeline = gst::parse::launch( let pipeline = gst::parse::launch(
r##"playbin3 uri=https://jellyfin.tsuba.darksailor.dev/Items/6010382cf25273e624d305907010d773/Download?api_key=036c140222464878862231ef66a2bc9c video-sink="videoconvert ! video/x-raw,format=RGB10A2_LE ! appsink name=appsink""##, r##"playbin3 uri=https://jellyfin.tsuba.darksailor.dev/Items/6010382cf25273e624d305907010d773/Download?api_key=036c140222464878862231ef66a2bc9c video-sink="videoconvert ! video/x-raw,format=RGB10A2_LE ! appsink sync=true drop=true name=appsink""##
).context("Failed to parse gst pipeline")?; ).context("Failed to parse gst pipeline")?;
let pipeline = pipeline let pipeline = pipeline
.downcast::<gst::Pipeline>() .downcast::<gst::Pipeline>()
@@ -544,11 +544,11 @@ impl Video {
})?; })?;
// appsink.set_property("max-buffers", 2u32); // appsink.set_property("max-buffers", 2u32);
// appsink.set_property("emit-signals", true); // appsink.set_property("emit-signals", true);
appsink.set_callbacks( // appsink.set_callbacks(
gst_app::AppSinkCallbacks::builder() // gst_app::AppSinkCallbacks::builder()
.new_sample(|_appsink| Ok(gst::FlowSuccess::Ok)) // .new_sample(|_appsink| Ok(gst::FlowSuccess::Ok))
.build(), // .build(),
); // );
let bus = pipeline.bus().context("Failed to get gst pipeline bus")?; let bus = pipeline.bus().context("Failed to get gst pipeline bus")?;
pipeline.set_state(gst::State::Playing)?; pipeline.set_state(gst::State::Playing)?;

3
flake.nix
View File

@@ -202,8 +202,7 @@
apple-sdk_26 apple-sdk_26
]) ])
++ (lib.optionals pkgs.stdenv.isLinux [ ++ (lib.optionals pkgs.stdenv.isLinux [
valgrind heaptrack
hotspot
samply samply
cargo-flamegraph cargo-flamegraph
perf perf

6
gst/Cargo.toml
View File

@@ -10,9 +10,9 @@ error-stack = "0.6"
futures = "0.3.31" futures = "0.3.31"
futures-lite = "2.6.1" futures-lite = "2.6.1"
glib = "0.21.5" glib = "0.21.5"
gstreamer = { version = "0.24.4", features = ["v1_18"] } gstreamer = { version = "0.24.4", features = ["v1_26"] }
gstreamer-app = { version = "0.24.4", features = ["v1_18"] } gstreamer-app = { version = "0.24.4", features = ["v1_26"] }
gstreamer-video = { version = "0.24.4", features = ["v1_18"] } gstreamer-video = { version = "0.24.4", features = ["v1_26"] }
thiserror = "2.0" thiserror = "2.0"
tracing = { version = "0.1", features = ["log"] } tracing = { version = "0.1", features = ["log"] }

2
gst/src/lib.rs
View File

@@ -8,6 +8,7 @@ pub mod pipeline;
pub mod plugins; pub mod plugins;
#[macro_use] #[macro_use]
pub mod wrapper; pub mod wrapper;
pub mod sample;
pub use bin::*; pub use bin::*;
pub use bus::*; pub use bus::*;
@@ -19,6 +20,7 @@ pub use gstreamer::{Message, MessageType, MessageView, State};
pub use pad::*; pub use pad::*;
pub use pipeline::*; pub use pipeline::*;
pub use plugins::*; pub use plugins::*;
pub use sample::*;
pub(crate) mod priv_prelude { pub(crate) mod priv_prelude {
pub use crate::errors::*; pub use crate::errors::*;

15
gst/src/pipeline.rs
View File

@@ -60,6 +60,15 @@ impl Pipeline {
Ok(()) Ok(())
} }
#[track_caller]
pub fn stop(&self) -> Result<()> {
self.inner
.set_state(gstreamer::State::Null)
.change_context(Error)
.attach("Failed to set pipeline to Null state")?;
Ok(())
}
#[track_caller] #[track_caller]
pub fn set_state(&self, state: gstreamer::State) -> Result<gstreamer::StateChangeSuccess> { pub fn set_state(&self, state: gstreamer::State) -> Result<gstreamer::StateChangeSuccess> {
let result = self let result = self
@@ -165,6 +174,12 @@ pub trait PipelineExt: ChildOf<Pipeline> + Sync {
fn ready(&self) -> Result<()> { fn ready(&self) -> Result<()> {
self.upcast_ref().ready() self.upcast_ref().ready()
} }
#[track_caller]
fn stop(&self) -> Result<()> {
self.upcast_ref().stop()
}
#[track_caller] #[track_caller]
fn set_state(&self, state: gstreamer::State) -> Result<gstreamer::StateChangeSuccess> { fn set_state(&self, state: gstreamer::State) -> Result<gstreamer::StateChangeSuccess> {
self.upcast_ref().set_state(state) self.upcast_ref().set_state(state)

59
gst/src/plugins/app/appsink.rs
View File

@@ -25,41 +25,41 @@ impl AppSink {
Ok(AppSink { inner }) Ok(AppSink { inner })
} }
pub fn with_emit_signals(self, emit: bool) -> Self { pub fn emit_signals(&mut self, emit: bool) -> &mut Self {
self.inner.set_property("emit-signals", emit); self.inner.set_property("emit-signals", emit);
self self
} }
pub fn with_async(self, async_: bool) -> Self { pub fn async_(&mut self, async_: bool) -> &mut Self {
self.inner.set_property("async", async_); self.inner.set_property("async", async_);
self self
} }
pub fn with_sync(self, sync: bool) -> Self { pub fn sync(&mut self, sync: bool) -> &mut Self {
self.inner.set_property("sync", sync); self.inner.set_property("sync", sync);
self self
} }
pub fn with_drop(self, drop: bool) -> Self { pub fn drop(&mut self, drop: bool) -> &mut Self {
self.inner.set_property("drop", drop); self.inner.set_property("drop", drop);
self self
} }
pub fn with_caps(self, caps: Caps) -> Self { pub fn caps(&mut self, caps: Caps) -> &mut Self {
self.inner.set_property("caps", caps.inner); self.inner.set_property("caps", caps.inner);
self self
} }
pub fn with_callbacks(self, callbacks: gstreamer_app::AppSinkCallbacks) -> Self { pub fn callbacks(&mut self, callbacks: gstreamer_app::AppSinkCallbacks) -> &mut Self {
self.appsink().set_callbacks(callbacks); self.appsink().set_callbacks(callbacks);
self self
} }
pub fn on_new_frame<F>(self, mut f: F) -> Self pub fn on_new_frame<F>(&mut self, mut f: F) -> &mut Self
where where
F: FnMut(&AppSink) -> Result<(), gstreamer::FlowError> + Send + 'static, F: FnMut(&AppSink) -> Result<(), gstreamer::FlowError> + Send + 'static,
{ {
self.with_emit_signals(true).with_callbacks( self.emit_signals(true).callbacks(
AppSinkCallbacks::builder() AppSinkCallbacks::builder()
.new_sample(move |appsink| { .new_sample(move |appsink| {
use glib::object::Cast; use glib::object::Cast;
@@ -109,44 +109,6 @@ impl AppSink {
} }
} }
impl From<gstreamer::Sample> for Sample {
fn from(inner: gstreamer::Sample) -> Self {
Sample { inner }
}
}
#[repr(transparent)]
#[derive(Debug, Clone)]
pub struct Sample {
pub inner: gstreamer::Sample,
}
use gstreamer::BufferRef;
impl Sample {
#[doc(alias = "empty")]
pub fn new() -> Self {
Self {
inner: gstreamer::Sample::builder().build(),
}
}
pub fn buffer(&self) -> Option<&BufferRef> {
self.inner.buffer()
}
pub fn caps(&self) -> Option<&gstreamer::CapsRef> {
self.inner.caps()
}
pub fn info(&self) -> Option<&gstreamer::StructureRef> {
self.inner.info()
}
// pub fn set_buffer(&mut self) {
// self.inner.set_buffer(None);
// }
}
#[test] #[test]
fn test_appsink() { fn test_appsink() {
use gstreamer::prelude::*; use gstreamer::prelude::*;
@@ -164,9 +126,8 @@ fn test_appsink() {
let video_convert = plugins::videoconvertscale::VideoConvert::new("vcvcvcvcvcvcvcvcvcvcvcvcvc") let video_convert = plugins::videoconvertscale::VideoConvert::new("vcvcvcvcvcvcvcvcvcvcvcvcvc")
.expect("Create videoconvert"); .expect("Create videoconvert");
let appsink = app::AppSink::new("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") let mut appsink = app::AppSink::new("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").expect("Create appsink");
.expect("Create appsink") appsink.caps(
.with_caps(
Caps::builder(CapsType::Video) Caps::builder(CapsType::Video)
.field("format", "RGB") .field("format", "RGB")
.build(), .build(),

2
gst/src/plugins/playback.rs
View File

@@ -1,2 +1,4 @@
pub mod playbin3; pub mod playbin3;
pub use playbin3::*; pub use playbin3::*;
pub mod playbin;
pub use playbin::*;

6
gst/src/plugins/playback/playbin3.rs
View File

@@ -43,6 +43,12 @@ impl Playbin3 {
self self
} }
/// Sets the maximum size of the ring buffer in bytes.
pub fn with_ring_buffer_max_size(self, size: u64) -> Self {
self.inner.set_property("ring-buffer-max-size", size);
self
}
pub fn with_video_sink(self, video_sink: &impl ChildOf<Element>) -> Self { pub fn with_video_sink(self, video_sink: &impl ChildOf<Element>) -> Self {
self.inner self.inner
.set_property("video-sink", &video_sink.upcast_ref().inner); .set_property("video-sink", &video_sink.upcast_ref().inner);