return VLC_SUCCESS;
}
-/*****************************************************************************
- * vout_Request: find a video output thread, create one, or destroy one.
- *****************************************************************************
- * This function looks for a video output thread matching the current
- * properties. If not found, it spawns a new one.
- *****************************************************************************/
-vout_thread_t *(vout_Request)( vlc_object_t *object, vout_thread_t *vout,
- const video_format_t *fmt )
-{
- if (!fmt) {
- if (vout)
- vout_CloseAndRelease(vout);
- return NULL;
- }
-
- /* If a vout is provided, try reusing it */
- if (vout) {
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false);
- vlc_object_detach(vout);
-
- vout_control_cmd_t cmd;
- vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT);
- cmd.u.reinit.fmt = fmt;
-
- vout_control_Push(&vout->p->control, &cmd);
- vout_control_WaitEmpty(&vout->p->control);
- if (!vout->p->dead) {
- vlc_object_attach(vout, object);
- spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), true);
-
- msg_Dbg(object, "reusing provided vout");
- return vout;
- }
- vout_CloseAndRelease(vout);
-
- msg_Warn(object, "cannot reuse provided vout");
- }
- return vout_Create(object, fmt);
-}
-
-/*****************************************************************************
- * vout_Create: creates a new video output thread
- *****************************************************************************
- * This function creates a new video output thread, and returns a pointer
- * to its description. On error, it returns NULL.
- *****************************************************************************/
-vout_thread_t * (vout_Create)( vlc_object_t *p_parent, const video_format_t *p_fmt )
+static vout_thread_t *VoutCreate(vlc_object_t *object,
+ const vout_configuration_t *cfg)
{
video_format_t original;
- if (VoutValidateFormat(&original, p_fmt))
+ if (VoutValidateFormat(&original, cfg->fmt))
return NULL;
/* Allocate descriptor */
- vout_thread_t *p_vout = vlc_custom_create(p_parent,
- sizeof(*p_vout) + sizeof(*p_vout->p),
- VLC_OBJECT_VOUT, "video output");
- if (!p_vout) {
+ vout_thread_t *vout = vlc_custom_create(object,
+ sizeof(*vout) + sizeof(*vout->p),
+ VLC_OBJECT_VOUT, "video output");
+ if (!vout) {
video_format_Clean(&original);
return NULL;
}
/* */
- p_vout->p = (vout_thread_sys_t*)&p_vout[1];
+ vout->p = (vout_thread_sys_t*)&vout[1];
- p_vout->p->original = original;
+ vout->p->original = original;
+ vout->p->dpb_size = cfg->dpb_size;
- vout_control_Init( &p_vout->p->control );
- vout_control_PushVoid( &p_vout->p->control, VOUT_CONTROL_INIT );
+ vout_control_Init(&vout->p->control);
+ vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT);
- vout_statistic_Init( &p_vout->p->statistic );
- p_vout->p->i_par_num =
- p_vout->p->i_par_den = 1;
+ vout_statistic_Init(&vout->p->statistic);
+ vout->p->i_par_num =
+ vout->p->i_par_den = 1;
- vout_snapshot_Init( &p_vout->p->snapshot );
+ vout_snapshot_Init(&vout->p->snapshot);
/* Initialize locks */
- vlc_mutex_init( &p_vout->p->picture_lock );
- vlc_mutex_init( &p_vout->p->vfilter_lock );
+ vlc_mutex_init(&vout->p->picture_lock);
+ vlc_mutex_init(&vout->p->vfilter_lock);
+ vlc_mutex_init(&vout->p->spu_lock);
/* Attach the new object now so we can use var inheritance below */
- vlc_object_attach( p_vout, p_parent );
+ vlc_object_attach(vout, object);
/* Initialize subpicture unit */
- p_vout->p->p_spu = spu_Create( p_vout );
-
- /* */
- spu_Init( p_vout->p->p_spu );
+ vout->p->p_spu = spu_Create(vout);
/* Take care of some "interface/control" related initialisations */
- vout_IntfInit( p_vout );
+ vout_IntfInit(vout);
/* Get splitter name if present */
- char *splitter_name = var_GetNonEmptyString(p_vout, "vout-filter");
+ char *splitter_name = var_GetNonEmptyString(vout, "vout-filter");
if (splitter_name) {
- if (asprintf(&p_vout->p->splitter_name, "%s,none", splitter_name) < 0)
- p_vout->p->splitter_name = NULL;
+ if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0)
+ vout->p->splitter_name = NULL;
free(splitter_name);
} else {
- p_vout->p->splitter_name = NULL;
+ vout->p->splitter_name = NULL;
}
/* */
- vout_InitInterlacingSupport( p_vout, p_vout->p->displayed.is_interlaced );
+ vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);
/* */
- vlc_object_set_destructor( p_vout, VoutDestructor );
+ vlc_object_set_destructor(vout, VoutDestructor);
/* */
- if( vlc_clone( &p_vout->p->thread, Thread, p_vout,
- VLC_THREAD_PRIORITY_OUTPUT ) )
- {
- vlc_object_release( p_vout );
+ if (vlc_clone(&vout->p->thread, Thread, vout,
+ VLC_THREAD_PRIORITY_OUTPUT)) {
+ spu_Destroy(vout->p->p_spu);
+ vlc_object_release(vout);
return NULL;
}
- spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), true );
- vout_control_WaitEmpty( &p_vout->p->control );
+ vout_control_WaitEmpty(&vout->p->control);
- if (p_vout->p->dead )
- {
- msg_Err( p_vout, "video output creation failed" );
- vout_CloseAndRelease( p_vout );
+ if (vout->p->dead) {
+ msg_Err(vout, "video output creation failed");
+ vout_CloseAndRelease(vout);
return NULL;
}
- return p_vout;
+ vout->p->input = cfg->input;
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, true);
+
+ return vout;
}
-/*****************************************************************************
- * vout_Close: Close a vout created by vout_Create.
- *****************************************************************************
- * You HAVE to call it on vout created by vout_Create before vlc_object_release.
- * You should NEVER call it on vout not obtained through vout_Create
- * (like with vout_Request or vlc_object_find.)
- * You can use vout_CloseAndRelease() as a convenience method.
- *****************************************************************************/
-void vout_Close( vout_thread_t *p_vout )
+vout_thread_t *(vout_Request)(vlc_object_t *object,
+ const vout_configuration_t *cfg)
+{
+ vout_thread_t *vout = cfg->vout;
+ if (cfg->change_fmt && !cfg->fmt) {
+ if (vout)
+ vout_CloseAndRelease(vout);
+ return NULL;
+ }
+
+ /* If a vout is provided, try reusing it */
+ if (vout) {
+ if (vout->p->input != cfg->input) {
+ if (vout->p->input)
+ spu_Attach(vout->p->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);
+ }
+
+ if (cfg->change_fmt) {
+ vout_control_cmd_t cmd;
+ vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT);
+ cmd.u.cfg = cfg;
+
+ vout_control_Push(&vout->p->control, &cmd);
+ vout_control_WaitEmpty(&vout->p->control);
+ }
+
+ if (!vout->p->dead) {
+ msg_Dbg(object, "reusing provided vout");
+ return vout;
+ }
+ vout_CloseAndRelease(vout);
+
+ msg_Warn(object, "cannot reuse provided vout");
+ }
+ return VoutCreate(object, cfg);
+}
+
+void vout_Close(vout_thread_t *vout)
{
- assert( p_vout );
+ assert(vout);
+
+ if (vout->p->input)
+ spu_Attach(vout->p->p_spu, vout->p->input, false);
- spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), false );
+ vout_snapshot_End(&vout->p->snapshot);
- vout_snapshot_End( &p_vout->p->snapshot );
+ vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN);
+ vlc_join(vout->p->thread, NULL);
- vout_control_PushVoid( &p_vout->p->control, VOUT_CONTROL_CLEAN );
- vlc_join( p_vout->p->thread, NULL );
+ vlc_mutex_lock(&vout->p->spu_lock);
+ spu_Destroy(vout->p->p_spu);
+ vout->p->p_spu = NULL;
+ vlc_mutex_unlock(&vout->p->spu_lock);
}
/* */
-static void VoutDestructor( vlc_object_t * p_this )
+static void VoutDestructor(vlc_object_t *object)
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ vout_thread_t *vout = (vout_thread_t *)object;
/* Make sure the vout was stopped first */
- //assert( !p_vout->p_module );
+ //assert(!vout->p_module);
- free( p_vout->p->splitter_name );
-
- /* */
- spu_Destroy( p_vout->p->p_spu );
+ free(vout->p->splitter_name);
/* Destroy the locks */
- vlc_mutex_destroy( &p_vout->p->picture_lock );
- vlc_mutex_destroy( &p_vout->p->vfilter_lock );
- vout_control_Clean( &p_vout->p->control );
+ vlc_mutex_destroy(&vout->p->spu_lock);
+ vlc_mutex_destroy(&vout->p->picture_lock);
+ vlc_mutex_destroy(&vout->p->vfilter_lock);
+ vout_control_Clean(&vout->p->control);
/* */
- vout_statistic_Clean( &p_vout->p->statistic );
+ vout_statistic_Clean(&vout->p->statistic);
/* */
- vout_snapshot_Clean( &p_vout->p->snapshot );
+ vout_snapshot_Clean(&vout->p->snapshot);
- video_format_Clean( &p_vout->p->original );
+ video_format_Clean(&vout->p->original);
}
/* */
vout_control_WaitEmpty(&vout->p->control);
}
-void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost )
+void vout_GetResetStatistic(vout_thread_t *vout, int *displayed, int *lost)
{
- vout_statistic_GetReset( &p_vout->p->statistic,
- pi_displayed, pi_lost );
+ vout_statistic_GetReset( &vout->p->statistic, displayed, lost );
}
void vout_Flush(vout_thread_t *vout, mtime_t date)
void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
{
- spu_DisplaySubpicture(vout->p->p_spu, subpic);
+ vout_control_cmd_t cmd;
+ vout_control_cmd_Init(&cmd, VOUT_CONTROL_SUBPICTURE);
+ cmd.u.subpicture = subpic;
+
+ vout_control_Push(&vout->p->control, &cmd);
}
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->p_spu)
+ channel = spu_RegisterChannel(vout->p->p_spu);
+ vlc_mutex_unlock(&vout->p->spu_lock);
+
+ return channel;
}
void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
{
- spu_ClearChannel(vout->p->p_spu, channel);
-}
-
-spu_t *vout_GetSpu( vout_thread_t *p_vout )
-{
- return p_vout->p->p_spu;
+ vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_FLUSH_SUBPICTURE,
+ channel);
}
/* vout_Control* are usable by anyone at anytime */
vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS,
filters);
}
+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)
+{
+ /* Load configuration */
+ cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen");
+ cfg->display.title = title;
+ const int display_width = var_CreateGetInteger(vout, "width");
+ const int display_height = var_CreateGetInteger(vout, "height");
+ 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 zoom_den = 1000;
+ unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
+ vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
+ cfg->zoom.num = zoom_num;
+ cfg->zoom.den = zoom_den;
+ cfg->align.vertical = VOUT_DISPLAY_ALIGN_CENTER;
+ cfg->align.horizontal = VOUT_DISPLAY_ALIGN_CENTER;
+ const int align_mask = var_CreateGetInteger(vout, "align");
+ if (align_mask & 0x1)
+ cfg->align.horizontal = VOUT_DISPLAY_ALIGN_LEFT;
+ else if (align_mask & 0x2)
+ cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT;
+ if (align_mask & 0x4)
+ cfg->align.vertical = VOUT_DISPLAY_ALIGN_TOP;
+ else if (align_mask & 0x8)
+ cfg->align.vertical = VOUT_DISPLAY_ALIGN_BOTTOM;
+}
+
+vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
+ const vout_window_cfg_t *cfg)
+{
+ VLC_UNUSED(vd);
+ vout_window_cfg_t cfg_override = *cfg;
+
+ if (!var_InheritBool( vout, "embedded-video"))
+ cfg_override.is_standalone = true;
+
+ if (vout->p->window.is_unused && vout->p->window.object) {
+ assert(!vout->p->splitter_name);
+ if (!cfg_override.is_standalone == !vout->p->window.cfg.is_standalone &&
+ cfg_override.type == vout->p->window.cfg.type) {
+ /* Reuse the stored window */
+ msg_Dbg(vout, "Reusing previous vout window");
+ vout_window_t *window = vout->p->window.object;
+ if (cfg_override.width != vout->p->window.cfg.width ||
+ cfg_override.height != vout->p->window.cfg.height)
+ vout_window_SetSize(window,
+ cfg_override.width, cfg_override.height);
+ vout->p->window.is_unused = false;
+ vout->p->window.cfg = cfg_override;
+ return window;
+ }
+
+ vout_window_Delete(vout->p->window.object);
+ vout->p->window.is_unused = true;
+ vout->p->window.object = NULL;
+ }
+
+ vout_window_t *window = vout_window_New(VLC_OBJECT(vout), "$window",
+ &cfg_override);
+ if (!window)
+ return NULL;
+ if (!vout->p->splitter_name) {
+ vout->p->window.is_unused = false;
+ vout->p->window.cfg = cfg_override;
+ vout->p->window.object = window;
+ }
+ return window;
+}
+
+void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
+ vout_window_t *window)
+{
+ VLC_UNUSED(vd);
+ if (!vout->p->window.is_unused && vout->p->window.object == window) {
+ vout->p->window.is_unused = true;
+ } else if (vout->p->window.is_unused && vout->p->window.object && !window) {
+ vout_window_Delete(vout->p->window.object);
+ vout->p->window.is_unused = true;
+ vout->p->window.object = NULL;
+ } else if (window) {
+ vout_window_Delete(window);
+ }
+}
/* */
static picture_t *VoutVideoFilterNewPicture(filter_t *filter)
}
/* */
-static int ThreadDisplayPicture(vout_thread_t *vout,
- bool now, mtime_t *deadline)
+static picture_t *ThreadDisplayGetDecodedPicture(vout_thread_t *vout,
+ int *lost_count, bool *is_forced,
+ bool now, mtime_t *deadline)
{
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;
- }
+ const mtime_t date = mdate();
+ const bool is_paused = vout->p->pause.is_on;
+ bool redisplay = is_paused && !now && vout->p->displayed.decoded;
+
+ mtime_t vfilter_delay = 0;
+ for (int i = 0; i < VOUT_FILTER_DELAYS; i++)
+ vfilter_delay = __MAX(vfilter_delay, vout->p->vfilter_delay[i]);
+
+ /* 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) -
+ vfilter_delay;
+ 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 (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;
+ return NULL;
}
- if (*deadline > VOUT_MWAIT_TOLERANCE)
- *deadline -= VOUT_MWAIT_TOLERANCE;
+ /* */
+ *is_forced = true;
+ *deadline = date - vout_chrono_GetHigh(&vout->p->render) - vfilter_delay;
+ }
+ if (*deadline > VOUT_MWAIT_TOLERANCE)
+ *deadline -= VOUT_MWAIT_TOLERANCE;
- /* If we are too early and can wait, do it */
- if (date < *deadline && !now)
- break;
+ /* If we are too early and can wait, do it */
+ if (date < *deadline && !now)
+ return NULL;
- picture_t *decoded;
- if (redisplay) {
- decoded = vout->p->displayed.decoded;
- vout->p->displayed.decoded = NULL;
- } 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);
- const mtime_t late = predicted - decoded->date;
- 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;
- }
+ picture_t *decoded;
+ if (redisplay) {
+ decoded = vout->p->displayed.decoded;
+ vout->p->displayed.decoded = NULL;
+ } 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);
+ const mtime_t late = predicted - decoded->date;
+ 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)++;
+ return NULL;
}
}
-
- vout->p->displayed.is_interlaced = !decoded->b_progressive;
- vout->p->displayed.qtype = decoded->i_qtype;
}
- vout->p->displayed.timestamp = decoded->date;
- /* */
- if (vout->p->displayed.decoded)
- picture_Release(vout->p->displayed.decoded);
- picture_Hold(decoded);
- vout->p->displayed.decoded = decoded;
+ vout->p->displayed.is_interlaced = !decoded->b_progressive;
+ vout->p->displayed.qtype = decoded->i_qtype;
+ }
+ vout->p->displayed.timestamp = decoded->date;
+
+ /* */
+ if (vout->p->displayed.decoded)
+ picture_Release(vout->p->displayed.decoded);
+ picture_Hold(decoded);
+ vout->p->displayed.decoded = decoded;
+
+ return decoded;
+}
+
+static int ThreadDisplayPicture(vout_thread_t *vout,
+ bool now, mtime_t *deadline)
+{
+ vout_display_t *vd = vout->p->display.vd;
+ int displayed_count = 0;
+ int lost_count = 0;
+
+ for (;;) {
+ bool is_forced;
+ picture_t *decoded = ThreadDisplayGetDecodedPicture(vout,
+ &lost_count, &is_forced,
+ now, deadline);
+ if (!decoded)
+ break;
/* */
vout_chrono_Start(&vout->p->render);
vlc_mutex_unlock(&vout->p->vfilter_lock);
if (!filtered)
continue;
+ vout->p->vfilter_delay[vout->p->vfilter_delay_index] = decoded->date - filtered->date;
+ vout->p->vfilter_delay_index = (vout->p->vfilter_delay_index + 1) % VOUT_FILTER_DELAYS;
}
/*
/* Wait the real date (for rendering jitter) */
if (!is_forced)
- mwait(decoded->date);
+ mwait(direct->date);
/* Display the direct buffer returned by vout_RenderPicture */
vout->p->displayed.date = mdate();
vout_ManageWrapper(vout);
}
+static void ThreadDisplaySubpicture(vout_thread_t *vout,
+ subpicture_t *subpicture)
+{
+ spu_DisplaySubpicture(vout->p->p_spu, subpicture);
+}
+
+static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
+{
+ spu_ClearChannel(vout->p->p_spu, channel);
+}
+
static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
{
if (!vout->p->title.show)
msg_Err(vout, "Video filter chain creation failed");
vlc_mutex_unlock(&vout->p->vfilter_lock);
+
+ vout->p->vfilter_delay_index = 0;
+ for (int i = 0; i < VOUT_FILTER_DELAYS; i++)
+ vout->p->vfilter_delay[i] = 0;
+}
+
+static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters)
+{
+ spu_ChangeFilters(vout->p->p_spu, filters);
+}
+static void ThreadChangeSubMargin(vout_thread_t *vout, int margin)
+{
+ spu_ChangeMargin(vout->p->p_spu, margin);
+}
+
+static void ThreadFilterFlush(vout_thread_t *vout)
+{
+ vlc_mutex_lock(&vout->p->vfilter_lock);
+ filter_chain_VideoFlush(vout->p->vfilter_chain);
+ vlc_mutex_unlock(&vout->p->vfilter_lock);
}
static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
vout->p->displayed.decoded->date += 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;
vout->p->displayed.timestamp = VLC_TS_INVALID;
}
}
+ ThreadFilterFlush(vout);
+
picture_fifo_Flush(vout->p->decoder_fifo, date, below);
}
unsigned num, unsigned den)
{
const video_format_t *source = &vout->p->original;
-
- int x, y;
- int width, height;
- if (num <= 0 || den <= 0) {
- num = 0;
- den = 0;
- x = 0;
- y = 0;
- width = source->i_visible_width;
- height = source->i_visible_height;
- } else {
- unsigned scaled_width = (uint64_t)source->i_visible_height * num * source->i_sar_den / den / source->i_sar_num;
- unsigned scaled_height = (uint64_t)source->i_visible_width * den * source->i_sar_num / num / source->i_sar_den;
-
- if (scaled_width < source->i_visible_width) {
- x = (source->i_visible_width - scaled_width) / 2;
- y = 0;
- width = scaled_width;
- height = source->i_visible_height;
- } else {
- x = 0;
- y = (source->i_visible_height - scaled_height) / 2;
- width = source->i_visible_width;
- height = scaled_height;
- }
- }
- ThreadExecuteCropWindow(vout, num, den, x, y, width, height);
+ ThreadExecuteCropWindow(vout, num, den,
+ 0, 0,
+ source->i_visible_width,
+ source->i_visible_height);
}
-static int ThreadInit(vout_thread_t *vout)
+static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
{
- vout->p->dead = false;
- vout->p->is_late_dropped = var_InheritBool(vout, "drop-late-frames");
vlc_mouse_Init(&vout->p->mouse);
vout->p->decoder_fifo = picture_fifo_New();
vout->p->decoder_pool = NULL;
vout->p->vfilter_chain =
filter_chain_New( vout, "video filter2", false,
VoutVideoFilterAllocationSetup, NULL, vout);
+ vout->p->vfilter_delay_index = 0;
+ for (int i = 0; i < VOUT_FILTER_DELAYS; i++)
+ vout->p->vfilter_delay[i] = 0;
+
+ vout_display_state_t state_default;
+ if (!state) {
+ VoutGetDisplayCfg(vout, &state_default.cfg, vout->p->display.title);
+ state_default.wm_state = var_CreateGetBool(vout, "video-on-top") ? VOUT_WINDOW_STATE_ABOVE :
+ VOUT_WINDOW_STATE_NORMAL;
+ state_default.sar.num = 0;
+ state_default.sar.den = 0;
+
+ state = &state_default;
+ }
- if (vout_OpenWrapper(vout, vout->p->splitter_name))
+ if (vout_OpenWrapper(vout, vout->p->splitter_name, state))
return VLC_EGENERIC;
if (vout_InitWrapper(vout))
return VLC_EGENERIC;
assert(vout->p->decoder_pool);
- vout_chrono_Init(&vout->p->render, 5, 10000); /* Arbitrary initial time */
-
vout->p->displayed.decoded = NULL;
vout->p->displayed.date = VLC_TS_INVALID;
vout->p->displayed.decoded = NULL;
vout->p->step.last = VLC_TS_INVALID;
vout->p->step.timestamp = VLC_TS_INVALID;
- vout->p->pause.is_on = false;
- vout->p->pause.date = VLC_TS_INVALID;
-
video_format_Print(VLC_OBJECT(vout), "original format", &vout->p->original);
return VLC_SUCCESS;
}
-static void ThreadClean(vout_thread_t *vout)
+static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state)
{
/* Destroy the video filters2 */
filter_chain_Delete(vout->p->vfilter_chain);
ThreadFlush(vout, true, INT64_MAX);
vout_EndWrapper(vout);
}
- vout_CloseWrapper(vout);
+ vout_CloseWrapper(vout, state);
}
- /* Detach subpicture unit from vout */
- vlc_object_detach(vout->p->p_spu);
-
if (vout->p->decoder_fifo)
picture_fifo_Delete(vout->p->decoder_fifo);
assert(!vout->p->decoder_pool);
- vout_chrono_Clean(&vout->p->render);
+}
+static void ThreadInit(vout_thread_t *vout)
+{
+ vout->p->window.is_unused = true;
+ vout->p->window.object = NULL;
+ vout->p->dead = false;
+ vout->p->is_late_dropped = var_InheritBool(vout, "drop-late-frames");
+ vout->p->pause.is_on = false;
+ vout->p->pause.date = VLC_TS_INVALID;
+
+ vout_chrono_Init(&vout->p->render, 5, 10000); /* Arbitrary initial time */
+}
+
+static void ThreadClean(vout_thread_t *vout)
+{
+ if (vout->p->window.object) {
+ assert(vout->p->window.is_unused);
+ vout_window_Delete(vout->p->window.object);
+ }
+ vout_chrono_Clean(&vout->p->render);
vout->p->dead = true;
vout_control_Dead(&vout->p->control);
}
+
static int ThreadReinit(vout_thread_t *vout,
- const video_format_t *fmt)
+ const vout_configuration_t *cfg)
{
video_format_t original;
- if (VoutValidateFormat(&original, fmt))
+ if (VoutValidateFormat(&original, cfg->fmt)) {
+ ThreadStop(vout, NULL);
+ ThreadClean(vout);
return VLC_EGENERIC;
- if (video_format_IsSimilar(&original, &vout->p->original))
- return VLC_SUCCESS;
+ }
+ if (video_format_IsSimilar(&original, &vout->p->original)) {
+ if (cfg->dpb_size <= vout->p->dpb_size)
+ return VLC_SUCCESS;
+ msg_Warn(vout, "DPB need to be increased");
+ }
+
+ vout_display_state_t state;
+ memset(&state, 0, sizeof(state));
- /* TODO */
- return VLC_EGENERIC;
+ ThreadStop(vout, &state);
+
+ if (!state.cfg.is_fullscreen) {
+ state.cfg.display.width = 0;
+ state.cfg.display.height = 0;
+ }
+ state.sar.num = 0;
+ state.sar.den = 0;
+ /* FIXME current vout "variables" are not in sync here anymore
+ * and I am not sure what to do */
+
+ vout->p->original = original;
+ vout->p->dpb_size = cfg->dpb_size;
+ if (ThreadStart(vout, &state)) {
+ ThreadClean(vout);
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
}
/*****************************************************************************
while (!vout_control_Pop(&vout->p->control, &cmd, deadline, 100000)) {
switch(cmd.type) {
case VOUT_CONTROL_INIT:
- if (ThreadInit(vout)) {
+ ThreadInit(vout);
+ if (ThreadStart(vout, NULL)) {
+ ThreadStop(vout, NULL);
ThreadClean(vout);
return NULL;
}
break;
case VOUT_CONTROL_CLEAN:
+ ThreadStop(vout, NULL);
ThreadClean(vout);
return NULL;
case VOUT_CONTROL_REINIT:
- if (ThreadReinit(vout, cmd.u.reinit.fmt)) {
- ThreadClean(vout);
+ if (ThreadReinit(vout, cmd.u.cfg))
return NULL;
- }
+ break;
+ case VOUT_CONTROL_SUBPICTURE:
+ ThreadDisplaySubpicture(vout, cmd.u.subpicture);
+ cmd.u.subpicture = NULL;
+ break;
+ case VOUT_CONTROL_FLUSH_SUBPICTURE:
+ ThreadFlushSubpicture(vout, cmd.u.integer);
break;
case VOUT_CONTROL_OSD_TITLE:
ThreadDisplayOsdTitle(vout, cmd.u.string);
case VOUT_CONTROL_CHANGE_FILTERS:
ThreadChangeFilters(vout, cmd.u.string);
break;
+ 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;
projects / vlc / blobdiff