commit bcce4a30efee96ef78fcbbec95845e930f116bc7
author Haihua Hu <jared.hu@nxp.com> Wed Oct 17 19:06:22 2018 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 16:18:11 2018 +0800
tree ca8b77d2108f847cb441ae3920074f3fe2bc63e6
parent f332f8eabe8869f0964ab5e8fbbc4196ce0d50a5

MMFMWK-8288 waylandsink: fix buffer map fail when swith to internal buffer

upstream will send out non-dmabuf even using our buffer pool
So we should map buffer using original info when input buffer is not
dmabuf

upstream status: imx specific

ext/wayland/gstwaylandsink.c

diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index 9537d98..2abfa0b 100644
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -650,6 +650,8 @@
   if (!gst_video_info_from_caps (&sink->video_info, caps))
     goto invalid_format;
 
+  sink->src_info = sink->video_info;
+
   format = GST_VIDEO_INFO_FORMAT (&sink->video_info);
   sink->video_info_changed = TRUE;
 
@@ -936,7 +938,6 @@
   /* If nothing worked, copy into our internal pool */
   if (!wbuf) {
     GstVideoFrame src, dst;
-    GstVideoInfo src_info = sink->video_info;
 
     /* rollback video info changes */
     sink->video_info = old_vinfo;
@@ -1016,7 +1017,7 @@
             GST_MAP_WRITE))
       goto dst_map_failed;
 
-    if (!gst_video_frame_map (&src, &src_info, buffer, GST_MAP_READ)) {
+    if (!gst_video_frame_map (&src, &sink->src_info, buffer, GST_MAP_READ)) {
       gst_video_frame_unmap (&dst);
       goto src_map_failed;
     }

ext/wayland/gstwaylandsink.h

diff --git a/ext/wayland/gstwaylandsink.h b/ext/wayland/gstwaylandsink.h
index 3b82977..2288319 100644
--- a/ext/wayland/gstwaylandsink.h
+++ b/ext/wayland/gstwaylandsink.h
@@ -63,6 +63,7 @@
 
   gboolean video_info_changed;
   GstVideoInfo video_info;
+  GstVideoInfo src_info;
 
   /* preferred window resolution */
   gint preferred_width, preferred_height;