[vlc-commits] vout: decklink: schedule frames in prepare

Francois Cartegnie git at videolan.org
Sun Nov 27 21:57:35 CET 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Nov 27 18:20:46 2016 +0100| [5c2ac7eee3c85cd48306f63ff9b0350031bf38aa] | committer: Francois Cartegnie

vout: decklink: schedule frames in prepare

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c2ac7eee3c85cd48306f63ff9b0350031bf38aa
---

 modules/video_output/decklink.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 9783ed2..1b2da70 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -780,7 +780,7 @@ static void send_AFD(uint8_t afdcode, uint8_t ar, uint8_t *buf)
     }
 }
 
-static void DisplayVideo(vout_display_t *vd, picture_t *picture, subpicture_t *)
+static void PrepareVideo(vout_display_t *vd, picture_t *picture, subpicture_t *)
 {
     vout_display_sys_t *sys = vd->sys;
     struct decklink_sys_t *decklink_sys = GetDLSys(VLC_OBJECT(vd));
@@ -902,7 +902,11 @@ static void DisplayVideo(vout_display_t *vd, picture_t *picture, subpicture_t *)
 end:
     if (pDLVideoFrame)
         pDLVideoFrame->Release();
-    picture_Release(orig_picture);
+}
+
+static void DisplayVideo(vout_display_t *, picture_t *picture, subpicture_t *)
+{
+    picture_Release(picture);
 }
 
 static int ControlVideo(vout_display_t *vd, int query, va_list args)
@@ -971,7 +975,7 @@ static int OpenVideo(vlc_object_t *p_this)
     }
     vd->info.has_hide_mouse = true;
     vd->pool    = PoolVideo;
-    vd->prepare = NULL;
+    vd->prepare = PrepareVideo;
     vd->display = DisplayVideo;
     vd->control = ControlVideo;
     vd->manage  = NULL;



More information about the vlc-commits mailing list