/*****************************************************************************
- * transform.c : transform image plugin for vlc
+ * transform.c : transform image module for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.2 2002/08/26 09:12:46 sam Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
static void End ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
+static int SendEvents( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define TYPE_TEXT N_("transform type")
+#define TYPE_TEXT N_("Transform type")
#define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'")
-static char *type_list[] = { "90", "180", "270", "hflip", "vflip", NULL };
+static char *type_list[] = { "90", "180", "270", "hflip", "vflip" };
+static char *type_list_text[] = { N_("Rotate by 90 degrees"),
+ N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"),
+ N_("Flip horizontally"), N_("Flip vertically") };
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_string_from_list( "transform-type", "90", type_list, NULL,
- TYPE_TEXT, TYPE_LONGTEXT);
- set_description( _("image transformation module") );
+ set_description( _("Video transformation filter") );
+ set_shortname( N_("Transformation"));
set_capability( "video filter", 0 );
+ set_category( CAT_VIDEO );
+ set_subcategory( SUBCAT_VIDEO_VFILTER );
+
+ add_string( "transform-type", "90", NULL,
+ TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE);
+ change_string_list( type_list, type_list_text, 0);
+
add_shortcut( "transform" );
set_callbacks( Create, Destroy );
vlc_module_end();
vout_thread_t *p_vout;
};
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+ return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
+}
+
/*****************************************************************************
* Create: allocates Transform video thread output method
*****************************************************************************
if( p_vout->p_sys == NULL )
{
msg_Err( p_vout, "out of memory" );
- return( 1 );
+ return VLC_ENOMEM;
}
p_vout->pf_init = Init;
p_vout->pf_manage = NULL;
p_vout->pf_render = Render;
p_vout->pf_display = NULL;
+ p_vout->pf_control = Control;
/* Look what method was requested */
psz_method = config_GetPsz( p_vout, "transform-type" );
free( psz_method );
}
-
- return( 0 );
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
int i_index;
picture_t *p_pic;
-
+ video_format_t fmt = {0};
+
I_OUTPUTPICTURES = 0;
/* Initialize the output structure */
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
+ fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
+ fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ fmt.i_chroma = p_vout->render.i_chroma;
+ fmt.i_aspect = p_vout->render.i_aspect;
+ fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+ fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
/* Try to open the real video output */
msg_Dbg( p_vout, "spawning the real video output" );
if( p_vout->p_sys->b_rotation )
{
- p_vout->p_sys->p_vout =
- vout_CreateThread( p_vout,
- p_vout->render.i_height, p_vout->render.i_width,
- p_vout->render.i_chroma,
- (u64)VOUT_ASPECT_FACTOR * (u64)VOUT_ASPECT_FACTOR
- / (u64)p_vout->render.i_aspect );
+ fmt.i_width = fmt.i_visible_width = p_vout->render.i_height;
+ fmt.i_height = fmt.i_visible_height = p_vout->render.i_width;
+ fmt.i_aspect = VOUT_ASPECT_FACTOR *
+ (uint64_t)VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
+ fmt.i_sar_num = VOUT_ASPECT_FACTOR;
+ fmt.i_sar_den = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
+
+ p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
}
else
{
- p_vout->p_sys->p_vout =
- vout_CreateThread( p_vout,
- p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_chroma, p_vout->render.i_aspect );
+ p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
}
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "cannot open vout, aborting" );
- return( 0 );
+ return VLC_EGENERIC;
}
-
+
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
- return( 0 );
+ ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+
+ ADD_PARENT_CALLBACKS( SendEventsToChild );
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vout_DestroyThread( p_vout->p_sys->p_vout );
+ if( p_vout->p_sys->p_vout )
+ {
+ DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+ vlc_object_detach( p_vout->p_sys->p_vout );
+ vout_Destroy( p_vout->p_sys->p_vout );
+ }
+
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
free( p_vout->p_sys );
}
return;
}
msleep( VOUT_OUTMEM_SLEEP );
- }
+ }
vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
{
int i_pitch = p_pic->p[i_index].i_pitch;
- u8 *p_in = p_pic->p[i_index].p_pixels;
+ uint8_t *p_in = p_pic->p[i_index].p_pixels;
- u8 *p_out = p_outpic->p[i_index].p_pixels;
- u8 *p_out_end = p_out + p_outpic->p[i_index].i_lines
- * p_outpic->p[i_index].i_pitch;
+ uint8_t *p_out = p_outpic->p[i_index].p_pixels;
+ uint8_t *p_out_end = p_out +
+ p_outpic->p[i_index].i_visible_lines *
+ p_outpic->p[i_index].i_pitch;
for( ; p_out < p_out_end ; )
{
- u8 *p_line_end;
+ uint8_t *p_line_end;
- p_line_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch;
+ p_out_end -= p_outpic->p[i_index].i_pitch
+ - p_outpic->p[i_index].i_visible_pitch;
+ p_line_end = p_in + p_pic->p[i_index].i_visible_lines *
+ i_pitch;
for( ; p_in < p_line_end ; )
{
case TRANSFORM_MODE_180:
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{
- u8 *p_in = p_pic->p[i_index].p_pixels;
- u8 *p_in_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch;
+ uint8_t *p_in = p_pic->p[i_index].p_pixels;
+ uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
+ * p_pic->p[i_index].i_pitch;
- u8 *p_out = p_outpic->p[i_index].p_pixels;
+ uint8_t *p_out = p_outpic->p[i_index].p_pixels;
for( ; p_in < p_in_end ; )
{
- *p_out++ = *(--p_in_end);
+ uint8_t *p_line_start = p_in_end
+ - p_pic->p[i_index].i_pitch;
+ p_in_end -= p_pic->p[i_index].i_pitch
+ - p_pic->p[i_index].i_visible_pitch;
+
+ for( ; p_line_start < p_in_end ; )
+ {
+ *p_out++ = *(--p_in_end);
+ }
+
+ p_out += p_outpic->p[i_index].i_pitch
+ - p_outpic->p[i_index].i_visible_pitch;
}
}
break;
{
int i_pitch = p_pic->p[i_index].i_pitch;
- u8 *p_in = p_pic->p[i_index].p_pixels;
+ uint8_t *p_in = p_pic->p[i_index].p_pixels;
- u8 *p_out = p_outpic->p[i_index].p_pixels;
- u8 *p_out_end = p_out + p_outpic->p[i_index].i_lines
- * p_outpic->p[i_index].i_pitch;
+ uint8_t *p_out = p_outpic->p[i_index].p_pixels;
+ uint8_t *p_out_end = p_out +
+ p_outpic->p[i_index].i_visible_lines *
+ p_outpic->p[i_index].i_pitch;
for( ; p_out < p_out_end ; )
{
- u8 *p_in_end;
+ uint8_t *p_in_end;
- p_in_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch;
+ p_in_end = p_in + p_pic->p[i_index].i_visible_lines *
+ i_pitch;
for( ; p_in < p_in_end ; )
{
*p_out++ = *p_in_end;
}
+ p_out += p_outpic->p[i_index].i_pitch
+ - p_outpic->p[i_index].i_visible_pitch;
p_in++;
}
}
break;
- case TRANSFORM_MODE_VFLIP:
+ case TRANSFORM_MODE_HFLIP:
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{
- u8 *p_in = p_pic->p[i_index].p_pixels;
- u8 *p_in_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch;
+ uint8_t *p_in = p_pic->p[i_index].p_pixels;
+ uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
+ * p_pic->p[i_index].i_pitch;
- u8 *p_out = p_outpic->p[i_index].p_pixels;
+ uint8_t *p_out = p_outpic->p[i_index].p_pixels;
for( ; p_in < p_in_end ; )
{
p_in_end -= p_pic->p[i_index].i_pitch;
p_vout->p_vlc->pf_memcpy( p_out, p_in_end,
- p_pic->p[i_index].i_pitch );
+ p_pic->p[i_index].i_visible_pitch );
p_out += p_pic->p[i_index].i_pitch;
}
}
break;
- case TRANSFORM_MODE_HFLIP:
+ case TRANSFORM_MODE_VFLIP:
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{
- u8 *p_in = p_pic->p[i_index].p_pixels;
- u8 *p_in_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch;
+ uint8_t *p_in = p_pic->p[i_index].p_pixels;
+ uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
+ * p_pic->p[i_index].i_pitch;
- u8 *p_out = p_outpic->p[i_index].p_pixels;
+ uint8_t *p_out = p_outpic->p[i_index].p_pixels;
for( ; p_in < p_in_end ; )
{
- u8 *p_line_end = p_in + p_pic->p[i_index].i_pitch;
+ uint8_t *p_line_end = p_in
+ + p_pic->p[i_index].i_visible_pitch;
for( ; p_in < p_line_end ; )
{
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
}
+/*****************************************************************************
+ * SendEvents: forward mouse and keyboard events to the parent p_vout
+ *****************************************************************************/
+static int SendEvents( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)_p_vout;
+ vlc_value_t sentval = newval;
+
+ /* Translate the mouse coordinates */
+ if( !strcmp( psz_var, "mouse-x" ) )
+ {
+ switch( p_vout->p_sys->i_mode )
+ {
+ case TRANSFORM_MODE_270:
+ sentval.i_int = p_vout->p_sys->p_vout->output.i_width
+ - sentval.i_int;
+ case TRANSFORM_MODE_90:
+ var_Set( p_vout, "mouse-y", sentval );
+ return VLC_SUCCESS;
+
+ case TRANSFORM_MODE_180:
+ case TRANSFORM_MODE_HFLIP:
+ sentval.i_int = p_vout->p_sys->p_vout->output.i_width
+ - sentval.i_int;
+ break;
+
+ case TRANSFORM_MODE_VFLIP:
+ default:
+ break;
+ }
+ }
+ else if( !strcmp( psz_var, "mouse-y" ) )
+ {
+ switch( p_vout->p_sys->i_mode )
+ {
+ case TRANSFORM_MODE_90:
+ sentval.i_int = p_vout->p_sys->p_vout->output.i_height
+ - sentval.i_int;
+ case TRANSFORM_MODE_270:
+ var_Set( p_vout, "mouse-x", sentval );
+ return VLC_SUCCESS;
+
+ case TRANSFORM_MODE_180:
+ case TRANSFORM_MODE_VFLIP:
+ sentval.i_int = p_vout->p_sys->p_vout->output.i_height
+ - sentval.i_int;
+ break;
+
+ case TRANSFORM_MODE_HFLIP:
+ default:
+ break;
+ }
+ }
+
+ var_Set( p_vout, psz_var, sentval );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * SendEventsToChild: forward events to the child/children vout
+ *****************************************************************************/
+static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ var_Set( p_vout->p_sys->p_vout, psz_var, newval );
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff