#include <vlc_video_splitter.h>
#include <vlc_vout_display.h>
#include <vlc_vout.h>
+#include <vlc_block.h>
#include <libvlc.h>
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->cfg = cfg;
vd->pool = NULL;
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;
}
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;
}
}
} sar_initial;
/* */
- int width_saved;
- int height_saved;
+ unsigned width_saved;
+ unsigned height_saved;
struct {
unsigned num;
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
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:
if (!vd->info.has_hide_mouse)
osys->mouse.last_moved = mdate();
- /* */
- vlc_mutex_unlock(&osys->lock);
-
/* */
vout_SendEventMouseVisible(osys->vout);
#ifdef ALLOW_DUMMY_VOUT
#else
vout_SendDisplayEventMouse(osys->vout, &m);
#endif
+ vlc_mutex_unlock(&osys->lock);
+}
+
+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)
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:
{
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), NULL, &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(unsigned *x, unsigned *y,
+ unsigned *width, unsigned *height,
+ 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) {
+ *x = (source->i_visible_width - scaled_width) / 2;
+ *y = 0;
+ *width = scaled_width;
+ *height = source->i_visible_height;
+ } else {
+ *x = 0;
+ *y = (source->i_visible_height - scaled_height) / 2;
+ *width = source->i_visible_width;
+ *height = scaled_height;
+ }
+ *x += source->i_x_offset;
+ *y += source->i_y_offset;
+}
+
void vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
{
vout_display_owner_sys_t *osys = vd->owner.sys;
!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) {
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;
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;
*/
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;
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;
+ 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.x, &osys->crop.y,
+ &osys->crop.width, &osys->crop.height,
+ &fmt, crop_num, crop_den);
+ }
source.i_x_offset = osys->crop.x;
source.i_y_offset = osys->crop.y;
/* 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;
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) {
+ osys->crop.width != width || osys->crop.height != height ||
+ (crop_num > 0 && crop_den > 0 &&
+ (crop_num != osys->crop.num || crop_den != osys->crop.den))) {
osys->crop.x = x;
osys->crop.y = y;
vout_display_cfg_t *cfg = &osys->cfg;
*cfg = state->cfg;
- osys->wm_state_initial = 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,
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->is_on_top ? VOUT_WINDOW_STATE_ABOVE
- : VOUT_WINDOW_STATE_NORMAL;
+ osys->wm_state = state->wm_state;
+ osys->fit_window = 0;
+ osys->event.fifo = NULL;
osys->source = *source_org;
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);
}
{
vlc_mouse_t tmp;
+ /* The check on p_spu is needed as long as ALLOW_DUMMY_VOUT is defined */
+ if (vout->p->p_spu && spu_ProcessMouse( vout->p->p_spu, m, &vout->p->display.vd->source))
+ return;
+
vlc_mutex_lock( &vout->p->vfilter_lock );
- if (vout->p->p_vf2_chain) {
- if (!filter_chain_MouseFilter(vout->p->p_vf2_chain, &tmp, m))
+ if (vout->p->vfilter_chain) {
+ if (!filter_chain_MouseFilter(vout->p->vfilter_chain, &tmp, m))
m = &tmp;
}
vlc_mutex_unlock( &vout->p->vfilter_lock );
if (!vout->p) {
p.mouse = *fallback;
vlc_mutex_init(&p.vfilter_lock);
- p.p_vf2_chain = NULL;
+ p.vfilter_chain = NULL;
+ p.p_spu = NULL;
vout->p = &p;
}
vout_SendDisplayEventMouse(vout, m);
}
}
#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);
-}
projects / vlc / blobdiff