diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-07-25 12:03:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:44:41 +0100 |
commit | 6bf811e9bda84e12791328227b5834dd5ce83ce5 (patch) | |
tree | e5167e31106e12a3959ef03a7a24ff7b715b5de1 /meta/recipes-multimedia | |
parent | a5528d9010046a72e0b642cdfed9c5f0782eaa5f (diff) | |
download | poky-6bf811e9bda84e12791328227b5834dd5ce83ce5.tar.gz |
gstreamer1.0-vaapi: backport jpeg encode/decode fixes
Backport patches from 1.15 to fix JPEG encode/decode issues when
using VAAPI with Intel media-driver. See for details:
https://bugzilla.gnome.org/show_bug.cgi?id=796705
https://bugzilla.gnome.org/show_bug.cgi?id=796505
(From OE-Core rev: 507135276293287deed972d49feed511c21391a0)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
3 files changed, 112 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-decoder-release-VA-buffers-after-vaEndPicture.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-decoder-release-VA-buffers-after-vaEndPicture.patch new file mode 100644 index 0000000000..b52e61bd03 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-decoder-release-VA-buffers-after-vaEndPicture.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From bb8894aaf934b3af4d44cf54e860510fe4d615b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tianhao Liu <tianhao.liu@intel.com> | ||
3 | Date: Thu, 7 Jun 2018 09:34:11 +0800 | ||
4 | Subject: [PATCH] libs: decoder: release VA buffers after vaEndPicture | ||
5 | |||
6 | This change is due a problem decoding JPEGs with Intel's media-driver: | ||
7 | no image was generated. | ||
8 | |||
9 | This patch relases the VA buffers after vaEndPicture() is called, | ||
10 | and not before (after vaRenderPicture()). | ||
11 | |||
12 | https://bugzilla.gnome.org/show_bug.cgi?id=796505 | ||
13 | |||
14 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/bb8894aaf934b3af4d44cf54e860510fe4d615b3] | ||
15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
16 | --- | ||
17 | gst-libs/gst/vaapi/gstvaapidecoder_objects.c | 7 ++++++- | ||
18 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_objects.c b/gst-libs/gst/vaapi/gstvaapidecoder_objects.c | ||
21 | index 20d4f55..2dd4c27 100644 | ||
22 | --- a/gst-libs/gst/vaapi/gstvaapidecoder_objects.c | ||
23 | +++ b/gst-libs/gst/vaapi/gstvaapidecoder_objects.c | ||
24 | @@ -304,12 +304,17 @@ gst_vaapi_picture_decode (GstVaapiPicture * picture) | ||
25 | status = vaRenderPicture (va_display, va_context, va_buffers, 2); | ||
26 | if (!vaapi_check_status (status, "vaRenderPicture()")) | ||
27 | return FALSE; | ||
28 | + } | ||
29 | + | ||
30 | + status = vaEndPicture (va_display, va_context); | ||
31 | + | ||
32 | + for (i = 0; i < picture->slices->len; i++) { | ||
33 | + GstVaapiSlice *const slice = g_ptr_array_index (picture->slices, i); | ||
34 | |||
35 | vaapi_destroy_buffer (va_display, &slice->param_id); | ||
36 | vaapi_destroy_buffer (va_display, &slice->data_id); | ||
37 | } | ||
38 | |||
39 | - status = vaEndPicture (va_display, va_context); | ||
40 | if (!vaapi_check_status (status, "vaEndPicture()")) | ||
41 | return FALSE; | ||
42 | return TRUE; | ||
43 | -- | ||
44 | 2.7.4 | ||
45 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-encoder-jpeg-set-component-id-and-Tqi.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-encoder-jpeg-set-component-id-and-Tqi.patch new file mode 100644 index 0000000000..eb1228ba3d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-libs-encoder-jpeg-set-component-id-and-Tqi.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From f5eb4faa5914f3745820e557ac2401a7d738be66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tianhao Liu <tianhao.liu@intel.com> | ||
3 | Date: Wed, 4 Jul 2018 12:51:10 +0800 | ||
4 | Subject: [PATCH] libs: encoder: jpeg: set component id and Tqi | ||
5 | |||
6 | This change is due a problem encoding JPEGs with Intel's | ||
7 | media-driver: green/black image when playback jpeg | ||
8 | |||
9 | This patch sets component identifier and quantization table | ||
10 | destination selector in frame header to support packing headers | ||
11 | by Intel's media-driver that does not accept packed header | ||
12 | in AP level. | ||
13 | |||
14 | https://bugzilla.gnome.org/show_bug.cgi?id=796705 | ||
15 | |||
16 | Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/f5eb4faa5914f3745820e557ac2401a7d738be66] | ||
17 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
18 | --- | ||
19 | gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c | 14 +++++++++----- | ||
20 | 1 file changed, 9 insertions(+), 5 deletions(-) | ||
21 | |||
22 | diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c b/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c | ||
23 | index b3f409d..8491fbc 100644 | ||
24 | --- a/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c | ||
25 | +++ b/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c | ||
26 | @@ -205,6 +205,7 @@ fill_picture (GstVaapiEncoderJpeg * encoder, | ||
27 | GstVaapiEncPicture * picture, | ||
28 | GstVaapiCodedBuffer * codedbuf, GstVaapiSurfaceProxy * surface) | ||
29 | { | ||
30 | + guint i; | ||
31 | VAEncPictureParameterBufferJPEG *const pic_param = picture->param; | ||
32 | |||
33 | memset (pic_param, 0, sizeof (VAEncPictureParameterBufferJPEG)); | ||
34 | @@ -224,6 +225,11 @@ fill_picture (GstVaapiEncoderJpeg * encoder, | ||
35 | pic_param->num_scan = 1; | ||
36 | pic_param->num_components = encoder->n_components; | ||
37 | pic_param->quality = encoder->quality; | ||
38 | + for (i = 0; i < pic_param->num_components; i++) { | ||
39 | + pic_param->component_id[i] = i + 1; | ||
40 | + if (i != 0) | ||
41 | + pic_param->quantiser_table_selector[i] = 1; | ||
42 | + } | ||
43 | return TRUE; | ||
44 | } | ||
45 | |||
46 | @@ -437,13 +443,11 @@ generate_frame_hdr (GstJpegFrameHdr * frame_hdr, GstVaapiEncoderJpeg * encoder, | ||
47 | frame_hdr->num_components = pic_param->num_components; | ||
48 | |||
49 | for (i = 0; i < frame_hdr->num_components; i++) { | ||
50 | - frame_hdr->components[i].identifier = i + 1; | ||
51 | + frame_hdr->components[i].identifier = pic_param->component_id[i]; | ||
52 | frame_hdr->components[i].horizontal_factor = encoder->h_samp[i]; | ||
53 | frame_hdr->components[i].vertical_factor = encoder->v_samp[i]; | ||
54 | - if (i == 0) | ||
55 | - frame_hdr->components[i].quant_table_selector = 0; | ||
56 | - else | ||
57 | - frame_hdr->components[i].quant_table_selector = 1; | ||
58 | + frame_hdr->components[i].quant_table_selector = | ||
59 | + pic_param->quantiser_table_selector[i]; | ||
60 | } | ||
61 | } | ||
62 | |||
63 | -- | ||
64 | 2.7.4 | ||
65 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb index 3896434104..6243edd64d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.4.bb | |||
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | |||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ |
12 | file://0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch \ | 12 | file://0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch \ |
13 | file://0001-vaapsink-downgrade-to-marginal.patch \ | 13 | file://0001-vaapsink-downgrade-to-marginal.patch \ |
14 | file://0001-libs-encoder-jpeg-set-component-id-and-Tqi.patch \ | ||
15 | file://0001-libs-decoder-release-VA-buffers-after-vaEndPicture.patch \ | ||
14 | " | 16 | " |
15 | 17 | ||
16 | SRC_URI[md5sum] = "2fae3442f5f23e7354a0c592bc7b9065" | 18 | SRC_URI[md5sum] = "2fae3442f5f23e7354a0c592bc7b9065" |