X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fdisplay.c;h=0d20a56e80ff8d325c46500e96205bd248b64c9c;hb=398bac6ba1602e40aaa3a9cedaf2fdce608876f9;hp=877efd0932a22557102a2fa47a3bae6048be2022;hpb=9744c6016f14b54985c220f3e71dfeff3b565d9a;p=vlc diff --git a/src/video_output/display.c b/src/video_output/display.c index 877efd0932..0d20a56e80 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -6,19 +6,19 @@ * * Authors: 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. *****************************************************************************/ /***************************************************************************** @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include @@ -58,7 +60,7 @@ static picture_t *VideoBufferNew(filter_t *filter) vd->fmt.i_width == fmt->i_width && vd->fmt.i_height == fmt->i_height); - picture_pool_t *pool = vout_display_Pool(vd, 1); + picture_pool_t *pool = vout_display_Pool(vd, 3); if (!pool) return NULL; return picture_pool_Get(pool); @@ -98,7 +100,7 @@ static vout_display_t *vout_display_New(vlc_object_t *obj, vout_display_owner_t *owner) { /* */ - vout_display_t *vd = vlc_object_create(obj, sizeof(*vd)); + vout_display_t *vd = vlc_custom_create(obj, sizeof(*vd), "vout display" ); /* */ video_format_Copy(&vd->source, fmt); @@ -112,6 +114,8 @@ static vout_display_t *vout_display_New(vlc_object_t *obj, vd->info.has_double_click = false; vd->info.has_hide_mouse = false; vd->info.has_pictures_invalid = false; + vd->info.has_event_thread = false; + vd->info.subpicture_chromas = NULL; vd->cfg = cfg; vd->pool = NULL; @@ -123,8 +127,6 @@ static vout_display_t *vout_display_New(vlc_object_t *obj, vd->owner = *owner; - vlc_object_attach(vd, obj); - if (load_module) { vd->module = module_need(vd, "vout display", module, module && *module != '\0'); if (!vd->module) { @@ -162,6 +164,7 @@ static int vout_display_Control(vout_display_t *vd, int query, ...) return result; } + static void vout_display_Manage(vout_display_t *vd) { if (vd->manage) @@ -253,7 +256,7 @@ void vout_display_PlacePicture(vout_display_place_t *place, place->x = cfg->display.width - place->width; break; default: - place->x = (cfg->display.width - place->width) / 2; + place->x = ((int)cfg->display.width - (int)place->width) / 2; break; } @@ -265,7 +268,7 @@ void vout_display_PlacePicture(vout_display_place_t *place, place->y = cfg->display.height - place->height; break; default: - place->y = (cfg->display.height - place->height) / 2; + place->y = ((int)cfg->display.height - (int)place->height) / 2; break; } } @@ -284,8 +287,8 @@ struct vout_display_owner_sys_t { } sar_initial; /* */ - int width_saved; - int height_saved; + unsigned width_saved; + unsigned height_saved; struct { unsigned num; @@ -313,10 +316,10 @@ struct vout_display_owner_sys_t { bool ch_crop; struct { - unsigned x; - unsigned y; - unsigned width; - unsigned height; + int left; + int top; + int right; + int bottom; unsigned num; unsigned den; } crop; @@ -354,6 +357,13 @@ struct vout_display_owner_sys_t { bool display_is_fullscreen; bool display_is_forced; + int fit_window; + + struct { + vlc_thread_t thread; + block_fifo_t *fifo; + } event; + #ifdef ALLOW_DUMMY_VOUT vlc_mouse_t vout_mouse; #endif @@ -412,11 +422,7 @@ static void VoutDisplayCreateRender(vout_display_t *vd) break; } if (!filter) - { - msg_Err(vd, "VoutDisplayCreateRender FAILED"); - /* TODO */ - assert(0); - } + msg_Err(vd, "Failed to adapt decoder format to display"); } static void VoutDisplayDestroyRender(vout_display_t *vd) @@ -457,15 +463,12 @@ static void VoutDisplayEventMouse(vout_display_t *vd, int event, va_list args) case VOUT_DISPLAY_EVENT_MOUSE_MOVED: { const int x = (int)va_arg(args, int); const int y = (int)va_arg(args, int); - if (x != osys->mouse.state.i_x || y != osys->mouse.state.i_y) { - //msg_Dbg(vd, "VoutDisplayEvent 'mouse' @%d,%d", x, y); - m.i_x = x; - m.i_y = y; - m.b_double_click = false; - } else { - is_ignored = true; - } + //msg_Dbg(vd, "VoutDisplayEvent 'mouse' @%d,%d", x, y); + + m.i_x = x; + m.i_y = y; + m.b_double_click = false; break; } case VOUT_DISPLAY_EVENT_MOUSE_PRESSED: @@ -525,9 +528,6 @@ static void VoutDisplayEventMouse(vout_display_t *vd, int event, va_list args) if (!vd->info.has_hide_mouse) osys->mouse.last_moved = mdate(); - /* */ - vlc_mutex_unlock(&osys->lock); - /* */ vout_SendEventMouseVisible(osys->vout); #ifdef ALLOW_DUMMY_VOUT @@ -535,6 +535,48 @@ static void VoutDisplayEventMouse(vout_display_t *vd, int event, va_list args) #else vout_SendDisplayEventMouse(osys->vout, &m); #endif + vlc_mutex_unlock(&osys->lock); +} + +VLC_NORETURN +static void *VoutDisplayEventKeyDispatch(void *data) +{ + vout_display_owner_sys_t *osys = data; + + for (;;) { + block_t *event = block_FifoGet(osys->event.fifo); + + int cancel = vlc_savecancel(); + + int key; + memcpy(&key, event->p_buffer, sizeof(key)); + vout_SendEventKey(osys->vout, key); + block_Release(event); + + vlc_restorecancel(cancel); + } +} + +static void VoutDisplayEventKey(vout_display_t *vd, int key) +{ + vout_display_owner_sys_t *osys = vd->owner.sys; + + if (!osys->event.fifo) { + osys->event.fifo = block_FifoNew(); + if (!osys->event.fifo) + return; + if (vlc_clone(&osys->event.thread, VoutDisplayEventKeyDispatch, + osys, VLC_THREAD_PRIORITY_LOW)) { + block_FifoRelease(osys->event.fifo); + osys->event.fifo = NULL; + return; + } + } + block_t *event = block_Alloc(sizeof(key)); + if (event) { + memcpy(event->p_buffer, &key, sizeof(key)); + block_FifoPut(osys->event.fifo, event); + } } static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args) @@ -550,7 +592,10 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args) case VOUT_DISPLAY_EVENT_KEY: { const int key = (int)va_arg(args, int); msg_Dbg(vd, "VoutDisplayEvent 'key' 0x%2.2x", key); - vout_SendEventKey(osys->vout, key); + if (vd->info.has_event_thread) + vout_SendEventKey(osys->vout, key); + else + VoutDisplayEventKey(vd, key); break; } case VOUT_DISPLAY_EVENT_MOUSE_STATE: @@ -631,15 +676,85 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window { vout_display_owner_sys_t *osys = vd->owner.sys; +#ifdef ALLOW_DUMMY_VOUT + if (!osys->vout->p) { + vout_window_cfg_t cfg_override = *cfg; + + if (!var_InheritBool(osys->vout, "embedded-video")) + cfg_override.is_standalone = true; + + return vout_window_New(VLC_OBJECT(osys->vout), "$window", &cfg_override); + } +#endif return vout_NewDisplayWindow(osys->vout, vd, cfg); } static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window) { vout_display_owner_sys_t *osys = vd->owner.sys; +#ifdef ALLOW_DUMMY_VOUT + if (!osys->vout->p) { + if( window) + vout_window_Delete(window); + return; + } +#endif vout_DeleteDisplayWindow(osys->vout, vd, window); } +static void VoutDisplayFitWindow(vout_display_t *vd, bool default_size) +{ + vout_display_owner_sys_t *osys = vd->owner.sys; + vout_display_cfg_t cfg = osys->cfg; + + if (!cfg.is_display_filled) + return; + + cfg.display.width = 0; + if (default_size) { + cfg.display.height = 0; + } else { + cfg.display.height = osys->height_saved; + cfg.zoom.num = 1; + cfg.zoom.den = 1; + } + + unsigned display_width; + unsigned display_height; + vout_display_GetDefaultDisplaySize(&display_width, &display_height, + &vd->source, &cfg); + + vlc_mutex_lock(&osys->lock); + + osys->ch_display_size = true; + osys->display_width = display_width; + osys->display_height = display_height; + osys->display_is_fullscreen = osys->cfg.is_fullscreen; + osys->display_is_forced = true; + + vlc_mutex_unlock(&osys->lock); +} + +static void VoutDisplayCropRatio(int *left, int *top, int *right, int *bottom, + const video_format_t *source, + unsigned num, unsigned den) +{ + 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) { + *left = (source->i_visible_width - scaled_width) / 2; + *top = 0; + *right = *left + scaled_width; + *bottom = *top + source->i_visible_height; + } else { + *left = 0; + *top = (source->i_visible_height - scaled_height) / 2; + *right = *left + source->i_visible_width; + *bottom = *top + scaled_height; + } +} + void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) { vout_display_owner_sys_t *osys = vd->owner.sys; @@ -663,7 +778,7 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) if (hide_mouse) { if (!vd->info.has_hide_mouse) { - msg_Dbg(vd, "auto hidding mouse"); + msg_Dbg(vd, "auto hiding mouse cursor"); vout_display_Control(vd, VOUT_DISPLAY_HIDE_MOUSE); } vout_SendEventMouseHidden(osys->vout); @@ -706,8 +821,15 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) !osys->ch_zoom && !ch_wm_state && !osys->ch_sar && - !osys->ch_crop) + !osys->ch_crop) { + + if (!osys->cfg.is_fullscreen && osys->fit_window != 0) { + VoutDisplayFitWindow(vd, osys->fit_window == -1); + osys->fit_window = 0; + continue; + } break; + } /* */ if (ch_fullscreen) { @@ -720,6 +842,8 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN, &cfg)) { msg_Err(vd, "Failed to set fullscreen"); is_fullscreen = osys->cfg.is_fullscreen; + } else if (!is_fullscreen) { + vout_display_Control(vd, VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, &cfg, true); } osys->cfg.is_fullscreen = is_fullscreen; @@ -784,19 +908,8 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) msg_Err(vd, "Failed to change zoom"); osys->zoom.num = osys->cfg.zoom.num; osys->zoom.den = osys->cfg.zoom.den; - } else if (cfg.is_display_filled) { - const int display_width = (int64_t)vd->source.i_width * osys->zoom.num / osys->zoom.den; - const int display_height = (int64_t)vd->source.i_height * osys->zoom.num / osys->zoom.den; - - vlc_mutex_lock(&osys->lock); - - osys->ch_display_size = true; - osys->display_width = display_width; - osys->display_height = display_height; - osys->display_is_fullscreen = osys->cfg.is_fullscreen; - osys->display_is_forced = true; - - vlc_mutex_unlock(&osys->lock); + } else { + osys->fit_window = -1; } osys->cfg.zoom.num = osys->zoom.num; @@ -836,6 +949,8 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) */ msg_Err(vd, "Failed to change source AR"); source = vd->source; + } else if (!osys->fit_window) { + osys->fit_window = 1; } vd->source = source; osys->sar.num = source.i_sar_num; @@ -857,30 +972,50 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) 65536); vout_SendEventSourceAspect(osys->vout, dar_num, dar_den); } + /* If a crop ratio is requested, recompute the parameters */ + if (osys->crop.num > 0 && osys->crop.den > 0) + osys->ch_crop = true; } /* */ if (osys->ch_crop) { video_format_t source = vd->source; + unsigned crop_num = osys->crop.num; unsigned crop_den = osys->crop.den; - - source.i_x_offset = osys->crop.x; - source.i_y_offset = osys->crop.y; - source.i_visible_width = osys->crop.width; - source.i_visible_height = osys->crop.height; - - /* */ - const bool is_valid = source.i_x_offset < source.i_width && - source.i_y_offset < source.i_height && - source.i_x_offset + source.i_visible_width <= source.i_width && - source.i_y_offset + source.i_visible_height <= source.i_height && - source.i_visible_width > 0 && source.i_visible_height > 0; - - if (!is_valid || vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_CROP, &source)) { - if (is_valid) - msg_Err(vd, "Failed to change source crop TODO implement crop at core"); - else - msg_Err(vd, "Invalid crop requested"); + if (crop_num > 0 && crop_den > 0) { + video_format_t fmt = osys->source; + fmt.i_sar_num = source.i_sar_num; + fmt.i_sar_den = source.i_sar_den; + VoutDisplayCropRatio(&osys->crop.left, &osys->crop.top, + &osys->crop.right, &osys->crop.bottom, + &fmt, crop_num, crop_den); + } + const int right_max = osys->source.i_x_offset + osys->source.i_visible_width; + const int bottom_max = osys->source.i_y_offset + osys->source.i_visible_height; + int left = VLC_CLIP((int)osys->source.i_x_offset + osys->crop.left, + 0, right_max - 1); + int top = VLC_CLIP((int)osys->source.i_y_offset + osys->crop.top, + 0, bottom_max - 1); + int right, bottom; + if (osys->crop.right <= 0) + right = (int)(osys->source.i_x_offset + osys->source.i_visible_width) + osys->crop.right; + else + right = (int)osys->source.i_x_offset + osys->crop.right; + right = VLC_CLIP(right, left + 1, right_max); + if (osys->crop.bottom <= 0) + bottom = (int)(osys->source.i_y_offset + osys->source.i_visible_height) + osys->crop.bottom; + else + bottom = (int)osys->source.i_y_offset + osys->crop.bottom; + bottom = VLC_CLIP(bottom, top + 1, bottom_max); + + source.i_x_offset = left; + source.i_y_offset = top; + source.i_visible_width = right - left; + source.i_visible_height = bottom - top; + video_format_Print(VLC_OBJECT(vd), "SOURCE ", &osys->source); + video_format_Print(VLC_OBJECT(vd), "CROPPED", &source); + if (vout_display_Control(vd, VOUT_DISPLAY_CHANGE_SOURCE_CROP, &source)) { + msg_Err(vd, "Failed to change source crop TODO implement crop at core"); source = vd->source; crop_num = osys->crop_saved.num; @@ -888,24 +1023,25 @@ void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures) /* FIXME implement cropping in the core if not supported by the * vout module (easy) */ + } else if (!osys->fit_window) { + osys->fit_window = 1; } vd->source = source; - osys->crop.x = source.i_x_offset; - osys->crop.y = source.i_y_offset; - osys->crop.width = source.i_visible_width; - osys->crop.height = source.i_visible_height; + osys->crop.left = source.i_x_offset - osys->source.i_x_offset; + osys->crop.top = source.i_y_offset - osys->source.i_y_offset; + /* FIXME for right/bottom we should keep the 'type' border vs window */ + osys->crop.right = (source.i_x_offset + source.i_visible_width) - + (osys->source.i_x_offset + osys->source.i_visible_width); + osys->crop.bottom = (source.i_y_offset + source.i_visible_height) - + (osys->source.i_y_offset + osys->source.i_visible_height); osys->crop.num = crop_num; osys->crop.den = crop_den; osys->ch_crop = false; - /* TODO fix when a ratio is used (complicated). */ - const unsigned left = osys->crop.x - osys->source.i_x_offset; - const unsigned top = osys->crop.y - osys->source.i_y_offset; - const unsigned right = osys->source.i_visible_width - (osys->crop.width + osys->crop.x); - const unsigned bottom = osys->source.i_visible_height - (osys->crop.height + osys->crop.y); vout_SendEventSourceCrop(osys->vout, osys->crop.num, osys->crop.den, - left, top, right, bottom); + osys->crop.left, osys->crop.top, + -osys->crop.right, -osys->crop.bottom); } /* */ @@ -944,9 +1080,43 @@ picture_t *vout_FilterDisplay(vout_display_t *vd, picture_t *picture) vout_display_owner_sys_t *osys = vd->owner.sys; assert(osys->filters); + if (filter_chain_GetLength(osys->filters) <= 0) { + picture_Release(picture); + return NULL; + } return filter_chain_VideoFilter(osys->filters, picture); } +void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *source) +{ + vout_display_owner_sys_t *osys = vd->owner.sys; + + if (source->i_sar_num * osys->source.i_sar_den != + source->i_sar_den * osys->source.i_sar_num) { + + osys->source.i_sar_num = source->i_sar_num; + osys->source.i_sar_den = source->i_sar_den; + vlc_ureduce(&osys->source.i_sar_num, &osys->source.i_sar_den, + osys->source.i_sar_num, osys->source.i_sar_den, 0); + + /* FIXME it will override any AR that the user would have forced */ + osys->ch_sar = true; + osys->sar.num = osys->source.i_sar_num; + osys->sar.den = osys->source.i_sar_den; + } + if (source->i_x_offset != osys->source.i_x_offset || + source->i_y_offset != osys->source.i_y_offset || + source->i_visible_width != osys->source.i_visible_width || + source->i_visible_height != osys->source.i_visible_height) { + + video_format_CopyCrop(&osys->source, source); + + /* Force the vout to reapply the current user crop settings over the new decoder + * crop settings. */ + osys->ch_crop = true; + } +} + void vout_SetDisplayFullscreen(vout_display_t *vd, bool is_fullscreen) { vout_display_owner_sys_t *osys = vd->owner.sys; @@ -993,10 +1163,20 @@ void vout_SetWindowState(vout_display_t *vd, unsigned state) vlc_mutex_unlock(&osys->lock); } -void vout_SetDisplayAspect(vout_display_t *vd, unsigned sar_num, unsigned sar_den) +void vout_SetDisplayAspect(vout_display_t *vd, unsigned dar_num, unsigned dar_den) { vout_display_owner_sys_t *osys = vd->owner.sys; + unsigned sar_num, sar_den; + if (dar_num > 0 && dar_den > 0) { + sar_num = dar_num * osys->source.i_visible_height; + sar_den = dar_den * osys->source.i_visible_width; + vlc_ureduce(&sar_num, &sar_den, sar_num, sar_den, 0); + } else { + sar_num = 0; + sar_den = 0; + } + if (osys->sar.num != sar_num || osys->sar.den != sar_den) { osys->ch_sar = true; osys->sar.num = sar_num; @@ -1005,26 +1185,29 @@ void vout_SetDisplayAspect(vout_display_t *vd, unsigned sar_num, unsigned sar_de } void vout_SetDisplayCrop(vout_display_t *vd, unsigned crop_num, unsigned crop_den, - unsigned x, unsigned y, unsigned width, unsigned height) + unsigned left, unsigned top, int right, int bottom) { vout_display_owner_sys_t *osys = vd->owner.sys; - if (osys->crop.x != x || osys->crop.y != y || - osys->crop.width != width || osys->crop.height != height) { + if (osys->crop.left != (int)left || osys->crop.top != (int)top || + osys->crop.right != right || osys->crop.bottom != bottom || + (crop_num > 0 && crop_den > 0 && + (crop_num != osys->crop.num || crop_den != osys->crop.den))) { - osys->crop.x = x; - osys->crop.y = y; - osys->crop.width = width; - osys->crop.height = height; + osys->crop.left = left; + osys->crop.top = top; + osys->crop.right = right; + osys->crop.bottom = bottom; osys->crop.num = crop_num; osys->crop.den = crop_den; osys->ch_crop = true; } } -vout_opengl_t *vout_GetDisplayOpengl(vout_display_t *vd) + +struct vlc_gl_t *vout_GetDisplayOpengl(vout_display_t *vd) { - vout_opengl_t *gl; + struct vlc_gl_t *gl; if (vout_display_Control(vd, VOUT_DISPLAY_GET_OPENGL, &gl)) return NULL; return gl; @@ -1044,8 +1227,7 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, vout_display_cfg_t *cfg = &osys->cfg; *cfg = state->cfg; - osys->wm_state_initial = state->is_on_top - ? VOUT_WINDOW_STATE_ABOVE : VOUT_WINDOW_STATE_NORMAL; + osys->wm_state_initial = -1; osys->sar_initial.num = state->sar.num; osys->sar_initial.den = state->sar.den; vout_display_GetDefaultDisplaySize(&cfg->display.width, &cfg->display.height, @@ -1062,33 +1244,38 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, osys->mouse.double_click_timeout = double_click_timeout; osys->mouse.hide_timeout = hide_timeout; osys->is_fullscreen = cfg->is_fullscreen; - osys->width_saved = osys->display_width = cfg->display.width; - osys->height_saved = osys->display_height = cfg->display.height; osys->is_display_filled = cfg->is_display_filled; + osys->width_saved = cfg->display.width; + osys->height_saved = cfg->display.height; + if (osys->is_fullscreen) { + vout_display_cfg_t cfg_windowed = *cfg; + cfg_windowed.is_fullscreen = false; + cfg_windowed.display.width = 0; + cfg_windowed.display.height = 0; + vout_display_GetDefaultDisplaySize(&osys->width_saved, + &osys->height_saved, + source_org, &cfg_windowed); + } osys->zoom.num = cfg->zoom.num; osys->zoom.den = cfg->zoom.den; + osys->wm_state = state->wm_state; + osys->fit_window = 0; + osys->event.fifo = NULL; osys->source = *source_org; - - video_format_t source = *source_org; - - source.i_x_offset = - osys->crop.x = 0; - source.i_y_offset = - osys->crop.y = 0; - source.i_visible_width = - osys->crop.width = source.i_width; - source.i_visible_height = - osys->crop.height = source.i_height; + osys->crop.left = 0; + osys->crop.top = 0; + osys->crop.right = 0; + osys->crop.bottom = 0; osys->crop_saved.num = 0; osys->crop_saved.den = 0; osys->crop.num = 0; osys->crop.den = 0; - osys->sar.num = osys->sar_initial.num ? osys->sar_initial.num : source.i_sar_num; - osys->sar.den = osys->sar_initial.den ? osys->sar_initial.den : source.i_sar_den; + osys->sar.num = osys->sar_initial.num ? osys->sar_initial.num : source_org->i_sar_num; + osys->sar.den = osys->sar_initial.den ? osys->sar_initial.den : source_org->i_sar_den; #ifdef ALLOW_DUMMY_VOUT vlc_mouse_Init(&osys->vout_mouse); #endif @@ -1104,6 +1291,13 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, owner.sys = osys; /* */ + video_format_t source = *source_org; + + source.i_x_offset = 0; + source.i_y_offset = 0; + source.i_visible_width = source.i_width; + source.i_visible_height = source.i_height; + vout_display_t *p_display = vout_display_New(VLC_OBJECT(vout), module, !is_wrapper, &source, cfg, &owner); @@ -1115,15 +1309,15 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, VoutDisplayCreateRender(p_display); /* Setup delayed request */ - if (osys->sar.num != source_org->i_sar_num || - osys->sar.den != source_org->i_sar_den) + if (osys->sar.num != source.i_sar_num || + osys->sar.den != source.i_sar_den) osys->ch_sar = true; - if (osys->wm_state != VOUT_WINDOW_STATE_NORMAL) + if (osys->wm_state != osys->wm_state_initial) osys->ch_wm_state = true; - if (osys->crop.x != source_org->i_x_offset || - osys->crop.y != source_org->i_y_offset || - osys->crop.width != source_org->i_visible_width || - osys->crop.height != source_org->i_visible_height) + if (source.i_x_offset != source_org->i_x_offset || + source.i_y_offset != source_org->i_y_offset || + source.i_visible_width != source_org->i_visible_width || + source.i_visible_height != source_org->i_visible_height) osys->ch_crop = true; return p_display; @@ -1136,15 +1330,20 @@ void vout_DeleteDisplay(vout_display_t *vd, vout_display_state_t *state) if (state) { if (!osys->is_wrapper ) state->cfg = osys->cfg; - state->is_on_top = (osys->wm_state & VOUT_WINDOW_STATE_ABOVE) != 0; - state->sar.num = osys->sar_initial.num; - state->sar.den = osys->sar_initial.den; + state->wm_state = osys->wm_state; + state->sar.num = osys->sar_initial.num; + state->sar.den = osys->sar_initial.den; } VoutDisplayDestroyRender(vd); if (osys->is_wrapper) SplitterClose(vd); vout_display_Delete(vd); + if (osys->event.fifo) { + vlc_cancel(osys->event.thread); + vlc_join(osys->event.thread, NULL); + block_FifoRelease(osys->event.fifo); + } vlc_mutex_destroy(&osys->lock); free(osys); } @@ -1163,17 +1362,11 @@ vout_display_t *vout_NewDisplay(vout_thread_t *vout, double_click_timeout, hide_timeout, NULL); } -static void SplitterClose(vout_display_t *vd) -{ - VLC_UNUSED(vd); - assert(0); -} - -#if 0 /***************************************************************************** * *****************************************************************************/ struct vout_display_sys_t { + picture_pool_t *pool; video_splitter_t *splitter; /* */ @@ -1204,7 +1397,7 @@ static void SplitterDelWindow(vout_display_t *vd, vout_window_t *window) } static void SplitterEvent(vout_display_t *vd, int event, va_list args) { - vout_display_owner_sys_t *osys = vd->owner.sys; + //vout_display_owner_sys_t *osys = vd->owner.sys; switch (event) { #if 0 @@ -1225,21 +1418,26 @@ static void SplitterEvent(vout_display_t *vd, int event, va_list args) break; default: - msg_Err(vd, "SplitterEvent TODO"); + msg_Err(vd, "splitter event not implemented: %d", event); break; } } -static picture_t *SplitterGet(vout_display_t *vd) +static picture_pool_t *SplitterPool(vout_display_t *vd, unsigned count) { - /* TODO pool ? */ - return picture_NewFromFormat(&vd->fmt); + vout_display_sys_t *sys = vd->sys; + if (!sys->pool) + sys->pool = picture_pool_NewFromFormat(&vd->fmt, count); + return sys->pool; } -static void SplitterPrepare(vout_display_t *vd, picture_t *picture) +static void SplitterPrepare(vout_display_t *vd, + picture_t *picture, + subpicture_t *subpicture) { vout_display_sys_t *sys = vd->sys; picture_Hold(picture); + assert(!subpicture); if (video_splitter_Filter(sys->splitter, sys->picture, picture)) { for (int i = 0; i < sys->count; i++) @@ -1249,41 +1447,28 @@ static void SplitterPrepare(vout_display_t *vd, picture_t *picture) } for (int i = 0; i < sys->count; i++) { - /* */ - /* FIXME now vout_FilterDisplay already return a direct buffer FIXME */ - sys->picture[i] = vout_FilterDisplay(sys->display[i], sys->picture[i]); - if (!sys->picture[i]) - continue; - - /* */ - picture_t *direct = vout_display_Get(sys->display[i]); - if (!direct) { - msg_Err(vd, "Failed to get a direct buffer"); - picture_Release(sys->picture[i]); - sys->picture[i] = NULL; - continue; - } - - /* FIXME not always needed (easy when there is a osys->filters) */ - picture_Copy(direct, sys->picture[i]); - picture_Release(sys->picture[i]); - sys->picture[i] = direct; - - vout_display_Prepare(sys->display[i], sys->picture[i]); + if (vout_IsDisplayFiltered(sys->display[i])) + sys->picture[i] = vout_FilterDisplay(sys->display[i], sys->picture[i]); + if (sys->picture[i]) + vout_display_Prepare(sys->display[i], sys->picture[i], NULL); } } -static void SplitterDisplay(vout_display_t *vd, picture_t *picture) +static void SplitterDisplay(vout_display_t *vd, + picture_t *picture, + subpicture_t *subpicture) { vout_display_sys_t *sys = vd->sys; + assert(!subpicture); for (int i = 0; i < sys->count; i++) { if (sys->picture[i]) - vout_display_Display(sys->display[i], sys->picture[i]); + vout_display_Display(sys->display[i], sys->picture[i], NULL); } picture_Release(picture); } static int SplitterControl(vout_display_t *vd, int query, va_list args) { + (void)vd; (void)query; (void)args; return VLC_EGENERIC; } static void SplitterManage(vout_display_t *vd) @@ -1291,7 +1476,7 @@ static void SplitterManage(vout_display_t *vd) vout_display_sys_t *sys = vd->sys; for (int i = 0; i < sys->count; i++) - vout_ManageDisplay(sys->display[i]); + vout_ManageDisplay(sys->display[i], true); } static int SplitterPictureNew(video_splitter_t *splitter, picture_t *picture[]) @@ -1299,8 +1484,13 @@ static int SplitterPictureNew(video_splitter_t *splitter, picture_t *picture[]) vout_display_sys_t *wsys = splitter->p_owner->wrapper->sys; for (int i = 0; i < wsys->count; i++) { - /* TODO pool ? */ - picture[i] = picture_NewFromFormat(&wsys->display[i]->source); + if (vout_IsDisplayFiltered(wsys->display[i])) { + /* TODO use a pool ? */ + picture[i] = picture_NewFromFormat(&wsys->display[i]->source); + } else { + picture_pool_t *pool = vout_display_Pool(wsys->display[i], 1); + picture[i] = pool ? picture_pool_Get(pool) : NULL; + } if (!picture[i]) { for (int j = 0; j < i; j++) picture_Release(picture[j]); @@ -1325,6 +1515,9 @@ static void SplitterClose(vout_display_t *vd) free(splitter->p_owner); video_splitter_Delete(splitter); + if (sys->pool) + picture_pool_Delete(sys->pool); + /* */ for (int i = 0; i < sys->count; i++) vout_DeleteDisplay(sys->display[i], NULL); @@ -1362,8 +1555,9 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, if (!sys->picture ) abort(); sys->splitter = splitter; + sys->pool = NULL; - wrapper->get = SplitterGet; + wrapper->pool = SplitterPool; wrapper->prepare = SplitterPrepare; wrapper->display = SplitterDisplay; wrapper->control = SplitterControl; @@ -1413,7 +1607,6 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, return wrapper; } -#endif /***************************************************************************** * TODO move out @@ -1421,20 +1614,26 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, #include "vout_internal.h" void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m) { + vlc_mouse_t tmp1, tmp2; + + /* The check on spu is needed as long as ALLOW_DUMMY_VOUT is defined */ + if (vout->p->spu && spu_ProcessMouse( vout->p->spu, m, &vout->p->display.vd->source)) + return; + + vlc_mutex_lock( &vout->p->filter.lock ); + if (vout->p->filter.chain_static && vout->p->filter.chain_interactive) { + if (!filter_chain_MouseFilter(vout->p->filter.chain_interactive, &tmp1, m)) + m = &tmp1; + if (!filter_chain_MouseFilter(vout->p->filter.chain_static, &tmp2, m)) + m = &tmp2; + } + vlc_mutex_unlock( &vout->p->filter.lock ); + if (vlc_mouse_HasMoved(&vout->p->mouse, m)) { vout_SendEventMouseMoved(vout, m->i_x, m->i_y); } if (vlc_mouse_HasButton(&vout->p->mouse, m)) { - static const int buttons[] = { - MOUSE_BUTTON_LEFT, - MOUSE_BUTTON_CENTER, - MOUSE_BUTTON_RIGHT, - MOUSE_BUTTON_WHEEL_UP, - MOUSE_BUTTON_WHEEL_DOWN, - -1 - }; - for (int i = 0; buttons[i] >= 0; i++) { - const int button = buttons[i]; + for (unsigned button = 0; button < MOUSE_BUTTON_MAX; button++) { if (vlc_mouse_HasPressed(&vout->p->mouse, m, button)) vout_SendEventMousePressed(vout, button); else if (vlc_mouse_HasReleased(&vout->p->mouse, m, button)) @@ -1452,29 +1651,18 @@ static void DummyVoutSendDisplayEventMouse(vout_thread_t *vout, vlc_mouse_t *fal if (!vout->p) { p.mouse = *fallback; + vlc_mutex_init(&p.filter.lock); + p.filter.chain_static = NULL; + p.filter.chain_interactive = NULL; + p.spu = NULL; vout->p = &p; } vout_SendDisplayEventMouse(vout, m); if (vout->p == &p) { + vlc_mutex_destroy(&p.filter.lock); *fallback = p.mouse; vout->p = NULL; } } #endif -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; - - return vout_window_New(VLC_OBJECT(vout), NULL, &cfg_override); -} -void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd, vout_window_t *window) -{ - VLC_UNUSED(vout); - VLC_UNUSED(vd); - vout_window_Delete(window); -}