diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2014-09-12 14:39:16 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-09-12 14:39:16 +0300 |
commit | 40a293d44d1aeccf5eb8e86f23a0b13666111c5c (patch) | |
tree | 494a2fc44fa480cadc672b88462eb1259ae4b7c2 | |
parent | f711288c7c86c33aed18f52ed6d7787d19b7741d (diff) |
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.
https://bugzilla.gnome.org/show_bug.cgi?id=736118
-rw-r--r-- | gst-libs/gst/video/video-frame.c | 9 | ||||
-rw-r--r-- | gst-libs/gst/video/video-frame.h | 18 |
2 files changed, 26 insertions, 1 deletions
diff --git a/gst-libs/gst/video/video-frame.c b/gst-libs/gst/video/video-frame.c index 537cf7092..01f23c086 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 627fab0a2..f8e630463 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__ */ |