#include "vout_internal.h"
#include "display.h"
-/* Minimum number of direct pictures the video output will accept without
- * creating additional pictures in system memory */
-#ifdef OPTIMIZE_MEMORY
-# define VOUT_MIN_DIRECT_PICTURES (VOUT_MAX_PICTURES/2)
-#else
-# define VOUT_MIN_DIRECT_PICTURES (3*VOUT_MAX_PICTURES/4)
-#endif
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void VoutGetDisplayCfg(vout_thread_t *,
- vout_display_cfg_t *, const char *title);
#ifdef WIN32
static int Forward(vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void *);
/*****************************************************************************
*
*****************************************************************************/
-int vout_OpenWrapper(vout_thread_t *vout, const char *name)
+int vout_OpenWrapper(vout_thread_t *vout,
+ const char *name, const vout_display_state_t *state)
{
vout_thread_sys_t *sys = vout->p;
msg_Dbg(vout, "Opening vout display wrapper");
sys->display.title = var_CreateGetNonEmptyString(vout, "video-title");
/* */
- video_format_t source = vout->fmt_render;
+ video_format_t source = vout->p->original;
source.i_visible_width = source.i_width;
source.i_visible_height = source.i_height;
source.i_x_offset = 0;
source.i_y_offset = 0;
- vout_display_state_t state;
- VoutGetDisplayCfg(vout, &state.cfg, sys->display.title);
- state.is_on_top = var_CreateGetBool(vout, "video-on-top");
- state.sar.num = 0;
- state.sar.den = 0;
-
const mtime_t double_click_timeout = 300000;
const mtime_t hide_timeout = var_CreateGetInteger(vout, "mouse-hide-timeout") * 1000;
- sys->display.vd = vout_NewDisplay(vout, &source, &state, name ? name : "$vout",
+ sys->display.vd = vout_NewDisplay(vout, &source, state, name ? name : "$vout",
double_click_timeout, hide_timeout);
/* If we need to video filter and it fails, then try a splitter
* XXX it is a hack for now FIXME */
if (name && !sys->display.vd)
- sys->display.vd = vout_NewSplitter(vout, &source, &state, "$vout", name,
+ sys->display.vd = vout_NewSplitter(vout, &source, state, "$vout", name,
double_click_timeout, hide_timeout);
if (!sys->display.vd) {
free(sys->display.title);
/*****************************************************************************
*
*****************************************************************************/
-void vout_CloseWrapper(vout_thread_t *vout)
+void vout_CloseWrapper(vout_thread_t *vout, vout_display_state_t *state)
{
vout_thread_sys_t *sys = vout->p;
#endif
sys->decoder_pool = NULL; /* FIXME remove */
- vout_DeleteDisplay(sys->display.vd, NULL);
+ vout_DeleteDisplay(sys->display.vd, state);
free(sys->display.title);
}
{
vout_thread_sys_t *sys = vout->p;
vout_display_t *vd = sys->display.vd;
-
- /* */
video_format_t source = vd->source;
- vout->fmt_out.i_chroma = source.i_chroma;
- vout->fmt_out.i_width =
- vout->fmt_out.i_visible_width = source.i_width;
- vout->fmt_out.i_height =
- vout->fmt_out.i_visible_height = source.i_height;
- if (source.i_sar_num > 0 && source.i_sar_den > 0) {
- vlc_ureduce(&vout->fmt_out.i_sar_num, &vout->fmt_out.i_sar_den,
- source.i_sar_num, source.i_sar_den, 0);
- } else {
- vout->fmt_out.i_sar_num = 1;
- vout->fmt_out.i_sar_den = 1;
- }
- vout->fmt_out.i_sar_num = source.i_sar_num;
- vout->fmt_out.i_sar_den = source.i_sar_den;
- vout->fmt_out.i_x_offset = 0;
- vout->fmt_out.i_y_offset = 0;
- vout->fmt_out.i_rmask = source.i_rmask;
- vout->fmt_out.i_gmask = source.i_gmask;
- vout->fmt_out.i_bmask = source.i_bmask;
- video_format_FixRgb(&vout->fmt_out);
-
- if (vout->fmt_in.i_visible_width != source.i_visible_width ||
- vout->fmt_in.i_visible_height != source.i_visible_height ||
- vout->fmt_in.i_x_offset != source.i_x_offset ||
- vout->fmt_in.i_y_offset != source.i_y_offset )
- sys->i_changes |= VOUT_CROP_CHANGE;
-
- /* XXX For non dr case, the current vout implementation force us to
- * create at most 1 direct picture (otherwise the buffers will be kept
- * referenced even through the Init/End.
- */
sys->display.use_dr = !vout_IsDisplayFiltered(vd);
const bool allow_dr = !vd->info.has_pictures_invalid && sys->display.use_dr;
-
- picture_pool_t *display_pool = vout_display_Pool(vd, allow_dr ? VOUT_MAX_PICTURES : 3);
- if (allow_dr && picture_pool_GetSize(display_pool) >= VOUT_MIN_DIRECT_PICTURES) {
+ const unsigned private_picture = 3; /* XXX 2 for filter, 1 for SPU */
+ const unsigned display_picture = 1; /* Minimum number of display picture */
+ const unsigned decoder_picture = 1 + sys->dpb_size;
+ const unsigned kept_picture = 1; /* last displayed picture */
+ const unsigned reserved_picture = display_picture +
+ private_picture +
+ kept_picture;
+ picture_pool_t *display_pool =
+ vout_display_Pool(vd, allow_dr ? __MAX(VOUT_MAX_PICTURES,
+ reserved_picture + decoder_picture) : 3);
+ if (allow_dr &&
+ picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) {
+ sys->dpb_size = picture_pool_GetSize(display_pool) - reserved_picture;
sys->decoder_pool = display_pool;
sys->display_pool = display_pool;
sys->is_decoder_pool_slow = vd->info.is_slow;
} else if (!sys->decoder_pool) {
- sys->decoder_pool = picture_pool_NewFromFormat(&source, VOUT_MAX_PICTURES);
+ sys->decoder_pool =
+ picture_pool_NewFromFormat(&source,
+ __MAX(VOUT_MAX_PICTURES,
+ reserved_picture + decoder_picture));
+ if (allow_dr) {
+ msg_Warn(vout, "Not enough direct buffers, using system memory");
+ sys->dpb_size = 0;
+ } else {
+ sys->dpb_size = picture_pool_GetSize(sys->decoder_pool) - reserved_picture;
+ }
if (sys->display.use_dr)
sys->display_pool = display_pool;
else
- sys->display_pool = picture_pool_Reserve(sys->decoder_pool, 1);;
+ sys->display_pool = picture_pool_Reserve(sys->decoder_pool, display_picture);
sys->is_decoder_pool_slow = false;
}
- sys->private_pool = picture_pool_Reserve(sys->decoder_pool, 3); /* XXX 2 for filter, 1 for SPU */
+ sys->private_pool = picture_pool_Reserve(sys->decoder_pool, private_picture);
sys->display.filtered = NULL;
return VLC_SUCCESS;
}
/*****************************************************************************
*
*****************************************************************************/
-int vout_ManageWrapper(vout_thread_t *vout)
+void vout_ManageWrapper(vout_thread_t *vout)
{
vout_thread_sys_t *sys = vout->p;
vout_display_t *vd = sys->display.vd;
- while (sys->i_changes & (VOUT_ASPECT_CHANGE |
- VOUT_CROP_CHANGE)) {
- /* */
- if (sys->i_changes & VOUT_ASPECT_CHANGE) {
- vout->fmt_out.i_sar_num = vout->fmt_in.i_sar_num;
- vout->fmt_out.i_sar_den = vout->fmt_in.i_sar_den;
-
- vout_SetDisplayAspect(vd, vout->fmt_in.i_sar_num, vout->fmt_in.i_sar_den);
-
- sys->i_changes &= ~VOUT_ASPECT_CHANGE;
- }
- if (sys->i_changes & VOUT_CROP_CHANGE) {
- const video_format_t crop = vout->fmt_in;
- const video_format_t org = vout->fmt_render;
- /* FIXME because of rounding errors, the reconstructed ratio is wrong */
- unsigned num = 0;
- unsigned den = 0;
- if (crop.i_x_offset == org.i_x_offset &&
- crop.i_visible_width == org.i_visible_width &&
- crop.i_y_offset == org.i_y_offset + (org.i_visible_height - crop.i_visible_height)/2) {
- vlc_ureduce(&num, &den,
- crop.i_visible_width * crop.i_sar_num,
- crop.i_visible_height * crop.i_sar_den, 0);
- } else if (crop.i_y_offset == org.i_y_offset &&
- crop.i_visible_height == org.i_visible_height &&
- crop.i_x_offset == org.i_x_offset + (org.i_visible_width - crop.i_visible_width)/2) {
- vlc_ureduce(&num, &den,
- crop.i_visible_width * crop.i_sar_num,
- crop.i_visible_height * crop.i_sar_den, 0);
- }
- vout_SetDisplayCrop(vd, num, den,
- crop.i_x_offset, crop.i_y_offset,
- crop.i_visible_width, crop.i_visible_height);
- sys->i_changes &= ~VOUT_CROP_CHANGE;
- }
-
- }
-
bool reset_display_pool = sys->display.use_dr && vout_AreDisplayPicturesInvalid(vd);
vout_ManageDisplay(vd, !sys->display.use_dr || reset_display_pool);
if (reset_display_pool)
sys->display_pool = vout_display_Pool(vd, 3);
-
- return VLC_SUCCESS;
}
/*****************************************************************************
sys->display.filtered = NULL;
}
-static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
-{
- /* Load configuration */
- cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen");
- cfg->display.title = title;
- const int display_width = var_CreateGetInteger(vout, "width");
- const int display_height = var_CreateGetInteger(vout, "height");
- cfg->display.width = display_width > 0 ? display_width : 0;
- cfg->display.height = display_height > 0 ? display_height : 0;
- cfg->is_display_filled = var_CreateGetBool(vout, "autoscale");
- cfg->display.sar.num = 1; /* TODO monitor AR */
- cfg->display.sar.den = 1;
- unsigned zoom_den = 1000;
- unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
- vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
- cfg->zoom.num = zoom_num;
- cfg->zoom.den = zoom_den;
- cfg->align.vertical = VOUT_DISPLAY_ALIGN_CENTER;
- cfg->align.horizontal = VOUT_DISPLAY_ALIGN_CENTER;
- const int align_mask = var_CreateGetInteger(vout, "align");
- if (align_mask & 0x1)
- cfg->align.horizontal = VOUT_DISPLAY_ALIGN_LEFT;
- else if (align_mask & 0x2)
- cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT;
- if (align_mask & 0x4)
- cfg->align.horizontal = VOUT_DISPLAY_ALIGN_TOP;
- else if (align_mask & 0x8)
- cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM;
-}
-
#ifdef WIN32
static int Forward(vlc_object_t *object, char const *var,
vlc_value_t oldval, vlc_value_t newval, void *data)
projects / vlc / blobdiff