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-09-02 09:43:48 +00:00
Code Issues Projects Releases Wiki Activity

dav1ddec: Only update unknown parts of the upstream colorimetry and not all of it

Browse source 
And also don't replace the whole upstream video-info but modify it.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/673

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2132>
This commit is contained in:
Sebastian Dröge 2025-03-22 10:55:03 +02:00 committed by GStreamer Marge Bot
parent 75212c7b61
commit da836c01c9
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -293,32 +293,56 @@ impl Dav1dDec {
);
let input_state = state.input_state.clone();
let input_info = input_state.info();
let input_caps = input_state.caps().ok_or(gst::FlowError::NotNegotiated)?;
let input_structure = input_caps
.structure(0)
.ok_or(gst::FlowError::NotNegotiated)?;
let input_colorimetry = input_info.colorimetry();
drop(state_guard);
let instance = self.obj();
let mut output_state =
instance.set_output_state(format, pic.width(), pic.height(), Some(&input_state))?;
let mut info_builder = gst_video::VideoInfo::builder(format, pic.width(), pic.height());
let info = output_state.info();
let mut info_builder = gst_video::VideoInfo::builder_from_info(&info);
let mut update_output_state = false;
let colorimetry = self.colorimetry_from_dav1d_picture(pic);
if !input_structure.has_field("colorimetry")
|| input_colorimetry.range() == gst_video::VideoColorRange::Unknown
|| input_colorimetry.matrix() == gst_video::VideoColorMatrix::Unknown
|| input_colorimetry.transfer() == gst_video::VideoTransferFunction::Unknown
|| input_colorimetry.primaries() == gst_video::VideoColorPrimaries::Unknown
{
if let Some(colorimetry) = colorimetry.as_ref() {
info_builder = info_builder.colorimetry(colorimetry);
update_output_state = true;
let input_colorimetry = info.colorimetry();
let dec_colorimetry = self.colorimetry_from_dav1d_picture(pic);
if let Some(ref dec_colorimetry) = dec_colorimetry {
let mut range = input_colorimetry.range();
let mut matrix = input_colorimetry.matrix();
let mut transfer = input_colorimetry.transfer();
let mut primaries = input_colorimetry.primaries();
if !input_structure.has_field("colorimetry")
|| range == gst_video::VideoColorRange::Unknown
{
range = dec_colorimetry.range();
}
if !input_structure.has_field("colorimetry")
|| matrix == gst_video::VideoColorMatrix::Unknown
{
matrix = dec_colorimetry.matrix();
}
if !input_structure.has_field("colorimetry")
|| transfer == gst_video::VideoTransferFunction::Unknown
{
transfer = dec_colorimetry.transfer();
}
if !input_structure.has_field("colorimetry")
|| primaries == gst_video::VideoColorPrimaries::Unknown
{
primaries = dec_colorimetry.primaries();
}
info_builder = info_builder.colorimetry(&gst_video::VideoColorimetry::new(
range, matrix, transfer, primaries,
));
update_output_state = true;
}
if !input_structure.has_field("chroma-site") {