mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-12 11:43:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-plugins-base: Fix output buffer can't writable after frame_map() issue

Browse Source 
-Add GST_VIDEO_FRAME_MAP_FLAG_NO_REF
 This makes sure that the buffer is not reffed another time when
 storing it in the GstVideoFrame, keeping it writable if it was writable.

-Use new GST_VIDEO_FRAME_MAP_FLAG_NO_REF to replace the old one because it's kind of ugly.

-Don't ref buffers twice when mapping

(From OE-Core rev: a618f60675dbcc6568d6b9bdee015456cef78a77)

Signed-off-by: Yuqing Zhu <b54851@freescale.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yuqing Zhu
2015-08-10 11:41:36 +08:00
committed by Richard Purdie
parent ec5d33aad7
commit 30e6657456
4 changed files with 185 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch Normal file
View File

@@ -0,0 +1,26 @@
From 269f642c45d85cfd630ed490478e6bd6b71a767f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 16 Sep 2014 01:07:18 +0300
Subject: [PATCH] video-frame: Don't ref buffers twice when mapping
Upstream-Status: Backport [1.5.1]
---
gst-libs/gst/video/video-frame.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst-libs/gst/video/video-frame.c b/gst-libs/gst/video/video-frame.c
index 01f23c0..8a9ae96 100644
--- a/gst-libs/gst/video/video-frame.c
+++ b/gst-libs/gst/video/video-frame.c
@@ -105,7 +105,7 @@ gst_video_frame_map_id (GstVideoFrame * frame, GstVideoInfo * info,
frame->data[i] = frame->map[0].data + info->offset[i];
}
}
- frame->buffer = gst_buffer_ref (buffer);
+ frame->buffer = buffer;
if ((flags & GST_VIDEO_FRAME_MAP_FLAG_NO_REF) == 0)
gst_buffer_ref (frame->buffer);
--
1.7.9.5

87
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch Normal file
View File

@@ -0,0 +1,87 @@
From 40a293d44d1aeccf5eb8e86f23a0b13666111c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 12 Sep 2014 14:39:16 +0300
Subject: [PATCH 2/3] video-frame: Add GST_VIDEO_FRAME_MAP_FLAG_NO_REF
This makes sure that the buffer is not reffed another time when
storing it in the GstVideoFrame, keeping it writable if it was
writable.
Upstream-Status: Backport [1.5.1]
https://bugzilla.gnome.org/show_bug.cgi?id=736118
---
gst-libs/gst/video/video-frame.c | 9 ++++++++-
gst-libs/gst/video/video-frame.h | 18 ++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/gst-libs/gst/video/video-frame.c b/gst-libs/gst/video/video-frame.c
index 537cf70..01f23c0 100644
--- a/gst-libs/gst/video/video-frame.c
+++ b/gst-libs/gst/video/video-frame.c
@@ -106,6 +106,9 @@ gst_video_frame_map_id (GstVideoFrame * frame, GstVideoInfo * info,
}
}
frame->buffer = gst_buffer_ref (buffer);
+ if ((flags & GST_VIDEO_FRAME_MAP_FLAG_NO_REF) == 0)
+ gst_buffer_ref (frame->buffer);
+
frame->meta = meta;
/* buffer flags enhance the frame flags */
@@ -189,11 +192,13 @@ gst_video_frame_unmap (GstVideoFrame * frame)
GstBuffer *buffer;
GstVideoMeta *meta;
gint i;
+ GstMapFlags flags;
g_return_if_fail (frame != NULL);
buffer = frame->buffer;
meta = frame->meta;
+ flags = frame->map[0].flags;
if (meta) {
for (i = 0; i < frame->info.finfo->n_planes; i++) {
@@ -202,7 +207,9 @@ gst_video_frame_unmap (GstVideoFrame * frame)
} else {
gst_buffer_unmap (buffer, &frame->map[0]);
}
- gst_buffer_unref (buffer);
+
+ if ((flags & GST_VIDEO_FRAME_MAP_FLAG_NO_REF) == 0)
+ gst_buffer_unref (frame->buffer);
}
/**
diff --git a/gst-libs/gst/video/video-frame.h b/gst-libs/gst/video/video-frame.h
index 627fab0..f8e6304 100644
--- a/gst-libs/gst/video/video-frame.h
+++ b/gst-libs/gst/video/video-frame.h
@@ -149,6 +149,24 @@ typedef enum {
GST_VIDEO_BUFFER_FLAG_LAST = (GST_BUFFER_FLAG_LAST << 8)
} GstVideoBufferFlags;
+/**
+ * GstVideoBufferFlags:
+ * @GST_VIDEO_FRAME_MAP_FLAG_NO_REF: Don't take another reference of the buffer and store it in
+ * the GstVideoFrame. This makes sure that the buffer stays
+ * writable while the frame is mapped, but requires that the
+ * buffer reference stays valid until the frame is unmapped again.
+ * @GST_VIDEO_FRAME_MAP_FLAG_LAST: Offset to define more flags
+ *
+ * Additional mapping flags for gst_video_frame_map().
+ *
+ * Since: 1.6
+ */
+typedef enum {
+ GST_VIDEO_FRAME_MAP_FLAG_NO_REF = (GST_MAP_FLAG_LAST << 0),
+ GST_VIDEO_FRAME_MAP_FLAG_LAST = (GST_MAP_FLAG_LAST << 8)
+ /* 8 more flags possible afterwards */
+} GstVideoFrameMapFlags;
+
G_END_DECLS
#endif /* __GST_VIDEO_FRAME_H__ */
--
1.7.9.5

69
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch Normal file
View File

@@ -0,0 +1,69 @@
From 3a7cdcdfc9c5b0d20394fe51b3b8cda23931ca6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 12 Sep 2014 14:41:01 +0300
Subject: [PATCH 3/3] videofilter: Use new GST_VIDEO_FRAME_MAP_FLAG_NO_REF
Upstream-Status: Backport [1.5.1]
https://bugzilla.gnome.org/show_bug.cgi?id=736118
---
gst-libs/gst/video/gstvideofilter.c | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/gst-libs/gst/video/gstvideofilter.c b/gst-libs/gst/video/gstvideofilter.c
index e1fa2c1..874b2e8 100644
--- a/gst-libs/gst/video/gstvideofilter.c
+++ b/gst-libs/gst/video/gstvideofilter.c
@@ -260,23 +260,15 @@ gst_video_filter_transform (GstBaseTransform * trans, GstBuffer * inbuf,
if (fclass->transform_frame) {
GstVideoFrame in_frame, out_frame;
- if (!gst_video_frame_map (&in_frame, &filter->in_info, inbuf, GST_MAP_READ))
+ if (!gst_video_frame_map (&in_frame, &filter->in_info, inbuf,
+ GST_MAP_READ | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))
goto invalid_buffer;
if (!gst_video_frame_map (&out_frame, &filter->out_info, outbuf,
- GST_MAP_WRITE))
+ GST_MAP_WRITE | GST_VIDEO_FRAME_MAP_FLAG_NO_REF))
goto invalid_buffer;
- /* GstVideoFrame has another reference, so the buffer looks unwriteable,
- * meaning that we can't attach any metas or anything to it. Other
- * map() functions like gst_buffer_map() don't get another reference
- * of the buffer and expect the buffer reference to be kept until
- * the buffer is unmapped again. */
- gst_buffer_unref (inbuf);
- gst_buffer_unref (outbuf);
res = fclass->transform_frame (filter, &in_frame, &out_frame);
- gst_buffer_ref (inbuf);
- gst_buffer_ref (outbuf);
gst_video_frame_unmap (&out_frame);
gst_video_frame_unmap (&in_frame);
@@ -317,7 +309,7 @@ gst_video_filter_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
GstVideoFrame frame;
GstMapFlags flags;
- flags = GST_MAP_READ;
+ flags = GST_MAP_READ | GST_VIDEO_FRAME_MAP_FLAG_NO_REF;
if (!gst_base_transform_is_passthrough (trans))
flags |= GST_MAP_WRITE;
@@ -325,14 +317,7 @@ gst_video_filter_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
if (!gst_video_frame_map (&frame, &filter->in_info, buf, flags))
goto invalid_buffer;
- /* GstVideoFrame has another reference, so the buffer looks unwriteable,
- * meaning that we can't attach any metas or anything to it. Other
- * map() functions like gst_buffer_map() don't get another reference
- * of the buffer and expect the buffer reference to be kept until
- * the buffer is unmapped again. */
- gst_buffer_unref (buf);
res = fclass->transform_frame_ip (filter, &frame);
- gst_buffer_ref (buf);
gst_video_frame_unmap (&frame);
} else {
--
1.7.9.5

3
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.4.5.bb
View File

@@ -11,6 +11,9 @@ SRC_URI += "file://do-not-change-eos-event-to-gap-event-if.patch \
file://fix-id3demux-utf16-to-utf8-issue.patch \
file://handle-audio-video-decoder-error.patch \
file://videobuffer_updata_alignment_update.patch \
file://0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch \
file://0001-video-frame-Don-t-ref-buffers-twice-when-mapping.patch \
file://0003-videofilter-Use-new-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch \
"
SRC_URI[md5sum] = "357165af625c0ca353ab47c5d843920e"