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);
static int FilterAllocationInit(filter_t *filter, void *vd)
{
- filter->pf_vout_buffer_new = VideoBufferNew;
- filter->pf_vout_buffer_del = VideoBufferDelete;
- filter->p_owner = vd;
+ filter->pf_video_buffer_new = VideoBufferNew;
+ filter->pf_video_buffer_del = VideoBufferDelete;
+ filter->p_owner = vd;
return VLC_SUCCESS;
}
static void FilterAllocationClean(filter_t *filter)
{
- filter->pf_vout_buffer_new = NULL;
- filter->pf_vout_buffer_del = NULL;
- filter->p_owner = NULL;
+ filter->pf_video_buffer_new = NULL;
+ filter->pf_video_buffer_del = NULL;
+ filter->p_owner = NULL;
}
/*****************************************************************************
if (load_module) {
vd->module = module_need(vd, "vout display", module, module && *module != '\0');
if (!vd->module) {
- vlc_object_detach(vd);
vlc_object_release(vd);
return NULL;
}
*/
static void vout_display_Delete(vout_display_t *vd)
{
- vlc_object_detach(vd);
-
if (vd->module)
module_unneed(vd, vd->module);
return;
/* */
- unsigned width;
- unsigned height;
unsigned display_width;
unsigned display_height;
if (cfg->is_display_filled) {
- width = source->i_visible_width;
- height = source->i_visible_height;
display_width = cfg->display.width;
display_height = cfg->display.height;
} else {
cfg_tmp.display.width = 0;
cfg_tmp.display.height = 0;
- vout_display_GetDefaultDisplaySize(&width, &height,
+ vout_display_GetDefaultDisplaySize(&display_width, &display_height,
source, &cfg_tmp);
- display_width = width;
- display_height = height;
if (do_clipping) {
display_width = __MIN(display_width, cfg->display.width);
display_height = __MIN(display_height, cfg->display.height);
}
}
+ const unsigned width = source->i_visible_width;
+ const unsigned height = source->i_visible_height;
/* Compute the height if we use the width to fill up display_width */
const int64_t scaled_height = (int64_t)height * display_width * cfg->display.sar.num * source->i_sar_den / width / source->i_sar_num / cfg->display.sar.den;
/* And the same but switching width/height */
bool display_is_fullscreen;
bool display_is_forced;
+ int fit_window;
+
#ifdef ALLOW_DUMMY_VOUT
vlc_mouse_t vout_mouse;
#endif
if (!convert)
return;
- msg_Err(vd, "A filter to adapt decoder to display is needed");
+ msg_Dbg(vd, "A filter to adapt decoder to display is needed");
osys->filters = filter_chain_New(vd, "video filter2", false,
FilterAllocationInit,
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 VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
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);
+}
+
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) {
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;
/* 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->zoom.num != num || osys->zoom.den != den) {
+ if (osys->is_display_filled ||
+ osys->zoom.num != num || osys->zoom.den != den) {
osys->ch_zoom = true;
osys->zoom.num = num;
osys->zoom.den = den;
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 = VOUT_WINDOW_STATE_NORMAL;
osys->sar_initial.num = state->sar.num;
osys->sar_initial.den = state->sar.den;
vout_display_GetDefaultDisplaySize(&cfg->display.width, &cfg->display.height,
osys->is_display_filled = cfg->is_display_filled;
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->fit_window = 0;
osys->source = *source_org;
if (osys->sar.num != source_org->i_sar_num ||
osys->sar.den != source_org->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 ||
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;
/* */
}
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
}
}
-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)
{
}
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]);
}
}
static void SplitterDisplay(vout_display_t *vd, picture_t *picture)
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[])
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]);
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);
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;
return wrapper;
}
-#endif
/*****************************************************************************
* TODO move out
#include "vout_internal.h"
void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m)
{
+ 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->vfilter_chain) {
+ if (!filter_chain_MouseFilter(vout->p->vfilter_chain, &tmp, m))
+ m = &tmp;
+ }
+ vlc_mutex_unlock( &vout->p->vfilter_lock );
+
if (vlc_mouse_HasMoved(&vout->p->mouse, m)) {
vout_SendEventMouseMoved(vout, m->i_x, m->i_y);
}
if (!vout->p) {
p.mouse = *fallback;
+ vlc_mutex_init(&p.vfilter_lock);
+ p.vfilter_chain = NULL;
+ p.p_spu = NULL;
vout->p = &p;
}
vout_SendDisplayEventMouse(vout, m);
if (vout->p == &p) {
+ vlc_mutex_destroy(&p.vfilter_lock);
*fallback = p.mouse;
vout->p = NULL;
}
projects / vlc / blobdiff