diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2015-11-05 09:32:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:35 +0000 |
commit | 4a55d12f640410fae25fec76ddf037c208abdaf9 (patch) | |
tree | f921431447ce14184357354f248832526c272e84 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch | |
parent | 8360f23bca2c3e95493ac706ec343479dd3b08dc (diff) | |
download | poky-4a55d12f640410fae25fec76ddf037c208abdaf9.tar.gz |
gstreamer1.0-plugins-base: upgrade to version 1.6.1
A number of patches had to be deleted in order for the recipe to work.
Patches which cannot be applied cleanly to 1.6.1 and are nontrivial to fix:
* 0001-basetextoverlay-make-memory-copy-when-video-buffer-s.patch
* handle-audio-video-decoder-error.patch
* taglist-not-send-to-down-stream-if-all-the-frame-cor.patch
Patches which were rejected by upstream:
* 0002-gstplaysink-don-t-set-async-of-custom-text-sink-to-f.patch
Patches which either were backports or accepted and integrated:
* 0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch
* 0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
* 0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch
* do-not-change-eos-event-to-gap-event2.patch
* do-not-change-eos-event-to-gap-event3.patch
* do-not-change-eos-event-to-gap-event-if.patch
* fix-id3demux-utf16-to-utf8-issue.patch
* videobuffer_updata_alignment_update.patch
* videoencoder-Keep-sticky-events-around-when-doing-a-soft-.patch
(From OE-Core rev: f22fd450babf8c515f86334958f8ca2e0af6f19c)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch deleted file mode 100644 index c465b5ceed..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | From 40a293d44d1aeccf5eb8e86f23a0b13666111c5c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> | ||
3 | Date: Fri, 12 Sep 2014 14:39:16 +0300 | ||
4 | Subject: [PATCH 2/3] video-frame: Add GST_VIDEO_FRAME_MAP_FLAG_NO_REF | ||
5 | |||
6 | This makes sure that the buffer is not reffed another time when | ||
7 | storing it in the GstVideoFrame, keeping it writable if it was | ||
8 | writable. | ||
9 | |||
10 | Upstream-Status: Backport [1.5.1] | ||
11 | https://bugzilla.gnome.org/show_bug.cgi?id=736118 | ||
12 | --- | ||
13 | gst-libs/gst/video/video-frame.c | 9 ++++++++- | ||
14 | gst-libs/gst/video/video-frame.h | 18 ++++++++++++++++++ | ||
15 | 2 files changed, 26 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/gst-libs/gst/video/video-frame.c b/gst-libs/gst/video/video-frame.c | ||
18 | index 537cf70..01f23c0 100644 | ||
19 | --- a/gst-libs/gst/video/video-frame.c | ||
20 | +++ b/gst-libs/gst/video/video-frame.c | ||
21 | @@ -106,6 +106,9 @@ gst_video_frame_map_id (GstVideoFrame * frame, GstVideoInfo * info, | ||
22 | } | ||
23 | } | ||
24 | frame->buffer = gst_buffer_ref (buffer); | ||
25 | + if ((flags & GST_VIDEO_FRAME_MAP_FLAG_NO_REF) == 0) | ||
26 | + gst_buffer_ref (frame->buffer); | ||
27 | + | ||
28 | frame->meta = meta; | ||
29 | |||
30 | /* buffer flags enhance the frame flags */ | ||
31 | @@ -189,11 +192,13 @@ gst_video_frame_unmap (GstVideoFrame * frame) | ||
32 | GstBuffer *buffer; | ||
33 | GstVideoMeta *meta; | ||
34 | gint i; | ||
35 | + GstMapFlags flags; | ||
36 | |||
37 | g_return_if_fail (frame != NULL); | ||
38 | |||
39 | buffer = frame->buffer; | ||
40 | meta = frame->meta; | ||
41 | + flags = frame->map[0].flags; | ||
42 | |||
43 | if (meta) { | ||
44 | for (i = 0; i < frame->info.finfo->n_planes; i++) { | ||
45 | @@ -202,7 +207,9 @@ gst_video_frame_unmap (GstVideoFrame * frame) | ||
46 | } else { | ||
47 | gst_buffer_unmap (buffer, &frame->map[0]); | ||
48 | } | ||
49 | - gst_buffer_unref (buffer); | ||
50 | + | ||
51 | + if ((flags & GST_VIDEO_FRAME_MAP_FLAG_NO_REF) == 0) | ||
52 | + gst_buffer_unref (frame->buffer); | ||
53 | } | ||
54 | |||
55 | /** | ||
56 | diff --git a/gst-libs/gst/video/video-frame.h b/gst-libs/gst/video/video-frame.h | ||
57 | index 627fab0..f8e6304 100644 | ||
58 | --- a/gst-libs/gst/video/video-frame.h | ||
59 | +++ b/gst-libs/gst/video/video-frame.h | ||
60 | @@ -149,6 +149,24 @@ typedef enum { | ||
61 | GST_VIDEO_BUFFER_FLAG_LAST = (GST_BUFFER_FLAG_LAST << 8) | ||
62 | } GstVideoBufferFlags; | ||
63 | |||
64 | +/** | ||
65 | + * GstVideoBufferFlags: | ||
66 | + * @GST_VIDEO_FRAME_MAP_FLAG_NO_REF: Don't take another reference of the buffer and store it in | ||
67 | + * the GstVideoFrame. This makes sure that the buffer stays | ||
68 | + * writable while the frame is mapped, but requires that the | ||
69 | + * buffer reference stays valid until the frame is unmapped again. | ||
70 | + * @GST_VIDEO_FRAME_MAP_FLAG_LAST: Offset to define more flags | ||
71 | + * | ||
72 | + * Additional mapping flags for gst_video_frame_map(). | ||
73 | + * | ||
74 | + * Since: 1.6 | ||
75 | + */ | ||
76 | +typedef enum { | ||
77 | + GST_VIDEO_FRAME_MAP_FLAG_NO_REF = (GST_MAP_FLAG_LAST << 0), | ||
78 | + GST_VIDEO_FRAME_MAP_FLAG_LAST = (GST_MAP_FLAG_LAST << 8) | ||
79 | + /* 8 more flags possible afterwards */ | ||
80 | +} GstVideoFrameMapFlags; | ||
81 | + | ||
82 | G_END_DECLS | ||
83 | |||
84 | #endif /* __GST_VIDEO_FRAME_H__ */ | ||
85 | -- | ||
86 | 1.7.9.5 | ||
87 | |||