X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_widgets.c;h=f0a1ded2bc0098f223d20a4196226232a0bd9a5f;hb=c3469a6a2c3d8d32c28d437af2a57f4fb59462b8;hp=cd4063489b884d80b1bf4e2f56a64083fff48c81;hpb=015a1605686a8277f4657e4cd40cb4d155bc36d7;p=vlc diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c index cd4063489b..f0a1ded2bc 100644 --- a/src/video_output/video_widgets.c +++ b/src/video_output/video_widgets.c @@ -1,7 +1,7 @@ /***************************************************************************** * video_widgets.c : OSD widgets manipulation functions ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004-2005 the VideoLAN team * $Id$ * * Author: Yoann Peronneau @@ -18,192 +18,21 @@ * * 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 /* free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_video.h" -#include "vlc_filter.h" +#include +#include +#include -#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( spu_t *, subpicture_t *, int, int, int, int ); -static subpicture_t *vout_CreateWidget( spu_t *, int ); - -/***************************************************************************** - * 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( spu_t *p_spu, subpicture_t *p_subpic, - int i_x, int i_y, int i_width, int i_height ) -{ - 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 = 0; - fmt.i_width = fmt.i_visible_width = i_width; - fmt.i_height = fmt.i_visible_height = 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 = i_x; - p_subpic->p_region->i_y = 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( spu_t *p_spu, int i_channel ) -{ - subpicture_t *p_subpic; - mtime_t i_now = mdate(); - - /* Create and initialize a subpicture */ - p_subpic = spu_CreateSubpicture( p_spu ); - if( p_subpic == NULL ) return NULL; - - p_subpic->i_channel = i_channel; - p_subpic->i_start = i_now; - p_subpic->i_stop = i_now + 1200000; - p_subpic->b_ephemer = VLC_TRUE; - p_subpic->b_fade = VLC_TRUE; - - return p_subpic; -} +#include /***************************************************************************** * Displays an OSD slider. @@ -214,62 +43,16 @@ void vout_OSDSlider( vlc_object_t *p_caller, int i_channel, int i_position, { vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - subpicture_t *p_subpic; - int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height; - - if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) || i_position < 0 ) - { - return; - } - - p_subpic = vout_CreateWidget( p_vout->p_spu, i_channel ); - if( p_subpic == NULL ) - { - return; - } - - i_y_margin = p_vout->render.i_height / 10; - i_x_margin = i_y_margin; - if( i_type == OSD_HOR_SLIDER ) - { - i_width = p_vout->render.i_width - 2 * i_x_margin; - i_height = p_vout->render.i_height / 20; - i_x = i_x_margin; - i_y = p_vout->render.i_height - i_y_margin - i_height; - } - else - { - i_width = p_vout->render.i_width / 40; - i_height = p_vout->render.i_height - 2 * i_y_margin; - i_x = p_vout->render.i_width - i_x_margin - i_width; - i_y = i_y_margin; - } - - /* Create subpicture region and picture */ - CreatePicture( p_vout->p_spu, p_subpic, i_x, i_y, i_width, i_height ); - if( i_type == OSD_HOR_SLIDER ) + if( p_vout && ( config_GetInt( p_caller, "osd" ) || ( i_position >= 0 ) ) ) { - int i_x_pos = ( i_width - 2 ) * i_position / 100; - DrawRect( p_subpic, i_x_pos - 1, 2, i_x_pos + 1, - i_height - 3, STYLE_FILLED ); - DrawRect( p_subpic, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY ); + 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 ); } - else if( i_type == OSD_VERT_SLIDER ) - { - int i_y_pos = i_height / 2; - DrawRect( p_subpic, 2, i_height - ( i_height - 2 ) * i_position / 100, - i_width - 3, i_height - 3, STYLE_FILLED ); - DrawRect( p_subpic, 1, i_y_pos, 1, i_y_pos, STYLE_FILLED ); - DrawRect( p_subpic, i_width - 2, i_y_pos, - i_width - 2, i_y_pos, STYLE_FILLED ); - DrawRect( p_subpic, 0, 0, i_width - 1, i_height - 1, STYLE_EMPTY ); - } - - spu_DisplaySubpicture( p_vout->p_spu, p_subpic ); - vlc_object_release( p_vout ); - return; } /***************************************************************************** @@ -280,69 +63,20 @@ void vout_OSDIcon( vlc_object_t *p_caller, int i_channel, short i_type ) { vout_thread_t *p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - subpicture_t *p_subpic; - int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height; - - if( p_vout == NULL || !config_GetInt( p_caller, "osd" ) ) - { - return; - } - - p_subpic = vout_CreateWidget( p_vout->p_spu, i_channel ); - if( p_subpic == NULL ) - { - return; - } - - i_y_margin = p_vout->render.i_height / 15; - i_x_margin = i_y_margin; - i_width = p_vout->render.i_width / 20; - i_height = i_width; - i_x = p_vout->render.i_width - i_x_margin - i_width; - i_y = i_y_margin; - /* Create subpicture region and picture */ - CreatePicture( p_vout->p_spu, p_subpic, i_x, i_y, i_width, i_height ); + if( !p_vout ) return; - if( i_type == OSD_PAUSE_ICON ) + if( config_GetInt( p_caller, "osd" ) ) { - int i_bar_width = i_width / 3; - DrawRect( p_subpic, 0, 0, i_bar_width - 1, i_height -1, STYLE_FILLED ); - DrawRect( p_subpic, i_width - i_bar_width, 0, - i_width - 1, 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 = i_height >> 1; - int i_delta = ( i_width - i_mid ) >> 1; - int i_y2 = ( ( i_height - 1 ) >> 1 ) * 2; - DrawTriangle( p_subpic, i_delta, 0, i_width - i_delta, i_y2, - STYLE_FILLED ); - } - else if( i_type == OSD_SPEAKER_ICON || i_type == OSD_MUTE_ICON ) - { - int i_mid = i_height >> 1; - int i_delta = ( i_width - i_mid ) >> 1; - int i_y2 = ( ( i_height - 1 ) >> 1 ) * 2; - DrawRect( p_subpic, i_delta, i_mid / 2, i_width - i_delta, - i_height - 1 - i_mid / 2, STYLE_FILLED ); - DrawTriangle( p_subpic, 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 + ( 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; } +