diff options
author | Yuqing Zhu <b54851@freescale.com> | 2015-08-10 11:41:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 08:51:59 -0700 |
commit | a618f60675dbcc6568d6b9bdee015456cef78a77 (patch) | |
tree | 6e3dc88322c318b0e7174393c4fa79f632b197f1 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch | |
parent | d0b5780125926eb33cc82f17c679e16e64312478 (diff) | |
download | openembedded-core-contrib-a618f60675dbcc6568d6b9bdee015456cef78a77.tar.gz |
gstreamer1.0-plugins-base: Fix output buffer can't writable after frame_map() issue
-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
Signed-off-by: Yuqing Zhu <b54851@freescale.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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, 87 insertions, 0 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 new file mode 100644 index 0000000000..c465b5ceed --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-video-frame-Add-GST_VIDEO_FRAME_MAP_FLAG_NO_REF.patch @@ -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 + |