Merge branch 'fix-missing-wrapped-dependencies' into 'main'

Draft: meson: Make any Meson-provided dependencies available to cargo Closes #512 See merge request gstreamer/gst-plugins-rs!1495
hrtfrender: use bitmask, not int, to prevent a capsnego failure
2024-05-19 00:38:20 +00:00 · 2024-04-27 01:39:27 +00:00 · 2024-04-26 20:24:19 +00:00 · 2024-04-26 19:35:41 +00:00 · 2024-03-12 18:11:36 -03:00
3 changed files with 15 additions and 9 deletions
--- a/audio/audiofx/src/hrtfrender/imp.rs
+++ b/audio/audiofx/src/hrtfrender/imp.rs
@ -649,7 +649,7 @@ impl BaseTransformImpl for HrtfRender {

                if direction == gst::PadDirection::Sink {
                    s.set("channels", 2);
-                    s.set("channel-mask", 0x3);
+                    s.set("channel-mask", gst::Bitmask(0x3));
                } else {
                    let settings = self.settings.lock().unwrap();
                    if let Some(objs) = &settings.spatial_objects {
--- a/meson.build
+++ b/meson.build
@ -472,12 +472,18 @@ if pkg_config.found()
  extra_env += {'PKG_CONFIG': pkg_config.full_path()}
 endif

-pkg_config_path = get_option('pkg_config_path')
+# Prepend any Meson-provided dependencies (such as the GStreamer
+# global project's)
+pkg_config_path = [
+  meson.global_build_root() / 'meson-uninstalled',
+  meson.project_build_root() / 'meson-uninstalled',
+]
+if get_option('pkg_config_path').length() > 0
+  pkg_config_path += [get_option('pkg_config_path')]
+endif
+
 if pkg_config_path.length() > 0
-  pathsep = ':'
-  if host_system == 'windows'
-    pathsep = ';'
-  endif
+  pathsep = host_system == 'windows' ? ';' : ':'
  extra_env += {'PKG_CONFIG_PATH': pathsep.join(pkg_config_path)}
 endif

--- a/video/dav1d/src/dav1ddec/imp.rs
+++ b/video/dav1d/src/dav1ddec/imp.rs
@ -134,7 +134,7 @@ impl Dav1dDec {
        let matrix = match pic.matrix_coefficients() {
            pixel::MatrixCoefficients::Identity => gst_video::VideoColorMatrix::Rgb,
            pixel::MatrixCoefficients::BT709 => gst_video::VideoColorMatrix::Bt709,
-            pixel::MatrixCoefficients::Unspecified => gst_video::VideoColorMatrix::Unknown,
+            pixel::MatrixCoefficients::Unspecified => gst_video::VideoColorMatrix::Bt709,
            pixel::MatrixCoefficients::BT470M => gst_video::VideoColorMatrix::Fcc,
            pixel::MatrixCoefficients::BT470BG => gst_video::VideoColorMatrix::Bt601,
            pixel::MatrixCoefficients::ST240M => gst_video::VideoColorMatrix::Smpte240m,
@ -149,7 +149,7 @@ impl Dav1dDec {

        let transfer = match pic.transfer_characteristic() {
            pixel::TransferCharacteristic::BT1886 => gst_video::VideoTransferFunction::Bt709,
-            pixel::TransferCharacteristic::Unspecified => gst_video::VideoTransferFunction::Unknown,
+            pixel::TransferCharacteristic::Unspecified => gst_video::VideoTransferFunction::Bt709,
            pixel::TransferCharacteristic::BT470M => gst_video::VideoTransferFunction::Bt709,
            pixel::TransferCharacteristic::BT470BG => gst_video::VideoTransferFunction::Gamma28,
            pixel::TransferCharacteristic::ST170M => gst_video::VideoTransferFunction::Bt601,
@ -180,7 +180,7 @@ impl Dav1dDec {

        let primaries = match pic.color_primaries() {
            pixel::ColorPrimaries::BT709 => gst_video::VideoColorPrimaries::Bt709,
-            pixel::ColorPrimaries::Unspecified => gst_video::VideoColorPrimaries::Unknown,
+            pixel::ColorPrimaries::Unspecified => gst_video::VideoColorPrimaries::Bt709,
            pixel::ColorPrimaries::BT470M => gst_video::VideoColorPrimaries::Bt470m,
            pixel::ColorPrimaries::BT470BG => gst_video::VideoColorPrimaries::Bt470bg,
            pixel::ColorPrimaries::ST240M => gst_video::VideoColorPrimaries::Smpte240m,
Author	SHA1	Message	Date
amyspark	f21a28dcae	Merge branch 'fix-missing-wrapped-dependencies' into 'main' Draft: meson: Make any Meson-provided dependencies available to cargo Closes #512 See merge request gstreamer/gst-plugins-rs!1495	2024-04-27 01:39:27 +00:00
Maksym Khomenko	a87eaa4b79	hrtfrender: use bitmask, not int, to prevent a capsnego failure Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1549>	2024-04-26 20:24:19 +00:00
Philippe Normand	88cbc93338	dav1ddec: Negotiate bt709 colorimetry when values from seq header are unspecified With unknown range colorimetry validation would fail in video-info. As our decoder outputs only YUV formats Bt709 should be a reasonable default. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1548>	2024-04-26 19:35:41 +00:00
L. E. Segovia	f1d0667e0b	meson: Make any Meson-provided dependencies available to cargo Fixes #512	2024-03-12 18:11:36 -03:00