/*****************************************************************************
* video_widgets.c : OSD widgets manipulation functions
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
* $Id$
*
* Author: Yoann Peronneau <yoann@videolan.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <vlc/vout.h>
-#include <osd.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "vlc_video.h"
-#include "vlc_filter.h"
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_osd.h>
-#define STYLE_EMPTY 0
-#define STYLE_FILLED 1
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void DrawRect( subpicture_t *, int, int, int, int, short );
-static void DrawTriangle( subpicture_t *, int, int, int, int, short );
-static void CreatePicture( vout_thread_t *, subpicture_t * );
-static subpicture_t *vout_CreateWidget( vout_thread_t *, int );
-static void FreeWidget( subpicture_t * );
-
-/**
- * Private data in a subpicture.
- */
-struct subpicture_sys_t
-{
- int i_x;
- int i_y;
- int i_width;
- int i_height;
-};
-
-/*****************************************************************************
- * Draws a rectangle at the given position in the subpic.
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).
- *****************************************************************************/
-static void DrawRect( subpicture_t *p_subpic, int i_x1, int i_y1,
- int i_x2, int i_y2, short fill )
-{
- int x, y;
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
- if( fill == STYLE_FILLED )
- {
- for( y = i_y1; y <= i_y2; y++ )
- {
- for( x = i_x1; x <= i_x2; x++ )
- {
- p_a[ x + i_pitch * y ] = 0xff;
- }
- }
- }
- else
- {
- for( y = i_y1; y <= i_y2; y++ )
- {
- p_a[ i_x1 + i_pitch * y ] = 0xff;
- p_a[ i_x2 + i_pitch * y ] = 0xff;
- }
- for( x = i_x1; x <= i_x2; x++ )
- {
- p_a[ x + i_pitch * i_y1 ] = 0xff;
- p_a[ x + i_pitch * i_y2 ] = 0xff;
- }
- }
-}
-
-/*****************************************************************************
- * Draws a triangle at the given position in the subpic.
- * It may be filled (fill == STYLE_FILLED) or empty (fill == STYLE_EMPTY).
- *****************************************************************************/
-static void DrawTriangle( subpicture_t *p_subpic, int i_x1, int i_y1,
- int i_x2, int i_y2, short fill )
-{
- int x, y, i_mid, h;
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
- i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 );
-
- if( i_x2 >= i_x1 )
- {
- if( fill == STYLE_FILLED )
- {
- for( y = i_y1; y <= i_mid; y++ )
- {
- h = y - i_y1;
- for( x = i_x1; x <= i_x1 + h && x <= i_x2; x++ )
- {
- p_a[ x + i_pitch * y ] = 0xff;
- p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;
- }
- }
- }
- else
- {
- for( y = i_y1; y <= i_mid; y++ )
- {
- h = y - i_y1;
- p_a[ i_x1 + i_pitch * y ] = 0xff;
- p_a[ i_x1 + h + i_pitch * y ] = 0xff;
- p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;
- p_a[ i_x1 + h + i_pitch * ( i_y2 - h ) ] = 0xff;
- }
- }
- }
- else
- {
- if( fill == STYLE_FILLED )
- {
- for( y = i_y1; y <= i_mid; y++ )
- {
- h = y - i_y1;
- for( x = i_x1; x >= i_x1 - h && x >= i_x2; x-- )
- {
- p_a[ x + i_pitch * y ] = 0xff;
- p_a[ x + i_pitch * ( i_y2 - h ) ] = 0xff;
- }
- }
- }
- else
- {
- for( y = i_y1; y <= i_mid; y++ )
- {
- h = y - i_y1;
- p_a[ i_x1 + i_pitch * y ] = 0xff;
- p_a[ i_x1 - h + i_pitch * y ] = 0xff;
- p_a[ i_x1 + i_pitch * ( i_y2 - h ) ] = 0xff;
- p_a[ i_x1 - h + i_pitch * ( i_y2 - h ) ] = 0xff;
- }
- }
- }
-}
-
-/*****************************************************************************
- * Create Picture: creates subpicture region and picture
- *****************************************************************************/
-static void CreatePicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
-{
- subpicture_sys_t *p_widget = p_subpic->p_sys;
- spu_t *p_spu = p_vout->p_spu;
- uint8_t *p_y, *p_u, *p_v, *p_a;
- video_format_t fmt;
- int i_pitch;
-
- /* Create a new subpicture region */
- memset( &fmt, 0, sizeof(video_format_t) );
- fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
- fmt.i_aspect = VOUT_ASPECT_FACTOR;
- fmt.i_width = fmt.i_visible_width = p_widget->i_width;
- fmt.i_height = fmt.i_visible_height = p_widget->i_height;
- fmt.i_x_offset = fmt.i_y_offset = 0;
- p_subpic->p_region = p_subpic->pf_create_region( VLC_OBJECT(p_spu), &fmt );
- if( !p_subpic->p_region )
- {
- msg_Err( p_spu, "cannot allocate SPU region" );
- return;
- }
-
- p_subpic->p_region->i_x = p_widget->i_x;
- p_subpic->p_region->i_y = p_widget->i_y;
- p_y = p_subpic->p_region->picture.Y_PIXELS;
- p_u = p_subpic->p_region->picture.U_PIXELS;
- p_v = p_subpic->p_region->picture.V_PIXELS;
- p_a = p_subpic->p_region->picture.A_PIXELS;
- i_pitch = p_subpic->p_region->picture.Y_PITCH;
-
- /* Initialize the region pixels (only the alpha will be changed later) */
- memset( p_y, 0xff, i_pitch * p_subpic->p_region->fmt.i_height );
- memset( p_u, 0x80, i_pitch * p_subpic->p_region->fmt.i_height );
- memset( p_v, 0x80, i_pitch * p_subpic->p_region->fmt.i_height );
- memset( p_a, 0x00, i_pitch * p_subpic->p_region->fmt.i_height );
-}
-
-/*****************************************************************************
- * Creates and initializes an OSD widget.
- *****************************************************************************/
-subpicture_t *vout_CreateWidget( vout_thread_t *p_vout, int i_channel )
-{
- subpicture_t *p_subpic;
- subpicture_sys_t *p_widget;
- mtime_t i_now = mdate();
-
- p_subpic = 0;
- p_widget = 0;
-
- /* Create and initialize a subpicture */
- p_subpic = spu_CreateSubpicture( p_vout->p_spu );
- if( p_subpic == NULL )
- {
- return NULL;
- }
- p_subpic->i_channel = i_channel;
- p_subpic->pf_destroy = FreeWidget;
- p_subpic->i_start = i_now;
- p_subpic->i_stop = i_now + 1200000;
- p_subpic->b_ephemer = VLC_TRUE;
-
- p_widget = malloc( sizeof(subpicture_sys_t) );
- if( p_widget == NULL )
- {
- FreeWidget( p_subpic );
- spu_DestroySubpicture( p_vout->p_spu, p_subpic );
- return NULL;
- }
- p_subpic->p_sys = p_widget;
-
- return p_subpic;
-}
+#include <vlc_filter.h>
/*****************************************************************************
* Displays an OSD slider.
{
vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
- subpicture_t *p_subpic;
- subpicture_sys_t *p_widget;
- int i_x_margin, i_y_margin;
-
- if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) || i_position < 0 )
- {
- return;
- }
- p_subpic = vout_CreateWidget( p_vout, i_channel );
- if( p_subpic == NULL )
+ if( p_vout && ( config_GetInt( p_caller, "osd" ) || ( i_position >= 0 ) ) )
{
- return;
+ osd_Slider( p_caller, p_vout->p_spu, p_vout->render.i_width,
+ p_vout->render.i_height, p_vout->fmt_in.i_x_offset,
+ p_vout->fmt_in.i_height - p_vout->fmt_in.i_visible_height
+ - p_vout->fmt_in.i_y_offset,
+ i_channel, i_position, i_type );
}
- p_widget = p_subpic->p_sys;
-
- i_y_margin = p_vout->render.i_height / 10;
- i_x_margin = i_y_margin;
- if( i_type == OSD_HOR_SLIDER )
- {
- p_widget->i_width = p_vout->render.i_width - 2 * i_x_margin;
- p_widget->i_height = p_vout->render.i_height / 20;
- p_widget->i_x = i_x_margin;
- p_widget->i_y = p_vout->render.i_height - i_y_margin -
- p_widget->i_height;
- }
- else
- {
- p_widget->i_width = p_vout->render.i_width / 40;
- p_widget->i_height = p_vout->render.i_height - 2 * i_y_margin;
- p_widget->i_x = p_vout->render.i_width - i_x_margin -
- p_widget->i_width;
- p_widget->i_y = i_y_margin;
- }
-
- /* Create subpicture region and picture */
- CreatePicture( p_vout, p_subpic );
-
- if( i_type == OSD_HOR_SLIDER )
- {
- int i_x_pos = ( p_widget->i_width - 2 ) * i_position / 100;
- DrawRect( p_subpic, i_x_pos - 1, 2, i_x_pos + 1,
- p_widget->i_height - 3, STYLE_FILLED );
- DrawRect( p_subpic, 0, 0, p_widget->i_width - 1,
- p_widget->i_height - 1, STYLE_EMPTY );
- }
- else if( i_type == OSD_VERT_SLIDER )
- {
- int i_y_pos = p_widget->i_height / 2;
- DrawRect( p_subpic, 2, p_widget->i_height -
- ( p_widget->i_height - 2 ) * i_position / 100,
- p_widget->i_width - 3, p_widget->i_height - 3,
- STYLE_FILLED );
- DrawRect( p_subpic, 1, i_y_pos, 1, i_y_pos, STYLE_FILLED );
- DrawRect( p_subpic, p_widget->i_width - 2, i_y_pos,
- p_widget->i_width - 2, i_y_pos, STYLE_FILLED );
- DrawRect( p_subpic, 0, 0, p_widget->i_width - 1,
- p_widget->i_height - 1, STYLE_EMPTY );
- }
-
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
-
vlc_object_release( p_vout );
- return;
}
/*****************************************************************************
{
vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
- subpicture_t *p_subpic;
- subpicture_sys_t *p_widget;
- int i_x_margin, i_y_margin;
-
- if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) )
- {
- return;
- }
-
- p_subpic = vout_CreateWidget( p_vout, i_channel );
- if( p_subpic == NULL )
- {
- return;
- }
- p_widget = p_subpic->p_sys;
-
- i_y_margin = p_vout->render.i_height / 15;
- i_x_margin = i_y_margin;
- p_widget->i_width = p_vout->render.i_width / 20;
- p_widget->i_height = p_widget->i_width;
- p_widget->i_x = p_vout->render.i_width - i_x_margin -
- p_widget->i_width;
- p_widget->i_y = i_y_margin;
- /* Create subpicture region and picture */
- CreatePicture( p_vout, p_subpic );
+ if( !p_vout ) return;
- if( i_type == OSD_PAUSE_ICON )
+ if( config_GetInt( p_caller, "osd" ) )
{
- int i_bar_width = p_widget->i_width / 3;
- DrawRect( p_subpic, 0, 0, i_bar_width - 1,
- p_widget->i_height - 1, STYLE_FILLED );
- DrawRect( p_subpic, p_widget->i_width - i_bar_width, 0,
- p_widget->i_width - 1, p_widget->i_height - 1, STYLE_FILLED );
+ osd_Icon( p_caller,
+ p_vout->p_spu,
+ p_vout->render.i_width,
+ p_vout->render.i_height,
+ p_vout->fmt_in.i_width - p_vout->fmt_in.i_visible_width
+ - p_vout->fmt_in.i_x_offset,
+ p_vout->fmt_in.i_y_offset,
+ i_channel, i_type );
}
- else if( i_type == OSD_PLAY_ICON )
- {
- int i_mid = p_widget->i_height >> 1;
- int i_delta = ( p_widget->i_width - i_mid ) >> 1;
- int i_y2 = ( ( p_widget->i_height - 1 ) >> 1 ) * 2;
- DrawTriangle( p_subpic, i_delta, 0, p_widget->i_width - i_delta, i_y2,
- STYLE_FILLED );
- }
- else if( i_type == OSD_SPEAKER_ICON || i_type == OSD_MUTE_ICON )
- {
- int i_mid = p_widget->i_height >> 1;
- int i_delta = ( p_widget->i_width - i_mid ) >> 1;
- int i_y2 = ( ( p_widget->i_height - 1 ) >> 1 ) * 2;
- DrawRect( p_subpic, i_delta, i_mid / 2, p_widget->i_width - i_delta,
- p_widget->i_height - 1 - i_mid / 2, STYLE_FILLED );
- DrawTriangle( p_subpic, p_widget->i_width - i_delta, 0, i_delta, i_y2,
- STYLE_FILLED );
- if( i_type == OSD_MUTE_ICON )
- {
- uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS;
- int i_pitch = p_subpic->p_region->picture.Y_PITCH;
- int i;
- for( i = 1; i < i_pitch; i++ )
- {
- int k = i + ( p_widget->i_height - i - 1 ) * i_pitch;
- p_a[ k ] = 0xff - p_a[ k ];
- }
- }
- }
-
- spu_DisplaySubpicture( p_vout->p_spu, p_subpic );
-
vlc_object_release( p_vout );
- return;
}
-/**
- * Frees the widget.
- */
-static void FreeWidget( subpicture_t *p_subpic )
-{
- subpicture_sys_t *p_widget = p_subpic->p_sys;
-
- if( p_subpic->p_sys == NULL ) return;
-
- free( p_widget );
-}
projects / vlc / blobdiff