diff options
| author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-09-21 11:21:24 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:20 +0000 |
| commit | 46344dfaaa9dc089765d3d4b4aec48ec4c201407 (patch) | |
| tree | 823365196f446e3015a90c82c3e6bed4b8075f70 | |
| parent | 49cd96e724650a4b76796813f6023b75747eb6f4 (diff) | |
| download | poky-46344dfaaa9dc089765d3d4b4aec48ec4c201407.tar.gz | |
gstreamer1.0-plugins-good: upgrade to version 1.12.3
Patch removed since it is already upstream now.
Bugfixes release only.
(From OE-Core rev: 7ecbe2890e8ca53631d6753b9147ff8a7d6139b8)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Fix-4K-colorimetry.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.3.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb) | 5 |
2 files changed, 2 insertions, 51 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Fix-4K-colorimetry.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Fix-4K-colorimetry.patch deleted file mode 100644 index f78818aa17..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Fix-4K-colorimetry.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From 545646cccba243236e10362fe7325f89be57da1f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nicolas Dufresne <nicolas.dufresne@collabora.com> | ||
| 3 | Date: Tue, 18 Jul 2017 11:28:37 -0400 | ||
| 4 | Subject: [PATCH] v4l2: Fix 4K colorimetry | ||
| 5 | |||
| 6 | Since 1.6, the transfer function for BT2020 has been changed from BT709 | ||
| 7 | to BT2020_12. It's the same function, but with more precision. As a side | ||
| 8 | effect, the V4L2 colorpsace didn't match GStreamer colorspace. When | ||
| 9 | GStreamer ended up making a guess, it would not match anything supported | ||
| 10 | by V4L2 anymore. This this by using BT2020_12 for BT2020 colorspace and | ||
| 11 | BT2020 transfer function in replacement of BT709 whenever a 4K | ||
| 12 | resolution is detected. | ||
| 13 | |||
| 14 | Upstream-Status: Backport | ||
| 15 | Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> | ||
| 16 | |||
| 17 | --- | ||
| 18 | sys/v4l2/gstv4l2object.c | 7 +++++-- | ||
| 19 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c | ||
| 22 | index 61244455f..aae2c55e7 100644 | ||
| 23 | --- a/sys/v4l2/gstv4l2object.c | ||
| 24 | +++ b/sys/v4l2/gstv4l2object.c | ||
| 25 | @@ -1960,7 +1960,7 @@ gst_v4l2_object_get_colorspace (struct v4l2_format *fmt, | ||
| 26 | case V4L2_COLORSPACE_BT2020: | ||
| 27 | cinfo->range = GST_VIDEO_COLOR_RANGE_16_235; | ||
| 28 | cinfo->matrix = GST_VIDEO_COLOR_MATRIX_BT2020; | ||
| 29 | - cinfo->transfer = GST_VIDEO_TRANSFER_BT709; | ||
| 30 | + cinfo->transfer = GST_VIDEO_TRANSFER_BT2020_12; | ||
| 31 | cinfo->primaries = GST_VIDEO_COLOR_PRIMARIES_BT2020; | ||
| 32 | break; | ||
| 33 | case V4L2_COLORSPACE_SMPTE240M: | ||
| 34 | @@ -2062,7 +2062,10 @@ gst_v4l2_object_get_colorspace (struct v4l2_format *fmt, | ||
| 35 | |||
| 36 | switch (transfer) { | ||
| 37 | case V4L2_XFER_FUNC_709: | ||
| 38 | - cinfo->transfer = GST_VIDEO_TRANSFER_BT709; | ||
| 39 | + if (fmt->fmt.pix.height > 2160) | ||
| 40 | + cinfo->transfer = GST_VIDEO_TRANSFER_BT2020_12; | ||
| 41 | + else | ||
| 42 | + cinfo->transfer = GST_VIDEO_TRANSFER_BT709; | ||
| 43 | break; | ||
| 44 | case V4L2_XFER_FUNC_SRGB: | ||
| 45 | cinfo->transfer = GST_VIDEO_TRANSFER_SRGB; | ||
| 46 | -- | ||
| 47 | 2.14.1 | ||
| 48 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.3.bb index f9593c99aa..afcb333cb7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.3.bb | |||
| @@ -10,10 +10,9 @@ SRC_URI = " \ | |||
| 10 | file://avoid-including-sys-poll.h-directly.patch \ | 10 | file://avoid-including-sys-poll.h-directly.patch \ |
| 11 | file://ensure-valid-sentinel-for-gst_structure_get.patch \ | 11 | file://ensure-valid-sentinel-for-gst_structure_get.patch \ |
| 12 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | 12 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ |
| 13 | file://0001-v4l2-Fix-4K-colorimetry.patch \ | ||
| 14 | " | 13 | " |
| 15 | SRC_URI[md5sum] = "20254217d9805484532e08ff1c3aa296" | 14 | SRC_URI[md5sum] = "6b56a7cc6c5fd031a9596ec123b2f285" |
| 16 | SRC_URI[sha256sum] = "5591ee7208ab30289a30658a82b76bf87169c927572d9b794f3a41ed48e1ee96" | 15 | SRC_URI[sha256sum] = "13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03" |
| 17 | 16 | ||
| 18 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 17 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
| 19 | 18 | ||
