X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=be0095a6050be72c62b8a0b9af65277a329040c8;hb=4d2de10dca4a2368d2d7e99b6a65115710add5da;hp=aa359ed50507bb9bc00b3273661d56729baeb680;hpb=25174a7dd002e752c668ddeb6692ef0b5e9f1c20;p=vlc

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index aa359ed505..be0095a605 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -44,6 +44,7 @@
 
 #include <vlc_filter.h>
 #include <vlc_vout_osd.h>
+#include <vlc_image.h>
 
 #include <libvlc.h>
 #include "vout_internal.h"
@@ -68,7 +69,7 @@ static void VoutDestructor(vlc_object_t *);
 #define VOUT_DISPLAY_LATE_THRESHOLD (INT64_C(20000))
 
 /* Better be in advance when awakening than late... */
-#define VOUT_MWAIT_TOLERANCE (INT64_C(1000))
+#define VOUT_MWAIT_TOLERANCE (INT64_C(4000))
 
 /* */
 static int VoutValidateFormat(video_format_t *dst,
@@ -118,33 +119,36 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
     vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT);
 
     vout_statistic_Init(&vout->p->statistic);
-    vout->p->i_par_num =
-    vout->p->i_par_den = 1;
 
     vout_snapshot_Init(&vout->p->snapshot);
 
     /* Initialize locks */
     vlc_mutex_init(&vout->p->picture_lock);
-    vlc_mutex_init(&vout->p->vfilter_lock);
+    vlc_mutex_init(&vout->p->filter.lock);
+    vlc_mutex_init(&vout->p->spu_lock);
 
     /* Attach the new object now so we can use var inheritance below */
     vlc_object_attach(vout, object);
 
     /* Initialize subpicture unit */
-    vout->p->p_spu = spu_Create(vout);
+    vout->p->spu = spu_Create(vout);
 
     /* Take care of some "interface/control" related initialisations */
     vout_IntfInit(vout);
 
+    vout->p->title.show     = var_GetBool(vout, "video-title-show");
+    vout->p->title.timeout  = var_GetInteger(vout, "video-title-timeout");
+    vout->p->title.position = var_GetInteger(vout, "video-title-position");
+
     /* Get splitter name if present */
-    char *splitter_name = var_GetNonEmptyString(vout, "vout-filter");
-    if (splitter_name) {
+    char *splitter_name = var_InheritString(vout, "video-splitter");
+    if (splitter_name && *splitter_name) {
         if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0)
             vout->p->splitter_name = NULL;
-        free(splitter_name);
     } else {
         vout->p->splitter_name = NULL;
     }
+    free(splitter_name);
 
     /* */
     vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);
@@ -155,7 +159,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
     /* */
     if (vlc_clone(&vout->p->thread, Thread, vout,
                   VLC_THREAD_PRIORITY_OUTPUT)) {
-        spu_Destroy(vout->p->p_spu);
+        spu_Destroy(vout->p->spu);
         vlc_object_release(vout);
         return NULL;
     }
@@ -170,7 +174,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
 
     vout->p->input = cfg->input;
     if (vout->p->input)
-        spu_Attach(vout->p->p_spu, vout->p->input, true);
+        spu_Attach(vout->p->spu, vout->p->input, true);
 
     return vout;
 }
@@ -189,10 +193,10 @@ vout_thread_t *(vout_Request)(vlc_object_t *object,
     if (vout) {
         if (vout->p->input != cfg->input) {
             if (vout->p->input)
-                spu_Attach(vout->p->p_spu, vout->p->input, false);
+                spu_Attach(vout->p->spu, vout->p->input, false);
             vout->p->input = cfg->input;
             if (vout->p->input)
-                spu_Attach(vout->p->p_spu, vout->p->input, true);
+                spu_Attach(vout->p->spu, vout->p->input, true);
         }
 
         if (cfg->change_fmt) {
@@ -215,27 +219,22 @@ vout_thread_t *(vout_Request)(vlc_object_t *object,
     return VoutCreate(object, cfg);
 }
 
-/*****************************************************************************
- * vout_Close: Close a vout created by VoutCreate.
- *****************************************************************************
- * You HAVE to call it on vout created by VoutCreate before vlc_object_release.
- * You should NEVER call it on vout not obtained through VoutCreate
- * (like with vout_Request or vlc_object_find.)
- * You can use vout_CloseAndRelease() as a convenience method.
- *****************************************************************************/
 void vout_Close(vout_thread_t *vout)
 {
     assert(vout);
 
     if (vout->p->input)
-        spu_Attach(vout->p->p_spu, vout->p->input, false);
+        spu_Attach(vout->p->spu, vout->p->input, false);
 
     vout_snapshot_End(&vout->p->snapshot);
 
     vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN);
     vlc_join(vout->p->thread, NULL);
 
-    spu_Destroy(vout->p->p_spu);
+    vlc_mutex_lock(&vout->p->spu_lock);
+    spu_Destroy(vout->p->spu);
+    vout->p->spu = NULL;
+    vlc_mutex_unlock(&vout->p->spu_lock);
 }
 
 /* */
@@ -249,8 +248,9 @@ static void VoutDestructor(vlc_object_t *object)
     free(vout->p->splitter_name);
 
     /* Destroy the locks */
+    vlc_mutex_destroy(&vout->p->spu_lock);
     vlc_mutex_destroy(&vout->p->picture_lock);
-    vlc_mutex_destroy(&vout->p->vfilter_lock);
+    vlc_mutex_destroy(&vout->p->filter.lock);
     vout_control_Clean(&vout->p->control);
 
     /* */
@@ -356,7 +356,14 @@ void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
 }
 int vout_RegisterSubpictureChannel( vout_thread_t *vout )
 {
-    return spu_RegisterChannel(vout->p->p_spu);
+    int channel = SPU_DEFAULT_CHANNEL;
+
+    vlc_mutex_lock(&vout->p->spu_lock);
+    if (vout->p->spu)
+        channel = spu_RegisterChannel(vout->p->spu);
+    vlc_mutex_unlock(&vout->p->spu_lock);
+
+    return channel;
 }
 void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
 {
@@ -364,6 +371,110 @@ void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
                              channel);
 }
 
+/**
+ * It retreives a picture from the vout or NULL if no pictures are
+ * available yet.
+ *
+ * You MUST call vout_PutPicture or vout_ReleasePicture on it.
+ *
+ * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a
+ * read-only reference.
+ */
+picture_t *vout_GetPicture(vout_thread_t *vout)
+{
+    /* Get lock */
+    vlc_mutex_lock(&vout->p->picture_lock);
+    picture_t *picture = picture_pool_Get(vout->p->decoder_pool);
+    if (picture) {
+        picture_Reset(picture);
+        picture->p_next = NULL;
+    }
+    vlc_mutex_unlock(&vout->p->picture_lock);
+
+    return picture;
+}
+
+/**
+ * It gives to the vout a picture to be displayed.
+ *
+ * The given picture MUST comes from vout_GetPicture.
+ *
+ * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
+ * read/used.
+ */
+void vout_PutPicture(vout_thread_t *vout, picture_t *picture)
+{
+    vlc_mutex_lock(&vout->p->picture_lock);
+
+    picture->p_next = NULL;
+    picture_fifo_Push(vout->p->decoder_fifo, picture);
+
+    vlc_mutex_unlock(&vout->p->picture_lock);
+
+    vout_control_Wake(&vout->p->control);
+}
+
+/**
+ * It releases a picture retreived by vout_GetPicture.
+ */
+void vout_ReleasePicture(vout_thread_t *vout, picture_t *picture)
+{
+    vlc_mutex_lock(&vout->p->picture_lock);
+
+    picture_Release(picture);
+
+    vlc_mutex_unlock(&vout->p->picture_lock);
+
+    vout_control_Wake(&vout->p->control);
+}
+
+/**
+ * It increment the reference counter of a picture retreived by
+ * vout_GetPicture.
+ */
+void vout_HoldPicture(vout_thread_t *vout, picture_t *picture)
+{
+    vlc_mutex_lock(&vout->p->picture_lock);
+
+    picture_Hold(picture);
+
+    vlc_mutex_unlock(&vout->p->picture_lock);
+}
+
+/* */
+int vout_GetSnapshot(vout_thread_t *vout,
+                     block_t **image_dst, picture_t **picture_dst,
+                     video_format_t *fmt,
+                     const char *type, mtime_t timeout)
+{
+    picture_t *picture = vout_snapshot_Get(&vout->p->snapshot, timeout);
+    if (!picture) {
+        msg_Err(vout, "Failed to grab a snapshot");
+        return VLC_EGENERIC;
+    }
+
+    if (image_dst) {
+        vlc_fourcc_t codec = VLC_CODEC_PNG;
+        if (type && image_Type2Fourcc(type))
+            codec = image_Type2Fourcc(type);
+
+        const int override_width  = var_GetInteger(vout, "snapshot-width");
+        const int override_height = var_GetInteger(vout, "snapshot-height");
+
+        if (picture_Export(VLC_OBJECT(vout), image_dst, fmt,
+                           picture, codec, override_width, override_height)) {
+            msg_Err(vout, "Failed to convert image for snapshot");
+            picture_Release(picture);
+            return VLC_EGENERIC;
+        }
+    }
+    if (picture_dst)
+        *picture_dst = picture;
+    else
+        picture_Release(picture);
+    return VLC_SUCCESS;
+}
+
 /* vout_Control* are usable by anyone at anytime */
 void vout_ControlChangeFullscreen(vout_thread_t *vout, bool fullscreen)
 {
@@ -431,6 +542,11 @@ void vout_ControlChangeSubFilters(vout_thread_t *vout, const char *filters)
     vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_FILTERS,
                             filters);
 }
+void vout_ControlChangeSubMargin(vout_thread_t *vout, int margin)
+{
+    vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_MARGIN,
+                             margin);
+}
 
 /* */
 static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
@@ -443,8 +559,14 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
     cfg->display.width   = display_width > 0  ? display_width  : 0;
     cfg->display.height  = display_height > 0 ? display_height : 0;
     cfg->is_display_filled  = var_CreateGetBool(vout, "autoscale");
-    cfg->display.sar.num = 1; /* TODO monitor AR */
-    cfg->display.sar.den = 1;
+    unsigned msar_num, msar_den;
+    if (var_InheritURational(vout, &msar_num, &msar_den, "monitor-par") ||
+        msar_num <= 0 || msar_den <= 0) {
+        msar_num = 1;
+        msar_den = 1;
+    }
+    cfg->display.sar.num = msar_num;
+    cfg->display.sar.den = msar_den;
     unsigned zoom_den = 1000;
     unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
     vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
@@ -458,9 +580,9 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
     else if (align_mask & 0x2)
         cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT;
     if (align_mask & 0x4)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_TOP;
+        cfg->align.vertical = VOUT_DISPLAY_ALIGN_TOP;
     else if (align_mask & 0x8)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM;
+        cfg->align.vertical = VOUT_DISPLAY_ALIGN_BOTTOM;
 }
 
 vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
@@ -493,7 +615,7 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
         vout->p->window.object    = NULL;
     }
 
-    vout_window_t *window = vout_window_New(VLC_OBJECT(vout), NULL,
+    vout_window_t *window = vout_window_New(VLC_OBJECT(vout), "$window",
                                             &cfg_override);
     if (!window)
         return NULL;
@@ -521,212 +643,275 @@ void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
 }
 
 /* */
-static picture_t *VoutVideoFilterNewPicture(filter_t *filter)
+
+static picture_t *VoutVideoFilterInteractiveNewPicture(filter_t *filter)
 {
     vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
+
     return picture_pool_Get(vout->p->private_pool);
 }
+static picture_t *VoutVideoFilterStaticNewPicture(filter_t *filter)
+{
+    vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
+
+    vlc_assert_locked(&vout->p->filter.lock);
+    if (filter_chain_GetLength(vout->p->filter.chain_interactive) == 0)
+        return VoutVideoFilterInteractiveNewPicture(filter);
+    return picture_NewFromFormat(&filter->fmt_out.video);
+}
 static void VoutVideoFilterDelPicture(filter_t *filter, picture_t *picture)
 {
     VLC_UNUSED(filter);
     picture_Release(picture);
 }
-static int VoutVideoFilterAllocationSetup(filter_t *filter, void *data)
+static int VoutVideoFilterStaticAllocationSetup(filter_t *filter, void *data)
 {
-    filter->pf_video_buffer_new = VoutVideoFilterNewPicture;
+    filter->pf_video_buffer_new = VoutVideoFilterStaticNewPicture;
+    filter->pf_video_buffer_del = VoutVideoFilterDelPicture;
+    filter->p_owner             = data; /* vout */
+    return VLC_SUCCESS;
+}
+static int VoutVideoFilterInteractiveAllocationSetup(filter_t *filter, void *data)
+{
+    filter->pf_video_buffer_new = VoutVideoFilterInteractiveNewPicture;
     filter->pf_video_buffer_del = VoutVideoFilterDelPicture;
     filter->p_owner             = data; /* vout */
     return VLC_SUCCESS;
 }
 
 /* */
-static int ThreadDisplayPicture(vout_thread_t *vout,
-                                bool now, mtime_t *deadline)
+static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_late_dropped)
 {
-    vout_display_t *vd = vout->p->display.vd;
-    int displayed_count = 0;
     int lost_count = 0;
 
-    for (;;) {
-        const mtime_t date = mdate();
-        const bool is_paused = vout->p->pause.is_on;
-        bool redisplay = is_paused && !now && vout->p->displayed.decoded;
-        bool is_forced;
-
-        /* FIXME/XXX we must redisplay the last decoded picture (because
-         * of potential vout updated, or filters update or SPU update)
-         * For now a high update period is needed but it coulmd be removed
-         * if and only if:
-         * - vout module emits events from theselves.
-         * - *and* SPU is modified to emit an event or a deadline when needed.
-         *
-         * So it will be done latter.
-         */
-        if (!redisplay) {
-            picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo);
-            if (peek) {
-                is_forced = peek->b_force || is_paused || now;
-                *deadline = (is_forced ? date : peek->date) - vout_chrono_GetHigh(&vout->p->render);
-                picture_Release(peek);
-            } else {
-                redisplay = true;
-            }
-        }
-        if (redisplay) {
-             /* FIXME a better way for this delay is needed */
-            const mtime_t date_update = vout->p->displayed.date + VOUT_REDISPLAY_DELAY;
-            if (date_update > date || !vout->p->displayed.decoded) {
-                *deadline = vout->p->displayed.decoded ? date_update : VLC_TS_INVALID;
-                break;
-            }
-            /* */
-            is_forced = true;
-            *deadline = date - vout_chrono_GetHigh(&vout->p->render);
-        }
-        if (*deadline > VOUT_MWAIT_TOLERANCE)
-            *deadline -= VOUT_MWAIT_TOLERANCE;
+    vlc_mutex_lock(&vout->p->filter.lock);
 
-        /* If we are too early and can wait, do it */
-        if (date < *deadline && !now)
-            break;
+    picture_t *picture = filter_chain_VideoFilter(vout->p->filter.chain_static, NULL);
+    assert(!reuse || !picture);
 
+    while (!picture) {
         picture_t *decoded;
-        if (redisplay) {
-            decoded = vout->p->displayed.decoded;
-            vout->p->displayed.decoded = NULL;
+        if (reuse && vout->p->displayed.decoded) {
+            decoded = picture_Hold(vout->p->displayed.decoded);
         } else {
             decoded = picture_fifo_Pop(vout->p->decoder_fifo);
-            assert(decoded);
-            if (!is_forced && !vout->p->is_late_dropped) {
-                const mtime_t predicted = date + vout_chrono_GetLow(&vout->p->render);
+            if (is_late_dropped && decoded && !decoded->b_force) {
+                const mtime_t predicted = mdate() + 0; /* TODO improve */
                 const mtime_t late = predicted - decoded->date;
-                if (late > 0) {
+                if (late > VOUT_DISPLAY_LATE_THRESHOLD) {
+                    msg_Warn(vout, "picture is too late to be displayed (missing %d ms)", (int)(late/1000));
+                    picture_Release(decoded);
+                    lost_count++;
+                    continue;
+                } else if (late > 0) {
                     msg_Dbg(vout, "picture might be displayed late (missing %d ms)", (int)(late/1000));
-                    if (late > VOUT_DISPLAY_LATE_THRESHOLD) {
-                        msg_Warn(vout, "rejected picture because of render time");
-                        /* TODO */
-                        picture_Release(decoded);
-                        lost_count++;
-                        break;
-                    }
                 }
             }
-
-            vout->p->displayed.is_interlaced = !decoded->b_progressive;
-            vout->p->displayed.qtype         = decoded->i_qtype;
         }
-        vout->p->displayed.timestamp = decoded->date;
+        if (!decoded)
+            break;
+        reuse = false;
 
-        /* */
         if (vout->p->displayed.decoded)
             picture_Release(vout->p->displayed.decoded);
-        picture_Hold(decoded);
-        vout->p->displayed.decoded = decoded;
-
-        /* */
-        vout_chrono_Start(&vout->p->render);
-
-        picture_t *filtered = NULL;
-        if (decoded) {
-            vlc_mutex_lock(&vout->p->vfilter_lock);
-            filtered = filter_chain_VideoFilter(vout->p->vfilter_chain, decoded);
-            //assert(filtered == decoded); // TODO implement
-            vlc_mutex_unlock(&vout->p->vfilter_lock);
-            if (!filtered)
-                continue;
-        }
 
-        /*
-         * Check for subpictures to display
-         */
-        const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
-        mtime_t spu_render_time = is_forced ? mdate() : filtered->date;
-        if (vout->p->pause.is_on)
-            spu_render_time = vout->p->pause.date;
+        vout->p->displayed.decoded       = picture_Hold(decoded);
+        vout->p->displayed.timestamp     = decoded->date;
+        vout->p->displayed.is_interlaced = !decoded->b_progressive;
+        vout->p->displayed.qtype         = decoded->i_qtype;
+
+        picture = filter_chain_VideoFilter(vout->p->filter.chain_static, decoded);
+    }
+
+    vlc_mutex_unlock(&vout->p->filter.lock);
+
+    vout_statistic_Update(&vout->p->statistic, 0, lost_count);
+    if (!picture)
+        return VLC_EGENERIC;
+
+    assert(!vout->p->displayed.next);
+    if (!vout->p->displayed.current)
+        vout->p->displayed.current = picture;
+    else
+        vout->p->displayed.next    = picture;
+    return VLC_SUCCESS;
+}
+
+static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
+{
+    vout_display_t *vd = vout->p->display.vd;
+
+    picture_t *torender = picture_Hold(vout->p->displayed.current);
+
+    vout_chrono_Start(&vout->p->render);
+
+    vlc_mutex_lock(&vout->p->filter.lock);
+    picture_t *filtered = filter_chain_VideoFilter(vout->p->filter.chain_interactive, torender);
+    vlc_mutex_unlock(&vout->p->filter.lock);
+
+    if (!filtered)
+        return VLC_EGENERIC;
+
+    if (filtered->date != vout->p->displayed.current->date)
+        msg_Warn(vout, "Unsupported timestamp modifications done by chain_interactive");
+
+    /*
+     * Check for subpictures to display
+     */
+    const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
+    mtime_t spu_render_time = is_forced ? mdate() : filtered->date;
+    if (vout->p->pause.is_on)
+        spu_render_time = vout->p->pause.date;
+    else
+        spu_render_time = filtered->date > 1 ? filtered->date : mdate();
+
+    subpicture_t *subpic = spu_SortSubpictures(vout->p->spu,
+                                               spu_render_time,
+                                               do_snapshot);
+    /*
+     * Perform rendering
+     *
+     * We have to:
+     * - be sure to end up with a direct buffer.
+     * - blend subtitles, and in a fast access buffer
+     */
+    picture_t *direct = NULL;
+    if (filtered &&
+        (vout->p->decoder_pool != vout->p->display_pool || subpic)) {
+        picture_t *render;
+        if (vout->p->is_decoder_pool_slow)
+            render = picture_NewFromFormat(&vd->source);
+        else if (vout->p->decoder_pool != vout->p->display_pool)
+            render = picture_pool_Get(vout->p->display_pool);
         else
-            spu_render_time = filtered->date > 1 ? filtered->date : mdate();
-
-        subpicture_t *subpic = spu_SortSubpictures(vout->p->p_spu,
-                                                   spu_render_time,
-                                                   do_snapshot);
-        /*
-         * Perform rendering
-         *
-         * We have to:
-         * - be sure to end up with a direct buffer.
-         * - blend subtitles, and in a fast access buffer
-         */
-        picture_t *direct = NULL;
-        if (filtered &&
-            (vout->p->decoder_pool != vout->p->display_pool || subpic)) {
-            picture_t *render;
-            if (vout->p->is_decoder_pool_slow)
-                render = picture_NewFromFormat(&vd->source);
-            else if (vout->p->decoder_pool != vout->p->display_pool)
-                render = picture_pool_Get(vout->p->display_pool);
-            else
-                render = picture_pool_Get(vout->p->private_pool);
-
-            if (render) {
-                picture_Copy(render, filtered);
-
-                spu_RenderSubpictures(vout->p->p_spu,
-                                      render, &vd->source,
-                                      subpic, &vd->source, spu_render_time);
-            }
-            if (vout->p->is_decoder_pool_slow) {
-                direct = picture_pool_Get(vout->p->display_pool);
-                if (direct)
-                    picture_Copy(direct, render);
-                picture_Release(render);
+            render = picture_pool_Get(vout->p->private_pool);
+
+        if (render) {
+            picture_Copy(render, filtered);
+
+            spu_RenderSubpictures(vout->p->spu,
+                                  render, &vd->source,
+                                  subpic, &vd->source, spu_render_time);
+        }
+        if (vout->p->is_decoder_pool_slow) {
+            direct = picture_pool_Get(vout->p->display_pool);
+            if (direct)
+                picture_Copy(direct, render);
+            picture_Release(render);
 
-            } else {
-                direct = render;
-            }
-            picture_Release(filtered);
-            filtered = NULL;
         } else {
-            direct = filtered;
+            direct = render;
         }
+        picture_Release(filtered);
+        filtered = NULL;
+    } else {
+        direct = filtered;
+    }
 
-        /*
-         * Take a snapshot if requested
-         */
-        if (direct && do_snapshot)
-            vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct);
+    if (!direct)
+        return VLC_EGENERIC;
+
+    /*
+     * Take a snapshot if requested
+     */
+    if (do_snapshot)
+        vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct);
 
-        /* Render the direct buffer returned by vout_RenderPicture */
-        if (direct) {
-            vout_RenderWrapper(vout, direct);
+    /* Render the direct buffer returned by vout_RenderPicture */
+    vout_RenderWrapper(vout, direct);
 
-            vout_chrono_Stop(&vout->p->render);
+    vout_chrono_Stop(&vout->p->render);
 #if 0
-            {
-            static int i = 0;
-            if (((i++)%10) == 0)
-                msg_Info(vout, "render: avg %d ms var %d ms",
-                         (int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000));
-            }
-#endif
+        {
+        static int i = 0;
+        if (((i++)%10) == 0)
+            msg_Info(vout, "render: avg %d ms var %d ms",
+                     (int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000));
         }
+#endif
 
-        /* Wait the real date (for rendering jitter) */
-        if (!is_forced)
-            mwait(decoded->date);
+    /* Wait the real date (for rendering jitter) */
+#if 0
+    mtime_t delay = direct->date - mdate();
+    if (delay < 1000)
+        msg_Warn(vout, "picture is late (%lld ms)", delay / 1000);
+#endif
+    if (!is_forced)
+        mwait(direct->date);
+
+    /* Display the direct buffer returned by vout_RenderPicture */
+    vout->p->displayed.date = mdate();
 
-        /* Display the direct buffer returned by vout_RenderPicture */
-        vout->p->displayed.date = mdate();
-        if (direct)
-            vout_DisplayWrapper(vout, direct);
+    vout_DisplayWrapper(vout, direct);
 
-        displayed_count++;
-        break;
+    vout_statistic_Update(&vout->p->statistic, 1, 0);
+
+    return VLC_SUCCESS;
+}
+
+static int ThreadDisplayPicture(vout_thread_t *vout,
+                                bool now, mtime_t *deadline)
+{
+    bool is_late_dropped = vout->p->is_late_dropped && !vout->p->pause.is_on && !now;
+    bool first = !vout->p->displayed.current;
+    if (first && ThreadDisplayPreparePicture(vout, true, is_late_dropped)) /* FIXME not sure it is ok */
+        return VLC_EGENERIC;
+    if (!vout->p->pause.is_on || now) {
+        while (!vout->p->displayed.next) {
+            if (ThreadDisplayPreparePicture(vout, false, is_late_dropped)) {
+                break;
+            }
+        }
     }
 
-    vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count);
-    if (displayed_count <= 0)
+    const mtime_t date = mdate();
+    const mtime_t render_delay = vout_chrono_GetHigh(&vout->p->render) + VOUT_MWAIT_TOLERANCE;
+
+    mtime_t date_next = VLC_TS_INVALID;
+    if (!vout->p->pause.is_on && vout->p->displayed.next)
+        date_next = vout->p->displayed.next->date - render_delay;
+
+    /* FIXME/XXX we must redisplay the last decoded picture (because
+     * of potential vout updated, or filters update or SPU update)
+     * For now a high update period is needed but it coulmd be removed
+     * if and only if:
+     * - vout module emits events from theselves.
+     * - *and* SPU is modified to emit an event or a deadline when needed.
+     *
+     * So it will be done latter.
+     */
+    mtime_t date_refresh = VLC_TS_INVALID;
+    if (vout->p->displayed.date > VLC_TS_INVALID)
+        date_refresh = vout->p->displayed.date + VOUT_REDISPLAY_DELAY - render_delay;
+
+    bool drop = now;
+    if (date_next != VLC_TS_INVALID)
+        drop |= date_next + 0 <= date;
+
+    bool refresh = false;
+    if (date_refresh > VLC_TS_INVALID)
+        refresh = date_refresh <= date;
+
+    if (!first && !refresh && !drop) {
+        if (date_next != VLC_TS_INVALID && date_refresh != VLC_TS_INVALID)
+            *deadline = __MIN(date_next, date_refresh);
+        else if (date_next != VLC_TS_INVALID)
+            *deadline = date_next;
+        else if (date_refresh != VLC_TS_INVALID)
+            *deadline = date_refresh;
         return VLC_EGENERIC;
-    return VLC_SUCCESS;
+    }
+
+    if (drop) {
+        picture_Release(vout->p->displayed.current);
+        vout->p->displayed.current = vout->p->displayed.next;
+        vout->p->displayed.next    = NULL;
+    }
+    if (!vout->p->displayed.current)
+        return VLC_EGENERIC;
+
+    bool is_forced = now || (!drop && refresh) || vout->p->displayed.current->b_force;
+    return ThreadDisplayRenderPicture(vout, is_forced);
 }
 
 static void ThreadManage(vout_thread_t *vout,
@@ -737,7 +922,10 @@ static void ThreadManage(vout_thread_t *vout,
     vlc_mutex_lock(&vout->p->picture_lock);
 
     *deadline = VLC_TS_INVALID;
-    ThreadDisplayPicture(vout, false, deadline);
+    for (;;) {
+        if (ThreadDisplayPicture(vout, false, deadline))
+            break;
+    }
 
     const int  picture_qtype      = vout->p->displayed.qtype;
     const bool picture_interlaced = vout->p->displayed.is_interlaced;
@@ -756,12 +944,12 @@ static void ThreadManage(vout_thread_t *vout,
 static void ThreadDisplaySubpicture(vout_thread_t *vout,
                                     subpicture_t *subpicture)
 {
-    spu_DisplaySubpicture(vout->p->p_spu, subpicture);
+    spu_DisplaySubpicture(vout->p->spu, subpicture);
 }
 
 static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
 {
-    spu_ClearChannel(vout->p->p_spu, channel);
+    spu_ClearChannel(vout->p->spu, channel);
 }
 
 static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
@@ -774,25 +962,97 @@ static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
                  string);
 }
 
+static void ThreadFilterFlush(vout_thread_t *vout)
+{
+    if (vout->p->displayed.current)
+        picture_Release( vout->p->displayed.current );
+    vout->p->displayed.current = NULL;
+
+    if (vout->p->displayed.next)
+        picture_Release( vout->p->displayed.next );
+    vout->p->displayed.next = NULL;
+
+    vlc_mutex_lock(&vout->p->filter.lock);
+    filter_chain_VideoFlush(vout->p->filter.chain_static);
+    filter_chain_VideoFlush(vout->p->filter.chain_interactive);
+    vlc_mutex_unlock(&vout->p->filter.lock);
+}
+
+typedef struct {
+    char           *name;
+    config_chain_t *cfg;
+} vout_filter_t;
+
 static void ThreadChangeFilters(vout_thread_t *vout, const char *filters)
 {
+    ThreadFilterFlush(vout);
+
+    vlc_array_t array_static;
+    vlc_array_t array_interactive;
+
+    vlc_array_init(&array_static);
+    vlc_array_init(&array_interactive);
+    char *current = filters ? strdup(filters) : NULL;
+    while (current) {
+        config_chain_t *cfg;
+        char *name;
+        char *next = config_ChainCreate(&name, &cfg, current);
+
+        if (name && *name) {
+            vout_filter_t *e = xmalloc(sizeof(*e));
+            e->name = name;
+            e->cfg  = cfg;
+            if (!strcmp(e->name, "deinterlace") ||
+                !strcmp(e->name, "postproc")) {
+                vlc_array_append(&array_static, e);
+            } else {
+                vlc_array_append(&array_interactive, e);
+            }
+        } else {
+            if (cfg)
+                config_ChainDestroy(cfg);
+            free(name);
+        }
+        free(current);
+        current = next;
+    }
+
     es_format_t fmt;
     es_format_Init(&fmt, VIDEO_ES, vout->p->original.i_chroma);
     fmt.video = vout->p->original;
 
-    vlc_mutex_lock(&vout->p->vfilter_lock);
-
-    filter_chain_Reset(vout->p->vfilter_chain, &fmt, &fmt);
-    if (filter_chain_AppendFromString(vout->p->vfilter_chain,
-                                      filters) < 0)
-        msg_Err(vout, "Video filter chain creation failed");
+    vlc_mutex_lock(&vout->p->filter.lock);
+
+    for (int a = 0; a < 2; a++) {
+        vlc_array_t    *array = a == 0 ? &array_static :
+                                         &array_interactive;
+        filter_chain_t *chain = a == 0 ? vout->p->filter.chain_static :
+                                         vout->p->filter.chain_interactive;
+
+        filter_chain_Reset(chain, &fmt, &fmt);
+        for (int i = 0; i < vlc_array_count(array); i++) {
+            vout_filter_t *e = vlc_array_item_at_index(array, i);
+            msg_Dbg(vout, "Adding '%s' as %s", e->name, a == 0 ? "static" : "interactive");
+            if (!filter_chain_AppendFilter(chain, e->name, e->cfg, NULL, NULL)) {
+                msg_Err(vout, "Failed to add filter '%s'", e->name);
+                config_ChainDestroy(e->cfg);
+            }
+            free(e->name);
+            free(e);
+        }
+        vlc_array_clear(array);
+    }
 
-    vlc_mutex_unlock(&vout->p->vfilter_lock);
+    vlc_mutex_unlock(&vout->p->filter.lock);
 }
 
 static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters)
 {
-    spu_ChangeFilters(vout->p->p_spu, filters);
+    spu_ChangeFilters(vout->p->spu, filters);
+}
+static void ThreadChangeSubMargin(vout_thread_t *vout, int margin)
+{
+    spu_ChangeMargin(vout->p->spu, margin);
 }
 
 static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
@@ -809,8 +1069,9 @@ static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
         picture_fifo_OffsetDate(vout->p->decoder_fifo, duration);
         if (vout->p->displayed.decoded)
             vout->p->displayed.decoded->date += duration;
+        spu_OffsetSubtitleDate(vout->p->spu, duration);
 
-        spu_OffsetSubtitleDate(vout->p->p_spu, duration);
+        ThreadFilterFlush(vout);
     } else {
         vout->p->step.timestamp = VLC_TS_INVALID;
         vout->p->step.last      = VLC_TS_INVALID;
@@ -824,6 +1085,8 @@ static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date)
     vout->p->step.timestamp = VLC_TS_INVALID;
     vout->p->step.last      = VLC_TS_INVALID;
 
+    ThreadFilterFlush(vout); /* FIXME too much */
+
     picture_t *last = vout->p->displayed.decoded;
     if (last) {
         if (( below && last->date <= date) ||
@@ -835,6 +1098,7 @@ static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date)
             vout->p->displayed.timestamp = VLC_TS_INVALID;
         }
     }
+
     picture_fifo_Flush(vout->p->decoder_fifo, date, below);
 }
 
@@ -957,9 +1221,12 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
     vout->p->display_pool = NULL;
     vout->p->private_pool = NULL;
 
-    vout->p->vfilter_chain =
+    vout->p->filter.chain_static =
         filter_chain_New( vout, "video filter2", false,
-                          VoutVideoFilterAllocationSetup, NULL, vout);
+                          VoutVideoFilterStaticAllocationSetup, NULL, vout);
+    vout->p->filter.chain_interactive =
+        filter_chain_New( vout, "video filter2", false,
+                          VoutVideoFilterInteractiveAllocationSetup, NULL, vout);
 
     vout_display_state_t state_default;
     if (!state) {
@@ -978,9 +1245,10 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
         return VLC_EGENERIC;
     assert(vout->p->decoder_pool);
 
+    vout->p->displayed.current       = NULL;
+    vout->p->displayed.next          = NULL;
     vout->p->displayed.decoded       = NULL;
     vout->p->displayed.date          = VLC_TS_INVALID;
-    vout->p->displayed.decoded       = NULL;
     vout->p->displayed.timestamp     = VLC_TS_INVALID;
     vout->p->displayed.qtype         = QTYPE_NONE;
     vout->p->displayed.is_interlaced = false;
@@ -994,9 +1262,6 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
 
 static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state)
 {
-    /* Destroy the video filters2 */
-    filter_chain_Delete(vout->p->vfilter_chain);
-
     /* Destroy translation tables */
     if (vout->p->display.vd) {
         if (vout->p->decoder_pool) {
@@ -1006,6 +1271,10 @@ static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state)
         vout_CloseWrapper(vout, state);
     }
 
+    /* Destroy the video filters2 */
+    filter_chain_Delete(vout->p->filter.chain_interactive);
+    filter_chain_Delete(vout->p->filter.chain_static);
+
     if (vout->p->decoder_fifo)
         picture_fifo_Delete(vout->p->decoder_fifo);
     assert(!vout->p->decoder_pool);
@@ -1131,6 +1400,9 @@ static void *Thread(void *object)
             case VOUT_CONTROL_CHANGE_SUB_FILTERS:
                 ThreadChangeSubFilters(vout, cmd.u.string);
                 break;
+            case VOUT_CONTROL_CHANGE_SUB_MARGIN:
+                ThreadChangeSubMargin(vout, cmd.u.integer);
+                break;
             case VOUT_CONTROL_PAUSE:
                 ThreadChangePause(vout, cmd.u.pause.is_on, cmd.u.pause.date);
                 break;