X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=f9e52cdb377c9b3ca9c06accb068b2e27cc47199;hb=681bf48f3c246640a193b009f5b86010495c4849;hp=4ded44e2b7c53abe8eca80d5f92f00a8f6d571a2;hpb=6bd4060bd422e565516d77d05ab93f7a606e5304;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 4ded44e2b7..f9e52cdb37 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,26 +5,26 @@ * 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 * Gildas Bazin * Laurent Aimar * - * 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. *****************************************************************************/ /***************************************************************************** @@ -49,7 +49,6 @@ #include #include "vout_internal.h" #include "interlacing.h" -#include "postprocessing.h" #include "display.h" /***************************************************************************** @@ -75,7 +74,8 @@ static void VoutDestructor(vlc_object_t *); 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; @@ -92,6 +92,22 @@ static int VoutValidateFormat(video_format_t *dst, video_format_FixRgb(dst); return VLC_SUCCESS; } +static void VideoFormatCopyCropAr(video_format_t *dst, + const video_format_t *src) +{ + video_format_CopyCrop(dst, src); + dst->i_sar_num = src->i_sar_num; + dst->i_sar_den = src->i_sar_den; +} +static bool VideoFormatIsCropArEqual(video_format_t *dst, + const video_format_t *src) +{ + return dst->i_sar_num * src->i_sar_den == dst->i_sar_den * src->i_sar_num && + dst->i_x_offset == src->i_x_offset && + dst->i_y_offset == src->i_y_offset && + dst->i_visible_width == src->i_visible_width && + dst->i_visible_height == src->i_visible_height; +} static vout_thread_t *VoutCreate(vlc_object_t *object, const vout_configuration_t *cfg) @@ -103,7 +119,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object, /* 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; @@ -127,18 +143,15 @@ static vout_thread_t *VoutCreate(vlc_object_t *object, 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"); @@ -208,6 +221,7 @@ vout_thread_t *(vout_Request)(vlc_object_t *object, if (!vout->p->dead) { msg_Dbg(object, "reusing provided vout"); + vout_IntfReinit(vout); return vout; } vout_CloseAndRelease(vout); @@ -385,7 +399,7 @@ picture_t *vout_GetPicture(vout_thread_t *vout) picture_t *picture = picture_pool_Get(vout->p->decoder_pool); if (picture) { picture_Reset(picture); - picture->p_next = NULL; + VideoFormatCopyCropAr(&picture->format, &vout->p->original); } vlc_mutex_unlock(&vout->p->picture_lock); @@ -456,8 +470,8 @@ int vout_GetSnapshot(vout_thread_t *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)) { @@ -511,10 +525,10 @@ void vout_ControlChangeCropWindow(vout_thread_t *vout, { vout_control_cmd_t cmd; vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_WINDOW); - cmd.u.window.x = x; - cmd.u.window.y = y; - cmd.u.window.width = width; - cmd.u.window.height = height; + cmd.u.window.x = __MAX(x, 0); + cmd.u.window.y = __MAX(y, 0); + cmd.u.window.width = __MAX(width, 0); + cmd.u.window.height = __MAX(height, 0); vout_control_Push(&vout->p->control, &cmd); } @@ -523,10 +537,10 @@ void vout_ControlChangeCropBorder(vout_thread_t *vout, { vout_control_cmd_t cmd; vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_BORDER); - cmd.u.border.left = left; - cmd.u.border.top = top; - cmd.u.border.right = right; - cmd.u.border.bottom = bottom; + cmd.u.border.left = __MAX(left, 0); + cmd.u.border.top = __MAX(top, 0); + cmd.u.border.right = __MAX(right, 0); + cmd.u.border.bottom = __MAX(bottom, 0); vout_control_Push(&vout->p->control, &cmd); } @@ -535,6 +549,11 @@ void vout_ControlChangeFilters(vout_thread_t *vout, const char *filters) 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, @@ -641,12 +660,16 @@ void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd, } /* */ - 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); + picture_t *picture = picture_pool_Get(vout->p->private_pool); + if (picture) { + picture_Reset(picture); + VideoFormatCopyCropAr(&picture->format, &filter->fmt_out.video); + } + return picture; } static picture_t *VoutVideoFilterStaticNewPicture(filter_t *filter) { @@ -655,6 +678,7 @@ static picture_t *VoutVideoFilterStaticNewPicture(filter_t *filter) 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) @@ -676,11 +700,123 @@ static int VoutVideoFilterInteractiveAllocationSetup(filter_t *filter, void *dat filter->p_owner = data; /* vout */ return VLC_SUCCESS; } +static void ThreadFilterFlush(vout_thread_t *vout, bool is_locked) +{ + 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; + + if (!is_locked) + vlc_mutex_lock(&vout->p->filter.lock); + filter_chain_VideoFlush(vout->p->filter.chain_static); + filter_chain_VideoFlush(vout->p->filter.chain_interactive); + if (!is_locked) + 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 video_format_t *source, + const char *filters, + bool is_locked) +{ + ThreadFilterFlush(vout, is_locked); + + 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; + } + + if (!is_locked) + vlc_mutex_lock(&vout->p->filter.lock); + + es_format_t fmt_target; + es_format_InitFromVideo(&fmt_target, source ? source : &vout->p->filter.format); + + es_format_t fmt_current = fmt_target; + + 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_current, &fmt_current); + 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); + } + 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, + &fmt_current, &fmt_target)) { + msg_Err(vout, "Failed to compensate for the format changes, removing all filters"); + filter_chain_Reset(vout->p->filter.chain_static, &fmt_target, &fmt_target); + filter_chain_Reset(vout->p->filter.chain_interactive, &fmt_target, &fmt_target); + } + } + + if (vout->p->filter.configuration != filters) { + free(vout->p->filter.configuration); + vout->p->filter.configuration = filters ? strdup(filters) : NULL; + } + if (source) { + video_format_Clean(&vout->p->filter.format); + video_format_Copy(&vout->p->filter.format, source); + } + + if (!is_locked) + vlc_mutex_unlock(&vout->p->filter.lock); +} + /* */ -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); @@ -693,19 +829,24 @@ static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_ 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) break; reuse = false; @@ -716,14 +857,12 @@ static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_ 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; @@ -737,6 +876,7 @@ static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_ 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); @@ -754,18 +894,74 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced) 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 */ - subpicture_t *subpic = spu_SortSubpictures(vout->p->spu, - spu_render_time, - do_snapshot); + /* + * Get the subpicture to be displayed + */ + const bool do_dr_spu = !do_snapshot && + vd->info.subpicture_chromas && + *vd->info.subpicture_chromas != 0; + const bool do_early_spu = !do_dr_spu && + (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; + + 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"); + } + } + + subpicture_t *subpic = spu_Render(vout->p->spu, + subpicture_chromas, &fmt_spu, + &vd->source, + render_subtitle_date, render_osd_date, + do_snapshot); /* * Perform rendering * @@ -773,50 +969,69 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced) * - 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; } - 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 @@ -835,114 +1050,91 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced) 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; + 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; + /* display the picture immediately */ + bool is_forced = frame_by_frame || (!drop_next_frame && 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); -} - 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) @@ -960,105 +1152,16 @@ static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string) string); } -static void ThreadFilterFlush(vout_thread_t *vout) +static void ThreadChangeSubSources(vout_thread_t *vout, const char *filters) { - 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_target; - es_format_InitFromVideo(&fmt_target, &vout->p->original); - - es_format_t fmt_current = fmt_target; - - 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_current, &fmt_current); - 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); - } - fmt_current = *filter_chain_GetFmtOut(chain); - vlc_array_clear(array); - } - 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, - &fmt_current, &fmt_target)) { - msg_Err(vout, "Failed to compensate for the format changes, removing all filters"); - filter_chain_Reset(vout->p->filter.chain_static, &fmt_target, &fmt_target); - filter_chain_Reset(vout->p->filter.chain_interactive, &fmt_target, &fmt_target); - } - } - - vlc_mutex_unlock(&vout->p->filter.lock); + 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); @@ -1080,7 +1183,7 @@ static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) vout->p->displayed.decoded->date += duration; spu_OffsetSubtitleDate(vout->p->spu, duration); - ThreadFilterFlush(vout); + ThreadFilterFlush(vout, false); } else { vout->p->step.timestamp = VLC_TS_INVALID; vout->p->step.last = VLC_TS_INVALID; @@ -1094,7 +1197,7 @@ 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 */ + ThreadFilterFlush(vout, false); /* FIXME too much */ picture_t *last = vout->p->displayed.decoded; if (last) { @@ -1127,8 +1230,7 @@ static void ThreadStep(vout_thread_t *vout, mtime_t *duration) 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; @@ -1143,8 +1245,6 @@ static void ThreadStep(vout_thread_t *vout, mtime_t *duration) 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); } @@ -1175,51 +1275,31 @@ static void ThreadChangeZoom(vout_thread_t *vout, int num, int den) static void ThreadChangeAspectRatio(vout_thread_t *vout, unsigned num, unsigned den) { - const video_format_t *source = &vout->p->original; - - if (num > 0 && den > 0) { - num *= source->i_visible_height; - den *= source->i_visible_width; - vlc_ureduce(&num, &den, num, den, 0); - } vout_SetDisplayAspect(vout->p->display.vd, num, den); } static void ThreadExecuteCropWindow(vout_thread_t *vout, - unsigned crop_num, unsigned crop_den, unsigned x, unsigned y, unsigned width, unsigned height) { - const video_format_t *source = &vout->p->original; - - vout_SetDisplayCrop(vout->p->display.vd, - crop_num, crop_den, - source->i_x_offset + x, - source->i_y_offset + y, - width, height); + vout_SetDisplayCrop(vout->p->display.vd, 0, 0, + x, y, width, height); } static void ThreadExecuteCropBorder(vout_thread_t *vout, unsigned left, unsigned top, unsigned right, unsigned bottom) { - const video_format_t *source = &vout->p->original; - ThreadExecuteCropWindow(vout, 0, 0, - left, - top, - /* At worst, it becomes < 0 (but unsigned) and will be rejected */ - source->i_visible_width - (left + right), - source->i_visible_height - (top + bottom)); + msg_Err(vout, "ThreadExecuteCropBorder %d.%d %dx%d", left, top, right, bottom); + vout_SetDisplayCrop(vout->p->display.vd, 0, 0, + left, top, -(int)right, -(int)bottom); } static void ThreadExecuteCropRatio(vout_thread_t *vout, unsigned num, unsigned den) { - const video_format_t *source = &vout->p->original; - ThreadExecuteCropWindow(vout, num, den, - 0, 0, - source->i_visible_width, - source->i_visible_height); + vout_SetDisplayCrop(vout->p->display.vd, num, den, + 0, 0, 0, 0); } static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state) @@ -1230,6 +1310,8 @@ 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->filter.configuration = NULL; + video_format_Copy(&vout->p->filter.format, &vout->p->original); vout->p->filter.chain_static = filter_chain_New( vout, "video filter2", true, VoutVideoFilterStaticAllocationSetup, NULL, vout); @@ -1259,18 +1341,23 @@ static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state) 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) { @@ -1283,6 +1370,8 @@ static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state) /* Destroy the video filters2 */ filter_chain_Delete(vout->p->filter.chain_interactive); filter_chain_Delete(vout->p->filter.chain_static); + video_format_Clean(&vout->p->filter.format); + free(vout->p->filter.configuration); if (vout->p->decoder_fifo) picture_fifo_Delete(vout->p->decoder_fifo); @@ -1321,6 +1410,8 @@ static int ThreadReinit(vout_thread_t *vout, ThreadClean(vout); return VLC_EGENERIC; } + /* We ignore crop/ar changes at this point, they are dynamically supported */ + VideoFormatCopyCropAr(&vout->p->original, &original); if (video_format_IsSimilar(&original, &vout->p->original)) { if (cfg->dpb_size <= vout->p->dpb_size) return VLC_SUCCESS; @@ -1350,6 +1441,90 @@ static int ThreadReinit(vout_thread_t *vout, 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_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); + return 0; +} + /***************************************************************************** * Thread: video output thread ***************************************************************************** @@ -1360,105 +1535,32 @@ static int ThreadReinit(vout_thread_t *vout, 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, 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_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, 0, 0, - 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); } } -