X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=4a16f224ac364daf264c6dba0e1e6a124f588a29;hb=a804eaa4782f3f8a384c19a223383be309e62023;hp=149adaed54f778e338a50916bf68c48510c7dcf4;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 149adaed54..4a16f224ac 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -1,10 +1,10 @@ /***************************************************************************** * mosaic.c : Mosaic video plugin for vlc ***************************************************************************** - * Copyright (C) 2004-2007 the VideoLAN team + * Copyright (C) 2004-2008 the VideoLAN team * $Id$ * - * Authors: Antoine Cellerier + * Authors: Antoine Cellerier * Christophe Massiot * * This program is free software; you can redistribute it and/or modify @@ -25,23 +25,23 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#define _GNU_SOURCE -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include #include -#ifdef HAVE_LIMITS_H -# include /* INT_MAX */ -#endif +#include +#include /* INT_MAX */ #include "vlc_filter.h" #include "vlc_image.h" #include "mosaic.h" -#define BLANK_DELAY I64C(1000000) +#define BLANK_DELAY INT64_C(1000000) /***************************************************************************** * Local prototypes @@ -64,8 +64,8 @@ struct filter_sys_t image_handler_t *p_image; int i_position; /* Mosaic positioning method */ - vlc_bool_t b_ar; /* Do we keep the aspect ratio ? */ - vlc_bool_t b_keep; /* Do we keep the original picture format ? */ + bool b_ar; /* Do we keep the aspect ratio ? */ + bool b_keep; /* Do we keep the original picture format ? */ int i_width, i_height; /* Mosaic height and width */ int i_cols, i_rows; /* Mosaic rows and cols */ int i_align; /* Mosaic alignment in background video */ @@ -163,73 +163,73 @@ enum { position_auto = 0, position_fixed = 1, position_offsets = 2 }; -static int pi_pos_values[] = { 0, 1, 2 }; -static const char *ppsz_pos_descriptions[] = +static const int pi_pos_values[] = { 0, 1, 2 }; +static const char *const ppsz_pos_descriptions[] = { N_("auto"), N_("fixed"), N_("offsets") }; -static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static const char *ppsz_align_descriptions[] = +static const int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; +static const char *const ppsz_align_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; #define CFG_PREFIX "mosaic-" -vlc_module_begin(); - set_description( _("Mosaic video sub filter") ); - set_shortname( _("Mosaic") ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_SUBPIC); - set_capability( "sub filter", 0 ); - set_callbacks( CreateFilter, DestroyFilter ); +vlc_module_begin () + set_description( N_("Mosaic video sub filter") ) + set_shortname( N_("Mosaic") ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC) + set_capability( "sub filter", 0 ) + set_callbacks( CreateFilter, DestroyFilter ) - add_integer( CFG_PREFIX "alpha", 255, NULL, - ALPHA_TEXT, ALPHA_LONGTEXT, VLC_FALSE ); + add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL, + ALPHA_TEXT, ALPHA_LONGTEXT, false ); add_integer( CFG_PREFIX "height", 100, NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ); add_integer( CFG_PREFIX "width", 100, NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, VLC_FALSE ); + WIDTH_TEXT, WIDTH_LONGTEXT, false ); add_integer( CFG_PREFIX "align", 5, NULL, - ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE); - change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); + ALIGN_TEXT, ALIGN_LONGTEXT, true); + change_integer_list( pi_align_values, ppsz_align_descriptions, NULL ); add_integer( CFG_PREFIX "xoffset", 0, NULL, - XOFFSET_TEXT, XOFFSET_LONGTEXT, VLC_TRUE ); + XOFFSET_TEXT, XOFFSET_LONGTEXT, true ); add_integer( CFG_PREFIX "yoffset", 0, NULL, - YOFFSET_TEXT, YOFFSET_LONGTEXT, VLC_TRUE ); + YOFFSET_TEXT, YOFFSET_LONGTEXT, true ); add_integer( CFG_PREFIX "borderw", 0, NULL, - BORDERW_TEXT, BORDERW_LONGTEXT, VLC_TRUE ); - add_deprecated_alias( CFG_PREFIX "vborder" ); + BORDERW_TEXT, BORDERW_LONGTEXT, true ); + add_deprecated_alias( CFG_PREFIX "vborder" ) add_integer( CFG_PREFIX "borderh", 0, NULL, - BORDERH_TEXT, BORDERH_LONGTEXT, VLC_TRUE ); - add_deprecated_alias( CFG_PREFIX "hborder" ); + BORDERH_TEXT, BORDERH_LONGTEXT, true ); + add_deprecated_alias( CFG_PREFIX "hborder" ) add_integer( CFG_PREFIX "position", 0, NULL, - POS_TEXT, POS_LONGTEXT, VLC_FALSE ); - change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); + POS_TEXT, POS_LONGTEXT, false ); + change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_integer( CFG_PREFIX "rows", 2, NULL, - ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); + ROWS_TEXT, ROWS_LONGTEXT, false ); add_integer( CFG_PREFIX "cols", 2, NULL, - COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); + COLS_TEXT, COLS_LONGTEXT, false ); add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL, - AR_TEXT, AR_LONGTEXT, VLC_FALSE ); + AR_TEXT, AR_LONGTEXT, false ); add_bool( CFG_PREFIX "keep-picture", 0, NULL, - KEEP_TEXT, KEEP_LONGTEXT, VLC_FALSE ); + KEEP_TEXT, KEEP_LONGTEXT, false ); add_string( CFG_PREFIX "order", "", NULL, - ORDER_TEXT, ORDER_LONGTEXT, VLC_FALSE ); + ORDER_TEXT, ORDER_LONGTEXT, false ); add_string( CFG_PREFIX "offsets", "", NULL, - OFFSETS_TEXT, OFFSETS_LONGTEXT, VLC_FALSE ); + OFFSETS_TEXT, OFFSETS_LONGTEXT, false ); add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, - VLC_FALSE ); -vlc_module_end(); + false ); +vlc_module_end () -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "alpha", "height", "width", "align", "xoffset", "yoffset", "borderw", "borderh", "position", "rows", "cols", "keep-aspect-ratio", "keep-picture", "order", "offsets", @@ -283,8 +283,8 @@ static int CreateFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys; - vlc_object_t *p_libvlc = p_filter->p_libvlc; - char *psz_order; + vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc ); + char *psz_order, *_psz_order; char *psz_offsets; int i_index; vlc_value_t val; @@ -295,14 +295,11 @@ static int CreateFilter( vlc_object_t *p_this ) /* Allocate structure */ p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_filter->pf_sub_filter = Filter; - vlc_mutex_init( p_filter, &p_sys->lock ); + vlc_mutex_init( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock ); var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX ); @@ -350,6 +347,7 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = 0; p_sys->ppsz_order = NULL; psz_order = var_CreateGetStringCommand( p_filter, CFG_PREFIX "order" ); + _psz_order = psz_order; var_AddCallback( p_filter, CFG_PREFIX "order", MosaicCallback, p_sys ); if( *psz_order ) @@ -369,12 +367,15 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = i_index; } + free( _psz_order ); + /* Manage specific offsets for substreams */ psz_offsets = var_CreateGetStringCommand( p_filter, CFG_PREFIX "offsets" ); p_sys->i_offsets_length = 0; p_sys->pi_x_offsets = NULL; p_sys->pi_y_offsets = NULL; mosaic_ParseSetOffsets( p_filter, p_sys, psz_offsets ); + free( psz_offsets ); var_AddCallback( p_filter, CFG_PREFIX "offsets", MosaicCallback, p_sys ); vlc_mutex_unlock( &p_sys->lock ); @@ -425,7 +426,7 @@ static void MosaicReleasePicture( picture_t *p_picture ) { picture_t *p_original_pic = (picture_t *)p_picture->p_sys; - p_original_pic->pf_release( p_original_pic ); + picture_Release( p_original_pic ); } /***************************************************************************** @@ -447,20 +448,17 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) subpicture_region_t *p_region_prev = NULL; /* Allocate the subpicture internal data. */ - p_spu = p_filter->pf_sub_buffer_new( p_filter ); + p_spu = filter_NewSubpicture( p_filter ); if( !p_spu ) - { return NULL; - } /* Initialize subpicture */ p_spu->i_channel = 0; p_spu->i_start = date; p_spu->i_stop = 0; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; p_spu->i_alpha = p_sys->i_alpha; - p_spu->i_flags = p_sys->i_align; - p_spu->b_absolute = VLC_FALSE; + p_spu->b_absolute = false; vlc_mutex_lock( &p_sys->lock ); vlc_mutex_lock( p_sys->p_lock ); @@ -497,7 +495,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) if ( !p_es->b_empty ) { i_numpics ++; - if( p_sys->i_order_length && p_es->psz_id != 0 ) + if( p_sys->i_order_length && p_es->psz_id != NULL ) { /* We also want to leave slots for images given in * mosaic-order that are not available in p_vout_picture */ @@ -545,21 +543,21 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) if ( p_es->p_picture->p_next != NULL ) { picture_t *p_next = p_es->p_picture->p_next; - p_es->p_picture->pf_release( p_es->p_picture ); + picture_Release( p_es->p_picture ); p_es->p_picture = p_next; } else if ( p_es->p_picture->date + p_sys->i_delay + BLANK_DELAY < date ) { /* Display blank */ - p_es->p_picture->pf_release( p_es->p_picture ); + picture_Release( p_es->p_picture ); p_es->p_picture = NULL; p_es->pp_last = &p_es->p_picture; break; } else { - msg_Dbg( p_filter, "too late picture for %s (" I64Fd ")", + msg_Dbg( p_filter, "too late picture for %s (%"PRId64 ")", p_es->psz_id, date - p_es->p_picture->date - p_sys->i_delay ); break; @@ -598,7 +596,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_in.i_height = p_es->p_picture->format.i_height; fmt_in.i_width = p_es->p_picture->format.i_width; - fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); + if( fmt_in.i_chroma == VLC_FOURCC('Y','U','V','A') || + fmt_in.i_chroma == VLC_FOURCC('R','G','B','A') ) + fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); + else + fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); fmt_out.i_width = col_inner_width; fmt_out.i_height = row_inner_height; @@ -632,7 +634,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) else { p_converted = p_es->p_picture; - p_converted->i_refcount++; fmt_in.i_width = fmt_out.i_width = p_converted->format.i_width; fmt_in.i_height = fmt_out.i_height = p_converted->format.i_height; fmt_in.i_chroma = fmt_out.i_chroma = p_converted->format.i_chroma; @@ -640,8 +641,13 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_out.i_visible_height = fmt_out.i_height; } - p_region = p_spu->pf_make_region( VLC_OBJECT(p_filter), &fmt_out, - p_converted ); + p_region = subpicture_region_New( &fmt_out ); + /* FIXME the copy is probably not needed anymore */ + if( p_region ) + picture_Copy( p_region->p_picture, p_converted ); + if( !p_sys->b_keep ) + picture_Release( p_converted ); + if( !p_region ) { msg_Err( p_filter, "cannot allocate SPU region" ); @@ -651,64 +657,56 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) return p_spu; } - /* HACK ALERT: let's fix the pointers to avoid picture duplication. - * This is necessary because p_region->picture is not a pointer - * as it ought to be. */ - if( !p_sys->b_keep ) - { - free( p_converted ); - } - else + if( p_es->i_x >= 0 && p_es->i_y >= 0 ) { - /* Keep a pointer to the original picture (and its refcount...). */ - p_region->picture.p_sys = (picture_sys_t *)p_converted; - p_region->picture.pf_release = MosaicReleasePicture; + p_region->i_x = p_es->i_x; + p_region->i_y = p_es->i_y; } - - if( p_sys->i_position == position_offsets ) + else if( p_sys->i_position == position_offsets ) { p_region->i_x = p_sys->pi_x_offsets[i_real_index]; - } - else if( fmt_out.i_width > col_inner_width || - p_sys->b_ar || p_sys->b_keep ) - { - /* we don't have to center the video since it takes the - whole rectangle area or it's larger than the rectangle */ - p_region->i_x = p_sys->i_xoffset - + i_col * ( p_sys->i_width / p_sys->i_cols ) - + ( i_col * p_sys->i_borderw ) / p_sys->i_cols; - } - else - { - /* center the video in the dedicated rectangle */ - p_region->i_x = p_sys->i_xoffset - + i_col * ( p_sys->i_width / p_sys->i_cols ) - + ( i_col * p_sys->i_borderw ) / p_sys->i_cols - + ( col_inner_width - fmt_out.i_width ) / 2; - } - - if( p_sys->i_position == position_offsets ) - { p_region->i_y = p_sys->pi_y_offsets[i_real_index]; } - else if( fmt_out.i_height < row_inner_height - || p_sys->b_ar || p_sys->b_keep ) - { - /* we don't have to center the video since it takes the - whole rectangle area or it's taller than the rectangle */ - p_region->i_y = p_sys->i_yoffset - + i_row * ( p_sys->i_height / p_sys->i_rows ) - + ( i_row * p_sys->i_borderh ) / p_sys->i_rows; - } else { - /* center the video in the dedicated rectangle */ - p_region->i_y = p_sys->i_yoffset - + i_row * ( p_sys->i_height / p_sys->i_rows ) - + ( i_row * p_sys->i_borderh ) / p_sys->i_rows - + ( row_inner_height - fmt_out.i_height ) / 2; + if( fmt_out.i_width > col_inner_width || + p_sys->b_ar || p_sys->b_keep ) + { + /* we don't have to center the video since it takes the + whole rectangle area or it's larger than the rectangle */ + p_region->i_x = p_sys->i_xoffset + + i_col * ( p_sys->i_width / p_sys->i_cols ) + + ( i_col * p_sys->i_borderw ) / p_sys->i_cols; + } + else + { + /* center the video in the dedicated rectangle */ + p_region->i_x = p_sys->i_xoffset + + i_col * ( p_sys->i_width / p_sys->i_cols ) + + ( i_col * p_sys->i_borderw ) / p_sys->i_cols + + ( col_inner_width - fmt_out.i_width ) / 2; + } + + if( fmt_out.i_height > row_inner_height + || p_sys->b_ar || p_sys->b_keep ) + { + /* we don't have to center the video since it takes the + whole rectangle area or it's taller than the rectangle */ + p_region->i_y = p_sys->i_yoffset + + i_row * ( p_sys->i_height / p_sys->i_rows ) + + ( i_row * p_sys->i_borderh ) / p_sys->i_rows; + } + else + { + /* center the video in the dedicated rectangle */ + p_region->i_y = p_sys->i_yoffset + + i_row * ( p_sys->i_height / p_sys->i_rows ) + + ( i_row * p_sys->i_borderh ) / p_sys->i_rows + + ( row_inner_height - fmt_out.i_height ) / 2; + } } p_region->i_align = p_sys->i_align; + p_region->i_alpha = p_es->i_alpha; if( p_region_prev == NULL ) { @@ -735,6 +733,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *) p_data; #define VAR_IS( a ) !strcmp( psz_var, CFG_PREFIX a )