From 7ac0204625406c68a3b7e2748f3d40913239f3e5 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron@collabora.com>
Date: Wed, 19 Mar 2014 19:18:11 +0000
Subject: [PATCH] osxvideosink: use the video frame API instead of the video
 meta API

https://bugzilla.gnome.org/show_bug.cgi?id=726738
---
 sys/osxvideo/osxvideosink.h |  2 ++
 sys/osxvideo/osxvideosink.m | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h
index ab57338540..6d51bf397d 100644
--- a/sys/osxvideo/osxvideosink.h
+++ b/sys/osxvideo/osxvideosink.h
@@ -27,6 +27,7 @@
 #ifndef __GST_OSX_VIDEO_SINK_H__
 #define __GST_OSX_VIDEO_SINK_H__
 
+#include <gst/video/video.h>
 #include <gst/video/gstvideosink.h>
 
 #include <string.h>
@@ -83,6 +84,7 @@ struct _GstOSXVideoSink {
   NSView *superview;
   gboolean keep_par;
   gboolean embed;
+  GstVideoInfo info;
 };
 
 struct _GstOSXVideoSinkClass {
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 612fdfabed..47956978de 100644
--- a/sys/osxvideo/osxvideosink.m
+++ b/sys/osxvideo/osxvideosink.m
@@ -375,6 +375,9 @@ gst_osx_video_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
 
   gst_osx_video_sink_osxwindow_resize (osxvideosink, osxvideosink->osxwindow,
       video_width, video_height);
+
+  gst_video_info_from_caps (&osxvideosink->info, caps);
+
   result = TRUE;
 
 beach:
@@ -875,8 +878,7 @@ gst_osx_video_sink_get_type (void)
 
 - (void) showFrame: (GstBufferObject *) object
 {
-  GstMapInfo info;
-  GstVideoMeta *vmeta;
+  GstVideoFrame frame;
   guint8 *data, *readp, *writep;
   gint i, active_width, stride;
   guint8 *texture_buffer;
@@ -891,9 +893,11 @@ gst_osx_video_sink_get_type (void)
   if (G_UNLIKELY (texture_buffer == NULL))
       goto no_texture_buffer;
 
-  vmeta = (GstVideoMeta *) gst_buffer_get_meta (buf, GST_VIDEO_META_API_TYPE);
-  gst_video_meta_map (vmeta, 0, &info, (gpointer *) &data, &stride, GST_MAP_READ);
-  readp = data;
+  if (!gst_video_frame_map (&frame, &osxvideosink->info, buf, GST_MAP_READ))
+      goto no_map;
+
+  data = readp = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
+  stride = GST_VIDEO_FRAME_PLANE_STRIDE (&frame, 0);
   writep = texture_buffer;
   active_width = GST_VIDEO_SINK_WIDTH (osxvideosink) * sizeof (short);
   for (i = 0; i < GST_VIDEO_SINK_HEIGHT (osxvideosink); i++) {
@@ -903,7 +907,7 @@ gst_osx_video_sink_get_type (void)
   }
   [osxvideosink->osxwindow->gstview displayTexture];
 
-  gst_video_meta_unmap (vmeta, 0, &info);
+  gst_video_frame_unmap (&frame);
 
 out:
   GST_OBJECT_UNLOCK (osxvideosink);
@@ -912,6 +916,10 @@ out:
   [pool release];
   return;
 
+no_map:
+  GST_WARNING_OBJECT (osxvideosink, "couldn't map frame");
+  goto out;
+
 no_window:
   GST_WARNING_OBJECT (osxvideosink, "not showing frame since we have no window (!?)");
   goto out;