kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

pipewire: force re-negotiation when buffers change

Browse source
This commit is contained in:
Julian Orth 2024-02-28 00:07:15 +01:00
parent 9fba5f9b45
commit e1488eca55
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pipewire/pw_ifs/pw_client_node.rs
View file

@ -25,8 +25,9 @@ use {
SPA_PARAM_Meta, SpaDataFlags, SpaDataType, SpaDirection, SpaIoType, SPA_PARAM_Meta, SpaDataFlags, SpaDataType, SpaDirection, SpaIoType,
SpaMediaSubtype, SpaMediaType, SpaMetaType, SpaNodeBuffersFlags, SpaNodeCommand, SpaMediaSubtype, SpaMediaType, SpaMetaType, SpaNodeBuffersFlags, SpaNodeCommand,
SpaParamType, SpaVideoFormat, SPA_DATA_FLAG_READABLE, SPA_DIRECTION_INPUT, SpaParamType, SpaVideoFormat, SPA_DATA_FLAG_READABLE, SPA_DIRECTION_INPUT,
SPA_DIRECTION_OUTPUT, SPA_NODE_BUFFERS_FLAG_ALLOC, SPA_PARAM_INFO_READ, SPA_DIRECTION_OUTPUT, SPA_NODE_BUFFERS_FLAG_ALLOC, SPA_PARAM_INFO,
SPA_PORT_FLAG, SPA_PORT_FLAG_CAN_ALLOC_BUFFERS, SPA_PARAM_INFO_READ, SPA_PARAM_INFO_SERIAL, SPA_PORT_FLAG,
SPA_PORT_FLAG_CAN_ALLOC_BUFFERS,
}, },
}, },
utils::{ utils::{
@ -120,6 +121,8 @@ pub struct PwClientNodePort {
pub buffer_config: Cell<Option<PwClientNodeBufferConfig>>, pub buffer_config: Cell<Option<PwClientNodeBufferConfig>>,
pub io_buffers: CopyHashMap<u32, Rc<PwMemTyped<spa_io_buffers>>>, pub io_buffers: CopyHashMap<u32, Rc<PwMemTyped<spa_io_buffers>>>,
pub serial: Cell<bool>,
} }
#[derive(Copy, Clone, Debug, Default)] #[derive(Copy, Clone, Debug, Default)]
@ -255,6 +258,7 @@ impl PwClientNode {
buffers: RefCell::new(vec![]), buffers: RefCell::new(vec![]),
buffer_config: Cell::new(None), buffer_config: Cell::new(None),
io_buffers: Default::default(), io_buffers: Default::default(),
serial: Cell::new(false),
}); });
self.ports.set((direction, port.id), port.clone()); self.ports.set((direction, port.id), port.clone());
port port
@ -291,7 +295,14 @@ impl PwClientNode {
}); });
} }
pub fn send_port_update(&self, port: &PwClientNodePort) { pub fn send_port_update(&self, port: &PwClientNodePort, re_init: bool) {
if re_init {
port.serial.set(!port.serial.get());
}
let serial = match port.serial.get() {
true => SPA_PARAM_INFO_SERIAL,
false => SPA_PARAM_INFO::none(),
};
self.con.send(self, PwClientNodeMethods::PortUpdate, |f| { self.con.send(self, PwClientNodeMethods::PortUpdate, |f| {
f.write_struct(|f| { f.write_struct(|f| {
// direction // direction
@ -437,11 +448,11 @@ impl PwClientNode {
f.write_uint(num_params); f.write_uint(num_params);
if sf.is_some() { if sf.is_some() {
f.write_id(SPA_PARAM_EnumFormat.0); f.write_id(SPA_PARAM_EnumFormat.0);
f.write_uint(SPA_PARAM_INFO_READ.0); f.write_uint((SPA_PARAM_INFO_READ | serial).0);
} }
if bc.is_some() { if bc.is_some() {
f.write_id(SPA_PARAM_Buffers.0); f.write_id(SPA_PARAM_Buffers.0);
f.write_uint(SPA_PARAM_INFO_READ.0); f.write_uint((SPA_PARAM_INFO_READ | serial).0);
} }
f.write_id(SPA_PARAM_Meta.0); f.write_id(SPA_PARAM_Meta.0);
f.write_uint(SPA_PARAM_INFO_READ.0); f.write_uint(SPA_PARAM_INFO_READ.0);

4
src/portal/ptl_screencast.rs
View file

@ -155,7 +155,7 @@ impl PwClientNodeOwner for StartingScreencast {
impl PwClientNodeOwner for StartedScreencast { impl PwClientNodeOwner for StartedScreencast {
fn port_format_changed(&self, port: &Rc<PwClientNodePort>) { fn port_format_changed(&self, port: &Rc<PwClientNodePort>) {
self.node.send_port_update(port); self.node.send_port_update(port, false);
} }
fn use_buffers(&self, port: &Rc<PwClientNodePort>) { fn use_buffers(&self, port: &Rc<PwClientNodePort>) {
@ -300,7 +300,7 @@ impl UsrJayScreencastOwner for StartedScreencast {
data_type: SPA_DATA_DmaBuf, data_type: SPA_DATA_DmaBuf,
}; };
self.port.buffer_config.set(Some(bc)); self.port.buffer_config.set(Some(bc));
self.node.send_port_update(&self.port); self.node.send_port_update(&self.port, true);
self.node.send_active(true); self.node.send_active(true);
*self.buffers.borrow_mut() = buffers; *self.buffers.borrow_mut() = buffers;
} }