#include <stdio.h>
#include <stdlib.h> /* free() */
#include <sys/types.h> /* opendir() */
-#include <sys/stat.h>
#include <dirent.h> /* opendir() */
#include <assert.h>
#include <time.h> /* strftime */
#include <vlc_interface.h>
#include <vlc_block.h>
#include <vlc_playlist.h>
+#include <vlc_modules.h>
#include <vlc_vout.h>
#include <vlc_image.h>
-#include <vlc_osd.h>
-#include <vlc_charset.h>
-
+#include <vlc_vout_osd.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
#include "../libvlc.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void InitWindowSize( vout_thread_t *, unsigned *, unsigned * );
-
/* Object variables callbacks */
static int ZoomCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int CropCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int CropBorderCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
static int AspectCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int ScalingCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int SnapshotCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-
+static int VideoFilterCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int VideoSplitterCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int SubFilterCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int SubMarginCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
static int TitleShowCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int TitleTimeoutCallback( vlc_object_t *, char const *,
{ "16:9", "16:9" },
{ "16:10", "16:10" },
{ "221:100", "2.21:1" },
+ { "235:100", "2.35:1" },
+ { "239:100", "2.39:1" },
{ "5:4", "5:4" },
{ NULL, NULL } };
static void AddCustomRatios( vout_thread_t *p_vout, const char *psz_var,
char *psz_list )
{
- if( psz_list && *psz_list )
+ assert( psz_list );
+
+ char *psz_cur = psz_list;
+ char *psz_next;
+ while( psz_cur && *psz_cur )
{
- char *psz_cur = psz_list;
- char *psz_next;
- while( psz_cur && *psz_cur )
+ vlc_value_t val, text;
+ psz_next = strchr( psz_cur, ',' );
+ if( psz_next )
{
- vlc_value_t val, text;
- psz_next = strchr( psz_cur, ',' );
- if( psz_next )
- {
- *psz_next = '\0';
- psz_next++;
- }
- val.psz_string = psz_cur;
- text.psz_string = psz_cur;
- var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text);
- psz_cur = psz_next;
+ *psz_next = '\0';
+ psz_next++;
}
+ val.psz_string = psz_cur;
+ text.psz_string = psz_cur;
+ var_Change( p_vout, psz_var, VLC_VAR_ADDCHOICE, &val, &text);
+ psz_cur = psz_next;
}
}
var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- p_vout->i_alignment = var_CreateGetInteger( p_vout, "align" );
+ var_Create( p_vout, "align", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "mouse-hide-timeout",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- p_vout->p->b_title_show = var_CreateGetBool( p_vout, "video-title-show" );
- p_vout->p->i_title_timeout =
- (mtime_t)var_CreateGetInteger( p_vout, "video-title-timeout" );
- p_vout->p->i_title_position =
- var_CreateGetInteger( p_vout, "video-title-position" );
- p_vout->p->psz_title = NULL;
-
+ p_vout->p->title.show = var_CreateGetBool( p_vout, "video-title-show" );
+ p_vout->p->title.timeout = var_CreateGetInteger( p_vout,
+ "video-title-timeout" );
+ p_vout->p->title.position = var_CreateGetInteger( p_vout,
+ "video-title-position" );
var_AddCallback( p_vout, "video-title-show", TitleShowCallback, NULL );
var_AddCallback( p_vout, "video-title-timeout", TitleTimeoutCallback, NULL );
var_AddCallback( p_vout, "video-title-position", TitlePositionCallback, NULL );
var_Create( p_vout, "crop-right", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
var_Create( p_vout, "crop-bottom", VLC_VAR_INTEGER | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_vout, "crop-left", CropCallback, NULL );
- var_AddCallback( p_vout, "crop-top", CropCallback, NULL );
- var_AddCallback( p_vout, "crop-right", CropCallback, NULL );
- var_AddCallback( p_vout, "crop-bottom", CropCallback, NULL );
+ var_AddCallback( p_vout, "crop-left", CropBorderCallback, NULL );
+ var_AddCallback( p_vout, "crop-top", CropBorderCallback, NULL );
+ var_AddCallback( p_vout, "crop-right", CropBorderCallback, NULL );
+ var_AddCallback( p_vout, "crop-bottom", CropBorderCallback, NULL );
/* Crop object var */
var_Create( p_vout, "crop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
}
- /* update triggered every time the vout's crop parameters are changed */
- var_Create( p_vout, "crop-update", VLC_VAR_VOID );
-
/* Add custom crop ratios */
- psz_buf = config_GetPsz( p_vout, "custom-crop-ratios" );
- AddCustomRatios( p_vout, "crop", psz_buf );
- free( psz_buf );
+ psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-crop-ratios" );
+ if( psz_buf )
+ {
+ AddCustomRatios( p_vout, "crop", psz_buf );
+ free( psz_buf );
+ }
var_AddCallback( p_vout, "crop", CropCallback, NULL );
var_Get( p_vout, "crop", &old_val );
}
else
{
- i_aspect = atof( val.psz_string );
+ i_aspect = us_atof( val.psz_string );
vlc_ureduce( &i_aspect_num, &i_aspect_den,
i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
}
}
/* Add custom aspect ratios */
- psz_buf = config_GetPsz( p_vout, "custom-aspect-ratios" );
- AddCustomRatios( p_vout, "aspect-ratio", psz_buf );
- free( psz_buf );
+ psz_buf = var_CreateGetNonEmptyString( p_vout, "custom-aspect-ratios" );
+ if( psz_buf )
+ {
+ AddCustomRatios( p_vout, "aspect-ratio", psz_buf );
+ free( psz_buf );
+ }
var_AddCallback( p_vout, "aspect-ratio", AspectCallback, NULL );
var_Get( p_vout, "aspect-ratio", &old_val );
text.psz_string = _("Autoscale video");
var_Change( p_vout, "autoscale", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "autoscale", ScalingCallback, NULL );
- p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
var_Create( p_vout, "scale", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT
| VLC_VAR_ISCOMMAND );
text.psz_string = _("Scale factor");
var_Change( p_vout, "scale", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "scale", ScalingCallback, NULL );
- p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
-
- /* Initialize the dimensions of the video window */
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
/* Add a variable to indicate if the window should be on top of others */
var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT
text.psz_string = _("Always on top");
var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
+ var_TriggerCallback( p_vout, "video-on-top" );
/* Add a variable to indicate whether we want window decoration or not */
var_Create( p_vout, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* Add a fullscreen variable */
- if( var_CreateGetBoolCommand( p_vout, "fullscreen" ) )
- {
- /* user requested fullscreen */
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- }
+ var_Create( p_vout, "fullscreen",
+ VLC_VAR_BOOL | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
text.psz_string = _("Fullscreen");
var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
var_Change( p_vout, "video-snapshot", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "video-snapshot", SnapshotCallback, NULL );
+ /* Add a video-filter variable */
+ var_Create( p_vout, "video-filter",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_vout, "video-filter", VideoFilterCallback, NULL );
+ var_TriggerCallback( p_vout, "video-filter" );
+
+ /* Add a video-splitter variable
+ * TODO rename vout-filter into vout-splitter */
+ var_Create( p_vout, "vout-filter",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Video splitter");
+ var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "vout-filter", VideoSplitterCallback, NULL );
+
+ /* Add a sub-filter variable */
+ var_Create( p_vout, "sub-filter",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_vout, "sub-filter", SubFilterCallback, NULL );
+ var_TriggerCallback( p_vout, "sub-filter" );
+
+ /* Add sub-margin variable */
+ var_Create( p_vout, "sub-margin",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_vout, "sub-margin", SubMarginCallback, NULL );
+ var_TriggerCallback( p_vout, "sub-margin" );
+
/* Mouse coordinates */
- var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
- var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
- var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
-
- var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
- var_SetBool( p_vout, "intf-change", true );
+ var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
+ var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
}
/*****************************************************************************
if( !p_subpic )
return VLC_EGENERIC;
- /* FIXME DEFAULT_CHAN is not good (used by the text) but
+ /* FIXME SPU_DEFAULT_CHANNEL is not good (used by the text) but
* hardcoded 0 doesn't seem right */
p_subpic->i_channel = 0;
p_subpic->i_start = mdate();
p_subpic->i_original_picture_width *= 4;
p_subpic->i_original_picture_height *= 4;
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
+ vout_PutSubpicture( p_vout, p_subpic );
return VLC_SUCCESS;
}
static void VoutOsdSnapshot( vout_thread_t *p_vout, picture_t *p_pic, const char *psz_filename )
{
msg_Dbg( p_vout, "snapshot taken (%s)", psz_filename );
- vout_OSDMessage( VLC_OBJECT( p_vout ), DEFAULT_CHAN, "%s", psz_filename );
+ vout_OSDMessage( p_vout, SPU_DEFAULT_CHANNEL, "%s", psz_filename );
if( var_GetBool( p_vout, "snapshot-preview" ) )
{
}
module_release( p_obj );
- if( !strcmp( psz_filter_type, "sub-filter") )
- psz_string = var_GetString( vout_GetSpu( p_vout ), psz_filter_type );
- else
- psz_string = var_GetString( p_vout, psz_filter_type );
+ psz_string = var_GetString( p_vout, psz_filter_type );
/* Todo : Use some generic chain manipulation functions */
if( !psz_string ) psz_string = strdup("");
if( b_setconfig )
{
- if( !strcmp( psz_filter_type, "sub-filter") )
- config_PutPsz( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
- else
- config_PutPsz( p_vout, psz_filter_type, psz_string );
+ config_PutPsz( p_vout, psz_filter_type, psz_string );
}
- if( !strcmp( psz_filter_type, "sub-filter") )
- var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
- else
- var_SetString( p_vout, psz_filter_type, psz_string );
+ var_SetString( p_vout, psz_filter_type, psz_string );
free( psz_string );
}
/*****************************************************************************
- * InitWindowSize: find the initial dimensions the video window should have.
- *****************************************************************************
- * This function will check the "width", "height" and "zoom" config options and
- * will calculate the size that the video window should have.
+ * Object variables callbacks
*****************************************************************************/
-static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width,
- unsigned *pi_height )
+static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
-#define FP_FACTOR 1000 /* our fixed point factor */
+ (void)psz_cmd; (void)oldval; (void)p_data;
- int i_width = var_GetInteger( p_vout, "width" );
- int i_height = var_GetInteger( p_vout, "height" );
- float f_zoom = var_GetFloat( p_vout, "zoom" );
- uint64_t ll_zoom = (uint64_t)( FP_FACTOR * f_zoom );
+ return var_SetFloat( p_this, "scale", newval.f_float );
+}
- if( i_width > 0 && i_height > 0)
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- }
- else if( i_width > 0 )
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
- p_vout->fmt_in.i_sar_den * i_width / p_vout->fmt_in.i_sar_num /
- FP_FACTOR / p_vout->fmt_in.i_visible_width );
- }
- else if( i_height > 0 )
- {
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
- p_vout->fmt_in.i_sar_num * i_height / p_vout->fmt_in.i_sar_den /
- FP_FACTOR / p_vout->fmt_in.i_visible_height );
- }
- else if( p_vout->fmt_in.i_sar_num == 0 || p_vout->fmt_in.i_sar_den == 0 )
- {
- msg_Warn( p_vout, "aspect ratio screwed up" );
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom /FP_FACTOR);
- }
- else if( p_vout->fmt_in.i_sar_num >= p_vout->fmt_in.i_sar_den )
- {
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom *
- p_vout->fmt_in.i_sar_num / p_vout->fmt_in.i_sar_den / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom
- / FP_FACTOR );
- }
- else
- {
- *pi_width = (int)( p_vout->fmt_in.i_visible_width * ll_zoom
- / FP_FACTOR );
- *pi_height = (int)( p_vout->fmt_in.i_visible_height * ll_zoom *
- p_vout->fmt_in.i_sar_den / p_vout->fmt_in.i_sar_num / FP_FACTOR );
+static int CropCallback( vlc_object_t *object, char const *cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *data )
+{
+ vout_thread_t *vout = (vout_thread_t *)object;
+ VLC_UNUSED(cmd); VLC_UNUSED(oldval); VLC_UNUSED(data);
+ unsigned num, den;
+ unsigned y, x;
+ unsigned width, height;
+ unsigned left, top, right, bottom;
+
+ if (sscanf(newval.psz_string, "%u:%u", &num, &den) == 2) {
+ vout_ControlChangeCropRatio(vout, num, den);
+ } else if (sscanf(newval.psz_string, "%ux%u+%u+%u",
+ &width, &height, &x, &y) == 4) {
+ vout_ControlChangeCropWindow(vout, x, y, width, height);
+ } else if (sscanf(newval.psz_string, "%u+%u+%u+%u",
+ &left, &top, &right, &bottom) == 4) {
+ vout_ControlChangeCropBorder(vout, left, top, right, bottom);
+ } else if (*newval.psz_string == '\0') {
+ vout_ControlChangeCropRatio(vout, 0, 0);
+ } else {
+ msg_Err(object, "Unknown crop format (%s)", newval.psz_string);
}
+ return VLC_SUCCESS;
+}
- msg_Dbg( p_vout, "window size: %ux%u", *pi_width, *pi_height );
-
-#undef FP_FACTOR
+static int CropBorderCallback(vlc_object_t *object, char const *cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *data)
+{
+ vout_thread_t *vout = (vout_thread_t *)object;
+ VLC_UNUSED(cmd); VLC_UNUSED(oldval); VLC_UNUSED(data); VLC_UNUSED(newval);
+
+ vout_ControlChangeCropBorder(vout,
+ var_GetInteger(object, "crop-left"),
+ var_GetInteger(object, "crop-top"),
+ var_GetInteger(object, "crop-right"),
+ var_GetInteger(object, "crop-bottom"));
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * Object variables callbacks
- *****************************************************************************/
-static int ZoomCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int AspectCallback( vlc_object_t *object, char const *cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *data )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
- vout_Control( p_vout, VOUT_SET_SIZE, p_vout->i_window_width,
- p_vout->i_window_height );
+ vout_thread_t *vout = (vout_thread_t *)object;
+ VLC_UNUSED(cmd); VLC_UNUSED(oldval); VLC_UNUSED(data);
+ unsigned num, den;
+
+ if (sscanf(newval.psz_string, "%u:%u", &num, &den) == 2 &&
+ (num > 0) == (den > 0))
+ vout_ControlChangeSampleAspectRatio(vout, num, den);
+ else if (*newval.psz_string == '\0')
+ vout_ControlChangeSampleAspectRatio(vout, 0, 0);
return VLC_SUCCESS;
}
-static int CropCallback( vlc_object_t *p_this, char const *psz_cmd,
+static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- int64_t i_aspect_num, i_aspect_den;
- unsigned int i_width, i_height;
-
- (void)oldval; (void)p_data;
-
- /* Restore defaults */
- p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset;
- p_vout->fmt_in.i_visible_width = p_vout->fmt_render.i_visible_width;
- p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset;
- p_vout->fmt_in.i_visible_height = p_vout->fmt_render.i_visible_height;
-
- if( !strcmp( psz_cmd, "crop" ) )
- {
- char *psz_end = NULL, *psz_parser = strchr( newval.psz_string, ':' );
- if( psz_parser )
- {
- /* We're using the 3:4 syntax */
- i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
- if( psz_end == newval.psz_string || !i_aspect_num ) goto crop_end;
-
- i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
- if( psz_end == psz_parser || !i_aspect_den ) goto crop_end;
-
- i_width = p_vout->fmt_in.i_sar_den*p_vout->fmt_render.i_visible_height *
- i_aspect_num / i_aspect_den / p_vout->fmt_in.i_sar_num;
- i_height = p_vout->fmt_render.i_visible_width*p_vout->fmt_in.i_sar_num *
- i_aspect_den / i_aspect_num / p_vout->fmt_in.i_sar_den;
-
- if( i_width < p_vout->fmt_render.i_visible_width )
- {
- p_vout->fmt_in.i_x_offset = p_vout->fmt_render.i_x_offset +
- (p_vout->fmt_render.i_visible_width - i_width) / 2;
- p_vout->fmt_in.i_visible_width = i_width;
- }
- else
- {
- p_vout->fmt_in.i_y_offset = p_vout->fmt_render.i_y_offset +
- (p_vout->fmt_render.i_visible_height - i_height) / 2;
- p_vout->fmt_in.i_visible_height = i_height;
- }
- }
- else
- {
- psz_parser = strchr( newval.psz_string, 'x' );
- if( psz_parser )
- {
- /* Maybe we're using the <width>x<height>+<left>+<top> syntax */
- unsigned int i_crop_width, i_crop_height, i_crop_top, i_crop_left;
-
- i_crop_width = strtol( newval.psz_string, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_parser = strchr( ++psz_end, '+' );
- i_crop_height = strtol( psz_end, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_parser = strchr( ++psz_end, '+' );
- i_crop_left = strtol( psz_end, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_end++;
- i_crop_top = strtol( psz_end, &psz_end, 10 );
- if( *psz_end != '\0' ) goto crop_end;
-
- if( i_crop_top + i_crop_height >= p_vout->fmt_render.i_visible_height ||
- i_crop_left + i_crop_width >= p_vout->fmt_render.i_visible_width )
- {
- msg_Err( p_vout, "Unable to crop over picture boundaries");
- return VLC_EGENERIC;
- }
-
- i_width = i_crop_width;
- p_vout->fmt_in.i_visible_width = i_width;
-
- i_height = i_crop_height;
- p_vout->fmt_in.i_visible_height = i_height;
-
- p_vout->fmt_in.i_x_offset = i_crop_left;
- p_vout->fmt_in.i_y_offset = i_crop_top;
- }
- else
- {
- /* Maybe we're using the <left>+<top>+<right>+<bottom> syntax */
- unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;
-
- psz_parser = strchr( newval.psz_string, '+' );
- i_crop_left = strtol( newval.psz_string, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_parser = strchr( ++psz_end, '+' );
- i_crop_top = strtol( psz_end, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_parser = strchr( ++psz_end, '+' );
- i_crop_right = strtol( psz_end, &psz_end, 10 );
- if( psz_end != psz_parser ) goto crop_end;
-
- psz_end++;
- i_crop_bottom = strtol( psz_end, &psz_end, 10 );
- if( *psz_end != '\0' ) goto crop_end;
-
- if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
- i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
- {
- msg_Err( p_vout, "Unable to crop over picture boundaries" );
- return VLC_EGENERIC;
- }
-
- i_width = p_vout->fmt_render.i_visible_width
- - i_crop_left - i_crop_right;
- p_vout->fmt_in.i_visible_width = i_width;
-
- i_height = p_vout->fmt_render.i_visible_height
- - i_crop_top - i_crop_bottom;
- p_vout->fmt_in.i_visible_height = i_height;
-
- p_vout->fmt_in.i_x_offset = i_crop_left;
- p_vout->fmt_in.i_y_offset = i_crop_top;
- }
- }
- }
- else if( !strcmp( psz_cmd, "crop-top" )
- || !strcmp( psz_cmd, "crop-left" )
- || !strcmp( psz_cmd, "crop-bottom" )
- || !strcmp( psz_cmd, "crop-right" ) )
- {
- unsigned int i_crop_top, i_crop_left, i_crop_bottom, i_crop_right;
-
- i_crop_top = var_GetInteger( p_vout, "crop-top" );
- i_crop_left = var_GetInteger( p_vout, "crop-left" );
- i_crop_right = var_GetInteger( p_vout, "crop-right" );
- i_crop_bottom = var_GetInteger( p_vout, "crop-bottom" );
-
- if( i_crop_top + i_crop_bottom >= p_vout->fmt_render.i_visible_height ||
- i_crop_right + i_crop_left >= p_vout->fmt_render.i_visible_width )
- {
- msg_Err( p_vout, "Unable to crop over picture boundaries" );
- return VLC_EGENERIC;
- }
-
- i_width = p_vout->fmt_render.i_visible_width
- - i_crop_left - i_crop_right;
- p_vout->fmt_in.i_visible_width = i_width;
-
- i_height = p_vout->fmt_render.i_visible_height
- - i_crop_top - i_crop_bottom;
- p_vout->fmt_in.i_visible_height = i_height;
-
- p_vout->fmt_in.i_x_offset = i_crop_left;
- p_vout->fmt_in.i_y_offset = i_crop_top;
- }
-
- crop_end:
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
-
- p_vout->i_changes |= VOUT_CROP_CHANGE;
-
- msg_Dbg( p_vout, "cropping picture %ix%i to %i,%i,%ix%i",
- p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
- p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
- p_vout->fmt_in.i_visible_width,
- p_vout->fmt_in.i_visible_height );
+ (void)oldval; (void)newval; (void)p_data;
- var_TriggerCallback( p_vout, "crop-update" );
+ if( !strcmp( psz_cmd, "autoscale" ) )
+ vout_ControlChangeDisplayFilled( p_vout, newval.b_bool );
+ else if( !strcmp( psz_cmd, "scale" ) )
+ vout_ControlChangeZoom( p_vout, 1000 * newval.f_float, 1000 );
return VLC_SUCCESS;
}
-static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
+static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- unsigned int i_aspect_num, i_aspect_den, i_sar_num, i_sar_den;
- vlc_value_t val;
-
- char *psz_end, *psz_parser = strchr( newval.psz_string, ':' );
(void)psz_cmd; (void)oldval; (void)p_data;
- /* Restore defaults */
- p_vout->fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
- p_vout->fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den;
- p_vout->fmt_in.i_aspect = p_vout->fmt_render.i_aspect;
- p_vout->render.i_aspect = p_vout->fmt_render.i_aspect;
-
- if( !psz_parser ) goto aspect_end;
-
- i_aspect_num = strtol( newval.psz_string, &psz_end, 10 );
- if( psz_end == newval.psz_string || !i_aspect_num ) goto aspect_end;
-
- i_aspect_den = strtol( ++psz_parser, &psz_end, 10 );
- if( psz_end == psz_parser || !i_aspect_den ) goto aspect_end;
-
- i_sar_num = i_aspect_num * p_vout->fmt_render.i_visible_height;
- i_sar_den = i_aspect_den * p_vout->fmt_render.i_visible_width;
- vlc_ureduce( &i_sar_num, &i_sar_den, i_sar_num, i_sar_den, 0 );
- p_vout->fmt_in.i_sar_num = i_sar_num;
- p_vout->fmt_in.i_sar_den = i_sar_den;
- p_vout->fmt_in.i_aspect = i_aspect_num * VOUT_ASPECT_FACTOR / i_aspect_den;
- p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
-
- aspect_end:
- if( p_vout->p->i_par_num && p_vout->p->i_par_den )
- {
- p_vout->fmt_in.i_sar_num *= p_vout->p->i_par_den;
- p_vout->fmt_in.i_sar_den *= p_vout->p->i_par_num;
- p_vout->fmt_in.i_aspect = p_vout->fmt_in.i_aspect *
- p_vout->p->i_par_den / p_vout->p->i_par_num;
- p_vout->render.i_aspect = p_vout->fmt_in.i_aspect;
- }
-
- p_vout->i_changes |= VOUT_ASPECT_CHANGE;
-
- vlc_ureduce( &i_aspect_num, &i_aspect_den,
- p_vout->fmt_in.i_aspect, VOUT_ASPECT_FACTOR, 0 );
- msg_Dbg( p_vout, "new aspect-ratio %i:%i, sample aspect-ratio %i:%i",
- i_aspect_num, i_aspect_den,
- p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
+ vout_ControlChangeOnTop( p_vout, newval.b_bool );
+ return VLC_SUCCESS;
+}
- if( var_Get( p_vout, "crop", &val ) )
- return VLC_EGENERIC;
+static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ (void)psz_cmd; (void)p_data;
- int i_ret = CropCallback( p_this, "crop", val, val, 0 );
- free( val.psz_string );
- return i_ret;
+ if( oldval.b_bool != newval.b_bool )
+ vout_ControlChangeFullscreen( p_vout, newval.b_bool );
+ return VLC_SUCCESS;
}
-static int ScalingCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- (void)oldval; (void)newval; (void)p_data;
-
- vlc_mutex_lock( &p_vout->change_lock );
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+ VLC_UNUSED(newval); VLC_UNUSED(p_data);
- if( !strcmp( psz_cmd, "autoscale" ) )
- {
- p_vout->i_changes |= VOUT_SCALE_CHANGE;
- }
- else if( !strcmp( psz_cmd, "scale" ) )
- {
- p_vout->i_changes |= VOUT_ZOOM_CHANGE;
- }
+ VoutSaveSnapshot( p_vout );
+ return VLC_SUCCESS;
+}
- vlc_mutex_unlock( &p_vout->change_lock );
+static int VideoFilterCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data)
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
+ vout_ControlChangeFilters( p_vout, newval.psz_string );
return VLC_SUCCESS;
}
-static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int VideoSplitterCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ input_thread_t *p_input;
+ (void)psz_cmd; (void)oldval; (void)p_data;
+
+ p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+ if (!p_input)
+ {
+ msg_Err( p_vout, "Input not found" );
+ return VLC_EGENERIC;
+ }
- vlc_mutex_lock( &p_vout->change_lock );
- p_vout->i_changes |= VOUT_ON_TOP_CHANGE;
- p_vout->b_on_top = newval.b_bool;
- vlc_mutex_unlock( &p_vout->change_lock );
+ /* Modify input as well because the vout might have to be restarted */
+ var_Create( p_input, "vout-filter", VLC_VAR_STRING );
+ var_SetString( p_input, "vout-filter", newval.psz_string );
- /* Modify libvlc as well because the vout might have to be restarted */
- var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL );
- var_Set( p_vout->p_libvlc, "video-on-top", newval );
+ /* Now restart current video stream */
+ input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES );
+ vlc_object_release( p_input );
- (void)psz_cmd; (void)oldval; (void)p_data;
return VLC_SUCCESS;
}
-static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int SubFilterCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data)
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vlc_value_t val;
- (void)psz_cmd; (void)oldval; (void)p_data;
-
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
-
- /* Modify libvlc as well because the vout might have to be restarted */
- var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL );
- var_Set( p_vout->p_libvlc, "fullscreen", newval );
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
- val.b_bool = true;
- var_Set( p_vout, "intf-change", val );
+ vout_ControlChangeSubFilters( p_vout, newval.psz_string );
return VLC_SUCCESS;
}
-static int SnapshotCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int SubMarginCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data)
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
- VLC_UNUSED(newval); VLC_UNUSED(p_data);
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
- VoutSaveSnapshot( p_vout );
+ vout_ControlChangeSubMargin( p_vout, newval.i_int );
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->b_title_show = newval.b_bool;
+ p_vout->p->title.show = newval.b_bool;
return VLC_SUCCESS;
}
{
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->i_title_timeout = (mtime_t) newval.i_int;
+ p_vout->p->title.timeout = (mtime_t) newval.i_int;
return VLC_SUCCESS;
}
VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
VLC_UNUSED(p_data);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- p_vout->p->i_title_position = newval.i_int;
+ p_vout->p->title.position = newval.i_int;
return VLC_SUCCESS;
}
projects / vlc / blobdiff