mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-26 13:31:00 +00:00
Code Issues Projects Releases Wiki Activity

rav1enc: Make use of the opaque API to map frames/packets to the video encoder frames

Browse source
This commit is contained in:
Sebastian Dröge 2021-01-15 11:54:18 +02:00
parent fa4cd38f75
commit 27b2de1d05
1 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
video/rav1e/src/rav1enc/imp.rs
View file

@ -177,25 +177,43 @@ enum Context {
} }
impl Context { impl Context {
fn receive_packet(&mut self) -> Result<(data::FrameType, u64, Vec<u8>), data::EncoderStatus> { fn receive_packet(
&mut self,
) -> Result<(data::FrameType, u64, u32, Vec<u8>), data::EncoderStatus> {
match self { match self {
Context::Eight(ref mut context) => context Context::Eight(ref mut context) => context.receive_packet().map(|packet| {
.receive_packet() (
.map(|packet| (packet.frame_type, packet.input_frameno, packet.data)), packet.frame_type,
Context::Sixteen(ref mut context) => context packet.input_frameno,
.receive_packet() *packet
.map(|packet| (packet.frame_type, packet.input_frameno, packet.data)), .opaque
.and_then(|o| o.downcast::<u32>().ok())
.expect("no frame number"),
packet.data,
)
}),
Context::Sixteen(ref mut context) => context.receive_packet().map(|packet| {
(
packet.frame_type,
packet.input_frameno,
*packet
.opaque
.and_then(|o| o.downcast::<u32>().ok())
.expect("no frame number"),
packet.data,
)
}),
} }
} }
fn send_frame( fn send_frame(
&mut self, &mut self,
in_frame: Option<&gst_video::VideoFrameRef<&gst::BufferRef>>, in_frame: Option<(u32, &gst_video::VideoFrameRef<&gst::BufferRef>)>,
force_keyframe: bool, force_keyframe: bool,
) -> Result<(), data::EncoderStatus> { ) -> Result<(), data::EncoderStatus> {
match self { match self {
Context::Eight(ref mut context) => { Context::Eight(ref mut context) => {
if let Some(in_frame) = in_frame { if let Some((frame_number, in_frame)) = in_frame {
let mut enc_frame = context.new_frame(); let mut enc_frame = context.new_frame();
enc_frame.planes[0].copy_from_raw_u8( enc_frame.planes[0].copy_from_raw_u8(
in_frame.plane_data(0).unwrap(), in_frame.plane_data(0).unwrap(),
@ -224,7 +242,7 @@ impl Context {
} else { } else {
rav1e::prelude::FrameTypeOverride::No rav1e::prelude::FrameTypeOverride::No
}, },
opaque: None, opaque: Some(Box::new(frame_number)),
}), }),
)) ))
} else { } else {
@ -232,7 +250,7 @@ impl Context {
} }
} }
Context::Sixteen(ref mut context) => { Context::Sixteen(ref mut context) => {
if let Some(in_frame) = in_frame { if let Some((frame_number, in_frame)) = in_frame {
let mut enc_frame = context.new_frame(); let mut enc_frame = context.new_frame();
enc_frame.planes[0].copy_from_raw_u8( enc_frame.planes[0].copy_from_raw_u8(
in_frame.plane_data(0).unwrap(), in_frame.plane_data(0).unwrap(),
@ -261,7 +279,7 @@ impl Context {
} else { } else {
rav1e::prelude::FrameTypeOverride::No rav1e::prelude::FrameTypeOverride::No
}, },
opaque: None, opaque: Some(Box::new(frame_number)),
}), }),
)) ))
} else { } else {
@ -695,7 +713,7 @@ impl VideoEncoderImpl for Rav1Enc {
})?; })?;
match state.context.send_frame( match state.context.send_frame(
Some(&in_frame), Some((frame.get_system_frame_number(), &in_frame)),
frame frame
.get_flags() .get_flags()
.contains(gst_video::VideoCodecFrameFlags::FORCE_KEYFRAME), .contains(gst_video::VideoCodecFrameFlags::FORCE_KEYFRAME),
@ -727,7 +745,7 @@ impl Rav1Enc {
) -> Result<gst::FlowSuccess, gst::FlowError> { ) -> Result<gst::FlowSuccess, gst::FlowError> {
loop { loop {
match state.context.receive_packet() { match state.context.receive_packet() {
Ok((packet_type, packet_number, packet_data)) => { Ok((packet_type, packet_number, frame_number, packet_data)) => {
gst_debug!( gst_debug!(
CAT, CAT,
obj: element, obj: element,
@ -737,7 +755,10 @@ impl Rav1Enc {
packet_type packet_type
); );
let mut frame = element.get_oldest_frame().expect("frame not found"); let mut frame = element
.get_frame(frame_number as i32)
.expect("frame not found");
if packet_type == data::FrameType::KEY { if packet_type == data::FrameType::KEY {
frame.set_flags(gst_video::VideoCodecFrameFlags::SYNC_POINT); frame.set_flags(gst_video::VideoCodecFrameFlags::SYNC_POINT);
} }