diff options
author | Scott D Phillips <scott.d.phillips@intel.com> | 2016-07-22 16:16:21 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-07-25 09:38:41 -0500 |
commit | 3f51f61efe93c104ba7996f54f381c6c1a5e6546 (patch) | |
tree | e401b4670192770ca6def55b9c51f079735440ea | |
parent | ab6f511bee2915ccc45a195d85aa07c70952bb56 (diff) | |
download | meta-intel-3f51f61efe93c104ba7996f54f381c6c1a5e6546.tar.gz |
gstreamer-vaapi: Update to upstream version 1.8.2
With the 1.8.x series gstreamer-vaapi got integrated into the
maintainership of the greater GStreamer project. Also this
upstreaming introduced a policy change in the source base where
gstreamer-vaapi versions are now tested only with the GStreamer
version with the same number (as opposed to the past pre-upstream
source base which had a policy of supporting a range of GStreamer
versions). So care should be taken to keep the gstreamer-vaapi
build configuration in sync with the gstreamer build configuration.
Signed-off-by: Scott D Phillips <scott.d.phillips@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
4 files changed, 7 insertions, 42 deletions
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.7.0.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.7.0.bb deleted file mode 100644 index be8f47a7..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.7.0.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require gstreamer-vaapi.inc | ||
2 | |||
3 | DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | ||
4 | |||
5 | SRC_URI[md5sum] = "ce2d4921b8d9c78edd609d95e8c502d3" | ||
6 | SRC_URI[sha256sum] = "abe8ea4dfb3177d038b38610537c651b943707ed110882782a19b95a9ea04a92" | ||
7 | |||
8 | SRC_URI =+ "file://0001-decoder-h265-Fix-offset-calculation-in-codec_data-pa.patch" | ||
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb new file mode 100644 index 00000000..3343baeb --- /dev/null +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require gstreamer-vaapi.inc | ||
2 | |||
3 | DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | ||
4 | |||
5 | SRC_URI[md5sum] = "5683e0e950160f6a4b5bcd47176baad0" | ||
6 | SRC_URI[sha256sum] = "5479e86f593d80c00bbd4a43b16b2027cb935412a2bb22c9ba4ac085627a9229" | ||
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc index 7a298902..6dea9cfc 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | |||
11 | 11 | ||
12 | DEPENDS = "libva" | 12 | DEPENDS = "libva" |
13 | 13 | ||
14 | SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${REALPN}/${REALPN}-${PV}.tar.bz2 \ | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ |
15 | " | 15 | " |
16 | 16 | ||
17 | S = "${WORKDIR}/${REALPN}-${PV}" | 17 | S = "${WORKDIR}/${REALPN}-${PV}" |
@@ -20,8 +20,6 @@ inherit autotools pkgconfig gtk-doc | |||
20 | 20 | ||
21 | PACKAGES =+ "${PN}-tests" | 21 | PACKAGES =+ "${PN}-tests" |
22 | 22 | ||
23 | EXTRA_OECONF += "--disable-builtin-libvpx" | ||
24 | |||
25 | PACKAGECONFIG ??= "drm \ | 23 | PACKAGECONFIG ??= "drm \ |
26 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | 24 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ |
27 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ | 25 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ |
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-decoder-h265-Fix-offset-calculation-in-codec_data-pa.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-decoder-h265-Fix-offset-calculation-in-codec_data-pa.patch deleted file mode 100644 index 92a6f083..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/0001-decoder-h265-Fix-offset-calculation-in-codec_data-pa.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From dd227da41e953e79c8e05cd6f838a0e267d2d9b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sreerenj Balachandran <sreerenj.balachandran@intel.com> | ||
3 | Date: Fri, 11 Mar 2016 17:44:07 +0200 | ||
4 | Subject: [PATCH] decoder: h265: Fix offset calculation in codec_data parsing | ||
5 | |||
6 | Upstream-status: Backport | ||
7 | |||
8 | https://bugzilla.gnome.org/show_bug.cgi?id=762922 | ||
9 | |||
10 | Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com> | ||
11 | Signed-off-by: Azril Ahmad <mohd.azril.ahmad@intel.com> | ||
12 | Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> | ||
13 | --- | ||
14 | gst-libs/gst/vaapi/gstvaapidecoder_h265.c | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c | ||
18 | index 3c5a9d9..fd8250a 100644 | ||
19 | --- a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c | ||
20 | +++ b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c | ||
21 | @@ -2688,6 +2688,7 @@ gst_vaapi_decoder_h265_decode_codec_data (GstVaapiDecoder * | ||
22 | goto cleanup; | ||
23 | break; | ||
24 | } | ||
25 | + ofs = pi->nalu.offset + pi->nalu.size; | ||
26 | gst_vaapi_parser_info_h265_replace (&pi, NULL); | ||
27 | } | ||
28 | } | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||