* It includes functions allowing to open a new thread, send pictures to a
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
- * Copyright (C) 2000-2007 the VideoLAN team
+ * Copyright (C) 2000-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <libvlc.h>
#include "vout_internal.h"
#include "interlacing.h"
-#include "postprocessing.h"
#include "display.h"
/*****************************************************************************
static int VoutValidateFormat(video_format_t *dst,
const video_format_t *src)
{
- if (src->i_width <= 0 || src->i_height <= 0)
+ if (src->i_width <= 0 || src->i_width > 8192 ||
+ src->i_height <= 0 || src->i_height > 8192)
return VLC_EGENERIC;
if (src->i_sar_num <= 0 || src->i_sar_den <= 0)
return VLC_EGENERIC;
/* Allocate descriptor */
vout_thread_t *vout = vlc_custom_create(object,
sizeof(*vout) + sizeof(*vout->p),
- VLC_OBJECT_VOUT, "video output");
+ "video output");
if (!vout) {
video_format_Clean(&original);
return NULL;
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->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");
+ vout->p->title.show = var_InheritBool(vout, "video-title-show");
+ vout->p->title.timeout = var_InheritInteger(vout, "video-title-timeout");
+ vout->p->title.position = var_InheritInteger(vout, "video-title-position");
/* Get splitter name if present */
char *splitter_name = var_InheritString(vout, "video-splitter");
return vout;
}
-vout_thread_t *(vout_Request)(vlc_object_t *object,
+#undef vout_Request
+vout_thread_t *vout_Request(vlc_object_t *object,
const vout_configuration_t *cfg)
{
vout_thread_t *vout = cfg->vout;
if (!vout->p->dead) {
msg_Dbg(object, "reusing provided vout");
+ vout_IntfReinit(vout);
return vout;
}
vout_CloseAndRelease(vout);
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");
+ const int override_width = var_InheritInteger(vout, "snapshot-width");
+ const int override_height = var_InheritInteger(vout, "snapshot-height");
if (picture_Export(VLC_OBJECT(vout), image_dst, fmt,
picture, codec, override_width, override_height)) {
return VLC_SUCCESS;
}
+void vout_ChangeAspectRatio( vout_thread_t *p_vout,
+ unsigned int i_num, unsigned int i_den )
+{
+ vout_ControlChangeSampleAspectRatio( p_vout, i_num, i_den );
+}
+
/* vout_Control* are usable by anyone at anytime */
void vout_ControlChangeFullscreen(vout_thread_t *vout, bool fullscreen)
{
vout_control_PushBool(&vout->p->control, VOUT_CONTROL_FULLSCREEN,
fullscreen);
}
-void vout_ControlChangeOnTop(vout_thread_t *vout, bool is_on_top)
+void vout_ControlChangeWindowState(vout_thread_t *vout, unsigned st)
{
- vout_control_PushBool(&vout->p->control, VOUT_CONTROL_ON_TOP,
- is_on_top);
+ vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_WINDOW_STATE, st);
}
void vout_ControlChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
{
vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS,
filters);
}
+void vout_ControlChangeSubSources(vout_thread_t *vout, const char *filters)
+{
+ vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_SOURCES,
+ filters);
+}
void vout_ControlChangeSubFilters(vout_thread_t *vout, const char *filters)
{
vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_FILTERS,
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->is_fullscreen = var_CreateGetBool(vout, "fullscreen")
+ || var_InheritBool(vout, "video-wallpaper");
cfg->display.title = title;
const int display_width = var_CreateGetInteger(vout, "width");
const int display_height = var_CreateGetInteger(vout, "height");
/* */
static picture_t *VoutVideoFilterInteractiveNewPicture(filter_t *filter)
{
- vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
+ vout_thread_t *vout = filter->owner.sys;
picture_t *picture = picture_pool_Get(vout->p->private_pool);
if (picture) {
}
return picture;
}
+
static picture_t *VoutVideoFilterStaticNewPicture(filter_t *filter)
{
- vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
+ vout_thread_t *vout = filter->owner.sys;
vlc_assert_locked(&vout->p->filter.lock);
if (filter_chain_GetLength(vout->p->filter.chain_interactive) == 0)
return picture_NewFromFormat(&filter->fmt_out.video);
}
+
static void VoutVideoFilterDelPicture(filter_t *filter, picture_t *picture)
{
VLC_UNUSED(filter);
picture_Release(picture);
}
-static int VoutVideoFilterStaticAllocationSetup(filter_t *filter, void *data)
-{
- 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 void ThreadFilterFlush(vout_thread_t *vout, bool is_locked)
{
if (vout->p->displayed.current)
fmt_current = *filter_chain_GetFmtOut(chain);
vlc_array_clear(array);
}
- VideoFormatCopyCropAr(&fmt_target.video, &fmt_current.video);
+
if (!es_format_IsSimilar(&fmt_current, &fmt_target)) {
msg_Dbg(vout, "Adding a filter to compensate for format changes");
if (!filter_chain_AppendFilter(vout->p->filter.chain_interactive, NULL, NULL,
}
}
+ es_format_Clean(&fmt_target);
+
if (vout->p->filter.configuration != filters) {
free(vout->p->filter.configuration);
vout->p->filter.configuration = filters ? strdup(filters) : NULL;
/* */
-static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_late_dropped)
+static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool frame_by_frame)
{
- int lost_count = 0;
+ bool is_late_dropped = vout->p->is_late_dropped && !vout->p->pause.is_on && !frame_by_frame;
vlc_mutex_lock(&vout->p->filter.lock);
decoded = picture_Hold(vout->p->displayed.decoded);
} else {
decoded = picture_fifo_Pop(vout->p->decoder_fifo);
- 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 > 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 (decoded) {
+ if (is_late_dropped && !decoded->b_force) {
+ const mtime_t predicted = mdate() + 0; /* TODO improve */
+ const mtime_t late = predicted - decoded->date;
+ if (late > VOUT_DISPLAY_LATE_THRESHOLD) {
+ msg_Warn(vout, "picture is too late to be displayed (missing %"PRId64" ms)", late/1000);
+ picture_Release(decoded);
+ vout_statistic_AddLost(&vout->p->statistic, 1);
+ continue;
+ } else if (late > 0) {
+ msg_Dbg(vout, "picture might be displayed late (missing %"PRId64" ms)", late/1000);
+ }
}
+ if (!VideoFormatIsCropArEqual(&decoded->format, &vout->p->filter.format))
+ ThreadChangeFilters(vout, &decoded->format, vout->p->filter.configuration, true);
}
- if (decoded &&
- !VideoFormatIsCropArEqual(&decoded->format, &vout->p->filter.format))
- ThreadChangeFilters(vout, &decoded->format, vout->p->filter.configuration, true);
}
+
if (!decoded)
break;
reuse = false;
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;
static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
{
+ vout_thread_sys_t *sys = vout->p;
vout_display_t *vd = vout->p->display.vd;
picture_t *torender = picture_Hold(vout->p->displayed.current);
msg_Warn(vout, "Unsupported timestamp modifications done by chain_interactive");
/*
- * Check for subpictures to display
+ * Get the subpicture to be displayed
*/
const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
- mtime_t spu_render_time;
+ mtime_t render_subtitle_date;
if (vout->p->pause.is_on)
- spu_render_time = vout->p->pause.date;
+ render_subtitle_date = vout->p->pause.date;
else
- spu_render_time = filtered->date > 1 ? filtered->date : mdate();
+ render_subtitle_date = filtered->date > 1 ? filtered->date : mdate();
+ mtime_t render_osd_date = mdate(); /* FIXME wrong */
+
+ /*
+ * Get the subpicture to be displayed
+ */
+ const bool do_dr_spu = !do_snapshot &&
+ vd->info.subpicture_chromas &&
+ *vd->info.subpicture_chromas != 0;
+
+ //FIXME: Denying do_early_spu if vd->source.orientation != ORIENT_NORMAL
+ //will have the effect that snapshots miss the subpictures. We do this
+ //because there is currently no way to transform subpictures to match
+ //the source format.
+ const bool do_early_spu = !do_dr_spu &&
+ vd->source.orientation == ORIENT_NORMAL &&
+ (vd->info.is_slow ||
+ sys->display.use_dr ||
+ do_snapshot ||
+ !vout_IsDisplayFiltered(vd) ||
+ vd->fmt.i_width * vd->fmt.i_height <= vd->source.i_width * vd->source.i_height);
+
+ const vlc_fourcc_t *subpicture_chromas;
+ video_format_t fmt_spu;
+ if (do_dr_spu) {
+ vout_display_place_t place;
+ vout_display_PlacePicture(&place, &vd->source, vd->cfg, false);
+
+ fmt_spu = vd->source;
+ if (fmt_spu.i_width * fmt_spu.i_height < place.width * place.height) {
+ fmt_spu.i_sar_num = vd->cfg->display.sar.num;
+ fmt_spu.i_sar_den = vd->cfg->display.sar.den;
+ fmt_spu.i_width =
+ fmt_spu.i_visible_width = place.width;
+ fmt_spu.i_height =
+ fmt_spu.i_visible_height = place.height;
+ }
+ subpicture_chromas = vd->info.subpicture_chromas;
+ } else {
+ if (do_early_spu) {
+ fmt_spu = vd->source;
+ } else {
+ fmt_spu = vd->fmt;
+ fmt_spu.i_sar_num = vd->cfg->display.sar.num;
+ fmt_spu.i_sar_den = vd->cfg->display.sar.den;
+ }
+ subpicture_chromas = NULL;
- subpicture_t *subpic = spu_SortSubpictures(vout->p->spu,
- spu_render_time,
- do_snapshot);
+ if (vout->p->spu_blend &&
+ vout->p->spu_blend->fmt_out.video.i_chroma != fmt_spu.i_chroma) {
+ filter_DeleteBlend(vout->p->spu_blend);
+ vout->p->spu_blend = NULL;
+ vout->p->spu_blend_chroma = 0;
+ }
+ if (!vout->p->spu_blend && vout->p->spu_blend_chroma != fmt_spu.i_chroma) {
+ vout->p->spu_blend_chroma = fmt_spu.i_chroma;
+ vout->p->spu_blend = filter_NewBlend(VLC_OBJECT(vout), &fmt_spu);
+ if (!vout->p->spu_blend)
+ msg_Err(vout, "Failed to create blending filter, OSD/Subtitles will not work");
+ }
+ }
+
+ video_format_t fmt_spu_rot;
+ video_format_ApplyRotation(&fmt_spu_rot, &fmt_spu);
+ subpicture_t *subpic = spu_Render(vout->p->spu,
+ subpicture_chromas, &fmt_spu_rot,
+ &vd->source,
+ render_subtitle_date, render_osd_date,
+ do_snapshot);
/*
* Perform rendering
*
* - 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->spu,
- render, &vd->source,
- subpic, &vd->source, spu_render_time);
+ bool is_direct = vout->p->decoder_pool == vout->p->display_pool;
+ picture_t *todisplay = filtered;
+ if (do_early_spu && subpic) {
+ picture_t *blent = picture_pool_Get(vout->p->private_pool);
+ if (blent) {
+ VideoFormatCopyCropAr(&blent->format, &filtered->format);
+ picture_Copy(blent, filtered);
+ if (vout->p->spu_blend
+ && picture_BlendSubpicture(blent, vout->p->spu_blend, subpic)) {
+ picture_Release(todisplay);
+ todisplay = blent;
+ } else
+ picture_Release(blent);
}
- if (vout->p->is_decoder_pool_slow) {
- direct = picture_pool_Get(vout->p->display_pool);
- if (direct)
- picture_Copy(direct, render);
- picture_Release(render);
+ subpicture_Delete(subpic);
+ subpic = NULL;
+ }
- } else {
- direct = render;
+ assert(vout_IsDisplayFiltered(vd) == !sys->display.use_dr);
+ if (sys->display.use_dr && !is_direct) {
+ picture_t *direct = picture_pool_Get(vout->p->display_pool);
+ if (!direct) {
+ picture_Release(todisplay);
+ if (subpic)
+ subpicture_Delete(subpic);
+ return VLC_EGENERIC;
}
- VideoFormatCopyCropAr(&direct->format, &filtered->format);
- picture_Release(filtered);
- filtered = NULL;
- } else {
- direct = filtered;
- }
- if (!direct)
- return VLC_EGENERIC;
+ /* The display uses direct rendering (no conversion), but its pool of
+ * pictures is not usable by the decoder (too few, too slow or
+ * subject to invalidation...). Since there are no filters, copying
+ * pictures from the decoder to the output is unavoidable. */
+ VideoFormatCopyCropAr(&direct->format, &todisplay->format);
+ picture_Copy(direct, todisplay);
+ picture_Release(todisplay);
+ todisplay = direct;
+ }
/*
* Take a snapshot if requested
*/
if (do_snapshot)
- vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct);
+ vout_snapshot_Set(&vout->p->snapshot, &vd->source, todisplay);
- /* Render the direct buffer returned by vout_RenderPicture */
- vout_RenderWrapper(vout, direct);
+ /* Render the direct buffer */
+ vout_UpdateDisplaySourceProperties(vd, &todisplay->format);
+ if (sys->display.use_dr) {
+ vout_display_Prepare(vd, todisplay, subpic);
+ } else {
+ sys->display.filtered = vout_FilterDisplay(vd, todisplay);
+ if (sys->display.filtered) {
+ if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
+ picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, subpic);
+ vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : NULL);
+ }
+ if (!do_dr_spu && subpic)
+ {
+ subpicture_Delete(subpic);
+ subpic = NULL;
+ }
+ if (!sys->display.filtered)
+ return VLC_EGENERIC;
+ }
vout_chrono_Stop(&vout->p->render);
#if 0
msg_Warn(vout, "picture is late (%lld ms)", delay / 1000);
#endif
if (!is_forced)
- mwait(direct->date);
+ mwait(todisplay->date);
/* Display the direct buffer returned by vout_RenderPicture */
vout->p->displayed.date = mdate();
+ vout_display_Display(vd,
+ sys->display.filtered ? sys->display.filtered
+ : todisplay,
+ subpic);
+ sys->display.filtered = NULL;
- vout_DisplayWrapper(vout, direct);
-
- vout_statistic_Update(&vout->p->statistic, 1, 0);
+ vout_statistic_AddDisplayed(&vout->p->statistic, 1);
return VLC_SUCCESS;
}
-static int ThreadDisplayPicture(vout_thread_t *vout,
- bool now, mtime_t *deadline)
+static int ThreadDisplayPicture(vout_thread_t *vout, mtime_t *deadline)
{
- bool is_late_dropped = vout->p->is_late_dropped && !vout->p->pause.is_on && !now;
+ bool frame_by_frame = !deadline;
+ bool paused = vout->p->pause.is_on;
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;
- }
- }
- }
+
+ if (first)
+ if (ThreadDisplayPreparePicture(vout, true, frame_by_frame)) /* FIXME not sure it is ok */
+ return VLC_EGENERIC;
+
+ if (!paused || frame_by_frame)
+ while (!vout->p->displayed.next && !ThreadDisplayPreparePicture(vout, false, frame_by_frame))
+ ;
const mtime_t date = mdate();
const mtime_t render_delay = vout_chrono_GetHigh(&vout->p->render) + VOUT_MWAIT_TOLERANCE;
+ bool drop_next_frame = frame_by_frame;
mtime_t date_next = VLC_TS_INVALID;
- if (!vout->p->pause.is_on && vout->p->displayed.next)
+ if (!paused && vout->p->displayed.next) {
date_next = vout->p->displayed.next->date - render_delay;
+ if (date_next /* + 0 FIXME */ <= date)
+ drop_next_frame = true;
+ }
/* 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
+ * For now a high update period is needed but it could 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.
+ * So it will be done later.
*/
+ bool refresh = false;
+
mtime_t date_refresh = VLC_TS_INVALID;
- if (vout->p->displayed.date > 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;
+ }
+ bool force_refresh = !drop_next_frame && refresh;
+
+ if (!first && !refresh && !drop_next_frame) {
+ if (!frame_by_frame) {
+ if (date_refresh != VLC_TS_INVALID)
+ *deadline = date_refresh;
+ if (date_next != VLC_TS_INVALID && date_next < *deadline)
+ *deadline = date_next;
+ }
return VLC_EGENERIC;
}
- if (drop) {
+ if (drop_next_frame) {
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,
- mtime_t *deadline,
- vout_interlacing_support_t *interlacing,
- vout_postprocessing_support_t *postprocessing)
-{
- vlc_mutex_lock(&vout->p->picture_lock);
-
- *deadline = VLC_TS_INVALID;
- for (;;) {
- if (ThreadDisplayPicture(vout, false, deadline))
- break;
- }
-
- const int picture_qtype = vout->p->displayed.qtype;
- const bool picture_interlaced = vout->p->displayed.is_interlaced;
-
- vlc_mutex_unlock(&vout->p->picture_lock);
-
- /* Post processing */
- vout_SetPostProcessingState(vout, postprocessing, picture_qtype);
-
- /* Deinterlacing */
- vout_SetInterlacingState(vout, interlacing, picture_interlaced);
-
- vout_ManageWrapper(vout);
+ /* display the picture immediately */
+ bool is_forced = frame_by_frame || force_refresh || vout->p->displayed.current->b_force;
+ int ret = ThreadDisplayRenderPicture(vout, is_forced);
+ return force_refresh ? VLC_EGENERIC : ret;
}
static void ThreadDisplaySubpicture(vout_thread_t *vout,
subpicture_t *subpicture)
{
- spu_DisplaySubpicture(vout->p->spu, subpicture);
+ spu_PutSubpicture(vout->p->spu, subpicture);
}
static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
string);
}
+static void ThreadChangeSubSources(vout_thread_t *vout, const char *filters)
+{
+ spu_ChangeSources(vout->p->spu, filters);
+}
+
static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters)
{
spu_ChangeFilters(vout->p->spu, filters);
}
+
static void ThreadChangeSubMargin(vout_thread_t *vout, int margin)
{
spu_ChangeMargin(vout->p->spu, margin);
if (vout->p->step.last <= VLC_TS_INVALID)
vout->p->step.last = vout->p->displayed.timestamp;
- mtime_t dummy;
- if (ThreadDisplayPicture(vout, true, &dummy))
+ if (ThreadDisplayPicture(vout, NULL))
return;
vout->p->step.timestamp = vout->p->displayed.timestamp;
static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
{
- /* FIXME not sure setting "fullscreen" is good ... */
- var_SetBool(vout, "fullscreen", fullscreen);
vout_SetDisplayFullscreen(vout->p->display.vd, fullscreen);
}
-static void ThreadChangeOnTop(vout_thread_t *vout, bool is_on_top)
+static void ThreadChangeWindowState(vout_thread_t *vout, unsigned state)
{
- vout_SetWindowState(vout->p->display.vd,
- is_on_top ? VOUT_WINDOW_STATE_ABOVE :
- VOUT_WINDOW_STATE_NORMAL);
+ vout_SetWindowState(vout->p->display.vd, state);
}
static void ThreadChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
vout->p->filter.configuration = NULL;
video_format_Copy(&vout->p->filter.format, &vout->p->original);
+
+ filter_owner_t owner = {
+ .sys = vout,
+ .video = {
+ .buffer_new = VoutVideoFilterStaticNewPicture,
+ .buffer_del = VoutVideoFilterDelPicture,
+ },
+ };
vout->p->filter.chain_static =
- filter_chain_New( vout, "video filter2", true,
- VoutVideoFilterStaticAllocationSetup, NULL, vout);
+ filter_chain_NewVideo( vout, true, &owner );
+
+ owner.video.buffer_new = VoutVideoFilterInteractiveNewPicture;
vout->p->filter.chain_interactive =
- filter_chain_New( vout, "video filter2", true,
- VoutVideoFilterInteractiveAllocationSetup, NULL, vout);
+ filter_chain_NewVideo( vout, true, &owner );
vout_display_state_t state_default;
if (!state) {
+ var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
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;
+
+ bool below = var_InheritBool(vout, "video-wallpaper");
+ bool above = var_CreateGetBool(vout, "video-on-top");
+
+ state_default.wm_state = below ? VOUT_WINDOW_STATE_BELOW
+ : above ? VOUT_WINDOW_STATE_ABOVE
+ : VOUT_WINDOW_STATE_NORMAL;
state_default.sar.num = 0;
state_default.sar.den = 0;
vout->p->displayed.decoded = NULL;
vout->p->displayed.date = VLC_TS_INVALID;
vout->p->displayed.timestamp = VLC_TS_INVALID;
- vout->p->displayed.qtype = QTYPE_NONE;
vout->p->displayed.is_interlaced = false;
vout->p->step.last = VLC_TS_INVALID;
vout->p->step.timestamp = VLC_TS_INVALID;
+ vout->p->spu_blend_chroma = 0;
+ vout->p->spu_blend = NULL;
+
video_format_Print(VLC_OBJECT(vout), "original format", &vout->p->original);
return VLC_SUCCESS;
}
static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state)
{
+ if (vout->p->spu_blend)
+ filter_DeleteBlend(vout->p->spu_blend);
+
/* Destroy translation tables */
if (vout->p->display.vd) {
if (vout->p->decoder_pool) {
return VLC_SUCCESS;
}
+static int ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
+{
+ switch(cmd.type) {
+ case VOUT_CONTROL_INIT:
+ ThreadInit(vout);
+ if (!ThreadStart(vout, NULL))
+ break;
+ case VOUT_CONTROL_CLEAN:
+ ThreadStop(vout, NULL);
+ ThreadClean(vout);
+ return 1;
+ case VOUT_CONTROL_REINIT:
+ if (ThreadReinit(vout, cmd.u.cfg))
+ return 1;
+ 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);
+ break;
+ case VOUT_CONTROL_CHANGE_FILTERS:
+ ThreadChangeFilters(vout, NULL, cmd.u.string, false);
+ break;
+ case VOUT_CONTROL_CHANGE_SUB_SOURCES:
+ ThreadChangeSubSources(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;
+ case VOUT_CONTROL_FLUSH:
+ ThreadFlush(vout, false, cmd.u.time);
+ break;
+ case VOUT_CONTROL_RESET:
+ ThreadReset(vout);
+ break;
+ case VOUT_CONTROL_STEP:
+ ThreadStep(vout, cmd.u.time_ptr);
+ break;
+ case VOUT_CONTROL_FULLSCREEN:
+ ThreadChangeFullscreen(vout, cmd.u.boolean);
+ break;
+ case VOUT_CONTROL_WINDOW_STATE:
+ ThreadChangeWindowState(vout, cmd.u.integer);
+ break;
+ case VOUT_CONTROL_DISPLAY_FILLED:
+ ThreadChangeDisplayFilled(vout, cmd.u.boolean);
+ break;
+ case VOUT_CONTROL_ZOOM:
+ ThreadChangeZoom(vout, cmd.u.pair.a, cmd.u.pair.b);
+ break;
+ case VOUT_CONTROL_ASPECT_RATIO:
+ ThreadChangeAspectRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
+ break;
+ case VOUT_CONTROL_CROP_RATIO:
+ ThreadExecuteCropRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
+ break;
+ case VOUT_CONTROL_CROP_WINDOW:
+ ThreadExecuteCropWindow(vout,
+ cmd.u.window.x, cmd.u.window.y,
+ cmd.u.window.width, cmd.u.window.height);
+ break;
+ case VOUT_CONTROL_CROP_BORDER:
+ ThreadExecuteCropBorder(vout,
+ cmd.u.border.left, cmd.u.border.top,
+ cmd.u.border.right, cmd.u.border.bottom);
+ break;
+ default:
+ break;
+ }
+ vout_control_cmd_Clean(&cmd);
+ return 0;
+}
+
/*****************************************************************************
* Thread: video output thread
*****************************************************************************
static void *Thread(void *object)
{
vout_thread_t *vout = object;
+ vout_thread_sys_t *sys = vout->p;
vout_interlacing_support_t interlacing = {
.is_interlaced = false,
.date = mdate(),
};
- vout_postprocessing_support_t postprocessing = {
- .qtype = QTYPE_NONE,
- };
mtime_t deadline = VLC_TS_INVALID;
for (;;) {
vout_control_cmd_t cmd;
-
- /* FIXME remove thoses ugly timeouts
- */
- while (!vout_control_Pop(&vout->p->control, &cmd, deadline, 100000)) {
- switch(cmd.type) {
- case VOUT_CONTROL_INIT:
- ThreadInit(vout);
- if (ThreadStart(vout, NULL)) {
- ThreadStop(vout, NULL);
- ThreadClean(vout);
- return NULL;
- }
- break;
- case VOUT_CONTROL_CLEAN:
- ThreadStop(vout, NULL);
- ThreadClean(vout);
+ /* FIXME remove thoses ugly timeouts */
+ while (!vout_control_Pop(&sys->control, &cmd, deadline, 100000))
+ if (ThreadControl(vout, cmd))
return NULL;
- case VOUT_CONTROL_REINIT:
- 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);
- break;
- case VOUT_CONTROL_CHANGE_FILTERS:
- ThreadChangeFilters(vout, NULL, cmd.u.string, false);
- 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;
- case VOUT_CONTROL_FLUSH:
- ThreadFlush(vout, false, cmd.u.time);
- break;
- case VOUT_CONTROL_RESET:
- ThreadReset(vout);
- break;
- case VOUT_CONTROL_STEP:
- ThreadStep(vout, cmd.u.time_ptr);
- break;
- case VOUT_CONTROL_FULLSCREEN:
- ThreadChangeFullscreen(vout, cmd.u.boolean);
- break;
- case VOUT_CONTROL_ON_TOP:
- ThreadChangeOnTop(vout, cmd.u.boolean);
- break;
- case VOUT_CONTROL_DISPLAY_FILLED:
- ThreadChangeDisplayFilled(vout, cmd.u.boolean);
- break;
- case VOUT_CONTROL_ZOOM:
- ThreadChangeZoom(vout, cmd.u.pair.a, cmd.u.pair.b);
- break;
- case VOUT_CONTROL_ASPECT_RATIO:
- ThreadChangeAspectRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
- break;
- case VOUT_CONTROL_CROP_RATIO:
- ThreadExecuteCropRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
- break;
- case VOUT_CONTROL_CROP_WINDOW:
- ThreadExecuteCropWindow(vout,
- cmd.u.window.x, cmd.u.window.y,
- cmd.u.window.width, cmd.u.window.height);
- break;
- case VOUT_CONTROL_CROP_BORDER:
- ThreadExecuteCropBorder(vout,
- cmd.u.border.left, cmd.u.border.top,
- cmd.u.border.right, cmd.u.border.bottom);
- break;
- default:
- break;
- }
- vout_control_cmd_Clean(&cmd);
- }
- ThreadManage(vout, &deadline, &interlacing, &postprocessing);
+ vlc_mutex_lock(&sys->picture_lock);
+
+ deadline = VLC_TS_INVALID;
+ while (!ThreadDisplayPicture(vout, &deadline))
+ ;
+
+ const bool picture_interlaced = sys->displayed.is_interlaced;
+
+ vlc_mutex_unlock(&sys->picture_lock);
+
+ vout_SetInterlacingState(vout, &interlacing, picture_interlaced);
+ vout_ManageWrapper(vout);
}
}
-