mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-01-09 18:55:27 +00:00
Code Issues Projects Releases Wiki Activity

dav1ddec: Pass element instance to debug logs

Browse source
This commit is contained in:
Sebastian Dröge 2022-02-02 13:33:18 +02:00 committed by Sebastian Dröge
parent 2c6ab9dd1f
commit c35d1cdc0c
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
video/dav1d/src/dav1ddec/imp.rs
View file

@ -45,6 +45,7 @@ static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
impl Dav1dDec { impl Dav1dDec {
pub fn gst_video_format_from_dav1d_picture( pub fn gst_video_format_from_dav1d_picture(
&self, &self,
element: &super::Dav1dDec,
pic: &dav1d::Picture, pic: &dav1d::Picture,
) -> gst_video::VideoFormat { ) -> gst_video::VideoFormat {
let bpc = pic.bits_per_component(); let bpc = pic.bits_per_component();
@ -57,7 +58,7 @@ impl Dav1dDec {
(dav1d::PixelLayout::I422, _) => "I422", (dav1d::PixelLayout::I422, _) => "I422",
(dav1d::PixelLayout::I444, _) => "Y444", (dav1d::PixelLayout::I444, _) => "Y444",
(dav1d::PixelLayout::Unknown, _) => { (dav1d::PixelLayout::Unknown, _) => {
gst_warning!(CAT, "Unsupported dav1d format"); gst_warning!(CAT, obj: element, "Unsupported dav1d format");
return gst_video::VideoFormat::Unknown; return gst_video::VideoFormat::Unknown;
} }
}; };
@ -81,7 +82,7 @@ impl Dav1dDec {
} }
}; };
f.parse::<gst_video::VideoFormat>().unwrap_or_else(|_| { f.parse::<gst_video::VideoFormat>().unwrap_or_else(|_| {
gst_warning!(CAT, "Unsupported dav1d format: {}", f); gst_warning!(CAT, obj: element, "Unsupported dav1d format: {}", f);
gst_video::VideoFormat::Unknown gst_video::VideoFormat::Unknown
}) })
} }
@ -127,13 +128,14 @@ impl Dav1dDec {
Ok(()) Ok(())
} }
fn flush_decoder(&self) { fn flush_decoder(&self, _element: &super::Dav1dDec) {
let decoder = self.decoder.lock().unwrap(); let decoder = self.decoder.lock().unwrap();
decoder.flush(); decoder.flush();
} }
fn decode( fn decode(
&self, &self,
element: &super::Dav1dDec,
input_buffer: &gst::BufferRef, input_buffer: &gst::BufferRef,
frame: &gst_video::VideoCodecFrame, frame: &gst_video::VideoCodecFrame,
) -> Result<Vec<(dav1d::Picture, gst_video::VideoFormat)>, gst::FlowError> { ) -> Result<Vec<(dav1d::Picture, gst_video::VideoFormat)>, gst::FlowError> {
@ -154,7 +156,7 @@ impl Dav1dDec {
let mut decoded_pictures = vec![]; let mut decoded_pictures = vec![];
for pic in pictures { for pic in pictures {
let format = self.gst_video_format_from_dav1d_picture(&pic); let format = self.gst_video_format_from_dav1d_picture(element, &pic);
if format != gst_video::VideoFormat::Unknown { if format != gst_video::VideoFormat::Unknown {
decoded_pictures.push((pic, format)); decoded_pictures.push((pic, format));
} else { } else {
@ -166,6 +168,7 @@ impl Dav1dDec {
pub fn decoded_picture_as_buffer( pub fn decoded_picture_as_buffer(
&self, &self,
element: &super::Dav1dDec,
pic: &dav1d::Picture, pic: &dav1d::Picture,
output_state: gst_video::VideoCodecState<gst_video::video_codec_state::Readable>, output_state: gst_video::VideoCodecState<gst_video::video_codec_state::Readable>,
) -> Result<gst::Buffer, gst::FlowError> { ) -> Result<gst::Buffer, gst::FlowError> {
@ -196,6 +199,7 @@ impl Dav1dDec {
} else { } else {
gst_trace!( gst_trace!(
gst::CAT_PERFORMANCE, gst::CAT_PERFORMANCE,
obj: element,
"Copying decoded video frame component {:?}", "Copying decoded video frame component {:?}",
component component
); );
@ -260,7 +264,7 @@ impl Dav1dDec {
.expect("Output state not set. Shouldn't happen!"); .expect("Output state not set. Shouldn't happen!");
let offset = pic.offset() as i32; let offset = pic.offset() as i32;
if let Some(mut frame) = element.frame(offset) { if let Some(mut frame) = element.frame(offset) {
let output_buffer = self.decoded_picture_as_buffer(pic, output_state)?; let output_buffer = self.decoded_picture_as_buffer(element, pic, output_state)?;
frame.set_output_buffer(output_buffer); frame.set_output_buffer(output_buffer);
element.finish_frame(frame)?; element.finish_frame(frame)?;
} else { } else {
@ -270,21 +274,22 @@ impl Dav1dDec {
self.forward_pending_pictures(element) self.forward_pending_pictures(element)
} }
fn drop_decoded_pictures(&self) { fn drop_decoded_pictures(&self, element: &super::Dav1dDec) {
let mut decoder = self.decoder.lock().unwrap(); let mut decoder = self.decoder.lock().unwrap();
while let Ok(pic) = decoder.get_picture() { while let Ok(pic) = decoder.get_picture() {
gst_debug!(CAT, "Dropping picture"); gst_debug!(CAT, obj: element, "Dropping picture");
drop(pic); drop(pic);
} }
} }
fn pending_pictures( fn pending_pictures(
&self, &self,
element: &super::Dav1dDec,
) -> Result<Vec<(dav1d::Picture, gst_video::VideoFormat)>, gst::FlowError> { ) -> Result<Vec<(dav1d::Picture, gst_video::VideoFormat)>, gst::FlowError> {
let mut decoder = self.decoder.lock().unwrap(); let mut decoder = self.decoder.lock().unwrap();
let mut pictures = vec![]; let mut pictures = vec![];
while let Ok(pic) = decoder.get_picture() { while let Ok(pic) = decoder.get_picture() {
let format = self.gst_video_format_from_dav1d_picture(&pic); let format = self.gst_video_format_from_dav1d_picture(element, &pic);
if format == gst_video::VideoFormat::Unknown { if format == gst_video::VideoFormat::Unknown {
return Err(gst::FlowError::NotNegotiated); return Err(gst::FlowError::NotNegotiated);
} }
@ -297,7 +302,7 @@ impl Dav1dDec {
&self, &self,
element: &super::Dav1dDec, element: &super::Dav1dDec,
) -> Result<gst::FlowSuccess, gst::FlowError> { ) -> Result<gst::FlowSuccess, gst::FlowError> {
for (pic, format) in self.pending_pictures()? { for (pic, format) in self.pending_pictures(element)? {
self.handle_picture(element, &pic, format)?; self.handle_picture(element, &pic, format)?;
} }
Ok(gst::FlowSuccess::Ok) Ok(gst::FlowSuccess::Ok)
@ -432,7 +437,7 @@ impl VideoDecoderImpl for Dav1dDec {
frame: gst_video::VideoCodecFrame, frame: gst_video::VideoCodecFrame,
) -> Result<gst::FlowSuccess, gst::FlowError> { ) -> Result<gst::FlowSuccess, gst::FlowError> {
let input_buffer = frame.input_buffer().expect("frame without input buffer"); let input_buffer = frame.input_buffer().expect("frame without input buffer");
for (pic, format) in self.decode(input_buffer, &frame)? { for (pic, format) in self.decode(element, input_buffer, &frame)? {
self.handle_picture(element, &pic, format)?; self.handle_picture(element, &pic, format)?;
} }
@ -441,21 +446,21 @@ impl VideoDecoderImpl for Dav1dDec {
fn flush(&self, element: &Self::Type) -> bool { fn flush(&self, element: &Self::Type) -> bool {
gst_info!(CAT, obj: element, "Flushing"); gst_info!(CAT, obj: element, "Flushing");
self.flush_decoder(); self.flush_decoder(element);
self.drop_decoded_pictures(); self.drop_decoded_pictures(element);
true true
} }
fn drain(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> { fn drain(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> {
gst_info!(CAT, obj: element, "Draining"); gst_info!(CAT, obj: element, "Draining");
self.flush_decoder(); self.flush_decoder(element);
self.forward_pending_pictures(element)?; self.forward_pending_pictures(element)?;
self.parent_drain(element) self.parent_drain(element)
} }
fn finish(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> { fn finish(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> {
gst_info!(CAT, obj: element, "Finishing"); gst_info!(CAT, obj: element, "Finishing");
self.flush_decoder(); self.flush_decoder(element);
self.forward_pending_pictures(element)?; self.forward_pending_pictures(element)?;
self.parent_finish(element) self.parent_finish(element)
} }