mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2025-06-05 23:18:55 +00:00
rtpav1depay: Add wait-for-keyframe and request-keyframe properties
These behave the same as the properties in other depayloaders. Keyframe detection is based on the N flag in the aggregation header. Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/598 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1824>
This commit is contained in:
parent
30d2676cbb
commit
0b8f323c5b
4 changed files with 106 additions and 4 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -2630,6 +2630,7 @@ dependencies = [
|
||||||
"gstreamer",
|
"gstreamer",
|
||||||
"gstreamer-check",
|
"gstreamer-check",
|
||||||
"gstreamer-rtp",
|
"gstreamer-rtp",
|
||||||
|
"gstreamer-video",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"time",
|
"time",
|
||||||
|
|
|
@ -6276,6 +6276,32 @@
|
||||||
"presence": "always"
|
"presence": "always"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"properties": {
|
||||||
|
"request-keyframe": {
|
||||||
|
"blurb": "Request new keyframe when packet loss is detected",
|
||||||
|
"conditionally-available": false,
|
||||||
|
"construct": false,
|
||||||
|
"construct-only": false,
|
||||||
|
"controllable": false,
|
||||||
|
"default": "false",
|
||||||
|
"mutable": "ready",
|
||||||
|
"readable": true,
|
||||||
|
"type": "gboolean",
|
||||||
|
"writable": true
|
||||||
|
},
|
||||||
|
"wait-for-keyframe": {
|
||||||
|
"blurb": "Wait for the next keyframe after packet loss",
|
||||||
|
"conditionally-available": false,
|
||||||
|
"construct": false,
|
||||||
|
"construct-only": false,
|
||||||
|
"controllable": false,
|
||||||
|
"default": "false",
|
||||||
|
"mutable": "ready",
|
||||||
|
"readable": true,
|
||||||
|
"type": "gboolean",
|
||||||
|
"writable": true
|
||||||
|
}
|
||||||
|
},
|
||||||
"rank": "marginal"
|
"rank": "marginal"
|
||||||
},
|
},
|
||||||
"rtpav1pay": {
|
"rtpav1pay": {
|
||||||
|
|
|
@ -10,8 +10,9 @@ rust-version.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bitstream-io = "2.0"
|
bitstream-io = "2.0"
|
||||||
gst = { workspace = true, features = ["v1_20"] }
|
gst = { workspace = true, features = ["v1_20"] }
|
||||||
gst-rtp = { workspace = true, features = ["v1_20"]}
|
gst-rtp = { workspace = true, features = ["v1_20"]}
|
||||||
|
gst-video = { workspace = true, features = ["v1_20"]}
|
||||||
time = { version = "0.3", default-features = false, features = ["std"] }
|
time = { version = "0.3", default-features = false, features = ["std"] }
|
||||||
once_cell.workspace = true
|
once_cell.workspace = true
|
||||||
smallvec = { version = "1.11", features = ["union", "write", "const_generics", "const_new"] }
|
smallvec = { version = "1.11", features = ["union", "write", "const_generics", "const_new"] }
|
||||||
|
|
|
@ -24,6 +24,12 @@ use crate::av1::common::{
|
||||||
UnsizedObu, CLOCK_RATE, ENDIANNESS,
|
UnsizedObu, CLOCK_RATE, ENDIANNESS,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Clone, Default)]
|
||||||
|
struct Settings {
|
||||||
|
request_keyframe: bool,
|
||||||
|
wait_for_keyframe: bool,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct State {
|
struct State {
|
||||||
last_timestamp: Option<u32>,
|
last_timestamp: Option<u32>,
|
||||||
|
@ -35,6 +41,8 @@ struct State {
|
||||||
found_valid_obu: bool,
|
found_valid_obu: bool,
|
||||||
/// holds data for a fragment
|
/// holds data for a fragment
|
||||||
obu_fragment: Option<Vec<u8>>,
|
obu_fragment: Option<Vec<u8>>,
|
||||||
|
/// if we saw a keyframe since the last discont
|
||||||
|
seen_keyframe: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for State {
|
impl Default for State {
|
||||||
|
@ -45,13 +53,15 @@ impl Default for State {
|
||||||
needs_discont: true,
|
needs_discont: true,
|
||||||
found_valid_obu: false,
|
found_valid_obu: false,
|
||||||
obu_fragment: None,
|
obu_fragment: None,
|
||||||
|
seen_keyframe: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
#[derive(Default)]
|
||||||
pub struct RTPAv1Depay {
|
pub struct RTPAv1Depay {
|
||||||
state: Mutex<State>,
|
state: Mutex<State>,
|
||||||
|
settings: Mutex<Settings>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
|
static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
|
||||||
|
@ -79,7 +89,48 @@ impl ObjectSubclass for RTPAv1Depay {
|
||||||
type ParentType = gst_rtp::RTPBaseDepayload;
|
type ParentType = gst_rtp::RTPBaseDepayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ObjectImpl for RTPAv1Depay {}
|
impl ObjectImpl for RTPAv1Depay {
|
||||||
|
fn properties() -> &'static [glib::ParamSpec] {
|
||||||
|
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
|
||||||
|
vec![
|
||||||
|
glib::ParamSpecBoolean::builder("request-keyframe")
|
||||||
|
.nick("Request Keyframe")
|
||||||
|
.blurb("Request new keyframe when packet loss is detected")
|
||||||
|
.default_value(Settings::default().request_keyframe)
|
||||||
|
.mutable_ready()
|
||||||
|
.build(),
|
||||||
|
glib::ParamSpecBoolean::builder("wait-for-keyframe")
|
||||||
|
.nick("Wait For Keyframe")
|
||||||
|
.blurb("Wait for the next keyframe after packet loss")
|
||||||
|
.default_value(Settings::default().wait_for_keyframe)
|
||||||
|
.mutable_ready()
|
||||||
|
.build(),
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
PROPERTIES.as_ref()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
|
||||||
|
match pspec.name() {
|
||||||
|
"request-keyframe" => {
|
||||||
|
self.settings.lock().unwrap().request_keyframe = value.get().unwrap();
|
||||||
|
}
|
||||||
|
"wait-for-keyframe" => {
|
||||||
|
self.settings.lock().unwrap().wait_for_keyframe = value.get().unwrap();
|
||||||
|
}
|
||||||
|
_ => unimplemented!(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
|
||||||
|
match pspec.name() {
|
||||||
|
"request-keyframe" => self.settings.lock().unwrap().request_keyframe.to_value(),
|
||||||
|
"wait-for-keyframe" => self.settings.lock().unwrap().wait_for_keyframe.to_value(),
|
||||||
|
_ => unimplemented!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl GstObjectImpl for RTPAv1Depay {}
|
impl GstObjectImpl for RTPAv1Depay {}
|
||||||
|
|
||||||
|
@ -200,6 +251,7 @@ impl RTPAv1Depay {
|
||||||
);
|
);
|
||||||
|
|
||||||
let payload = rtp.payload().map_err(err_flow!(self, payload_buf))?;
|
let payload = rtp.payload().map_err(err_flow!(self, payload_buf))?;
|
||||||
|
let settings = self.settings.lock().unwrap().clone();
|
||||||
|
|
||||||
let mut state = self.state.lock().unwrap();
|
let mut state = self.state.lock().unwrap();
|
||||||
|
|
||||||
|
@ -238,6 +290,28 @@ impl RTPAv1Depay {
|
||||||
self.reset(&mut state);
|
self.reset(&mut state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if aggr_header.start_of_seq {
|
||||||
|
state.seen_keyframe = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If this is a new temporal unit and we never saw a keyframe so far,
|
||||||
|
// handle this according to the request-keyframe / wait-for-keyframe properties.
|
||||||
|
if !state.seen_keyframe {
|
||||||
|
if settings.request_keyframe {
|
||||||
|
gst::debug!(CAT, imp: self, "Requesting keyframe from upstream");
|
||||||
|
let event = gst_video::UpstreamForceKeyUnitEvent::builder()
|
||||||
|
.all_headers(true)
|
||||||
|
.build();
|
||||||
|
let _ = self.obj().sink_pad().push_event(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
if settings.wait_for_keyframe {
|
||||||
|
gst::trace!(CAT, imp: self, "Waiting for keyframe");
|
||||||
|
self.reset(&mut state);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// the next temporal unit starts with a temporal delimiter OBU
|
// the next temporal unit starts with a temporal delimiter OBU
|
||||||
ready_obus.extend_from_slice(&TEMPORAL_DELIMITER);
|
ready_obus.extend_from_slice(&TEMPORAL_DELIMITER);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue