X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=faae53dd0ea2055c5177f108922738bb87e99aff;hb=122b75e99e787d9f7504e11708fdd17600f4db72;hp=f2e75cc54022164ec527ede53eca943a18d9702e;hpb=97897eeeb22b1238e56632b16cda1a0375ae7708;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index f2e75cc540..faae53dd0e 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -29,18 +29,18 @@ # include "config.h" #endif -#include -#include +#include +#include #include #include /* INT_MAX */ -#include "vlc_filter.h" -#include "vlc_image.h" +#include +#include #include "mosaic.h" -#define BLANK_DELAY I64C(1000000) +#define BLANK_DELAY INT64_C(1000000) /***************************************************************************** * Local prototypes @@ -162,73 +162,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_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL, - ALPHA_TEXT, ALPHA_LONGTEXT, false ); + ALPHA_TEXT, ALPHA_LONGTEXT, false ) add_integer( CFG_PREFIX "height", 100, NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, false ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) add_integer( CFG_PREFIX "width", 100, NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, false ); + WIDTH_TEXT, WIDTH_LONGTEXT, false ) add_integer( CFG_PREFIX "align", 5, NULL, - ALIGN_TEXT, ALIGN_LONGTEXT, 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, true ); + XOFFSET_TEXT, XOFFSET_LONGTEXT, true ) add_integer( CFG_PREFIX "yoffset", 0, NULL, - YOFFSET_TEXT, YOFFSET_LONGTEXT, true ); + YOFFSET_TEXT, YOFFSET_LONGTEXT, true ) add_integer( CFG_PREFIX "borderw", 0, NULL, - BORDERW_TEXT, BORDERW_LONGTEXT, 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, 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, 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, false ); + ROWS_TEXT, ROWS_LONGTEXT, false ) add_integer( CFG_PREFIX "cols", 2, NULL, - COLS_TEXT, COLS_LONGTEXT, false ); + COLS_TEXT, COLS_LONGTEXT, false ) - add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL, - AR_TEXT, AR_LONGTEXT, false ); - add_bool( CFG_PREFIX "keep-picture", 0, NULL, - KEEP_TEXT, KEEP_LONGTEXT, false ); + add_bool( CFG_PREFIX "keep-aspect-ratio", false, NULL, + AR_TEXT, AR_LONGTEXT, false ) + add_bool( CFG_PREFIX "keep-picture", false, NULL, + KEEP_TEXT, KEEP_LONGTEXT, false ) add_string( CFG_PREFIX "order", "", NULL, - ORDER_TEXT, ORDER_LONGTEXT, false ); + ORDER_TEXT, ORDER_LONGTEXT, false ) add_string( CFG_PREFIX "offsets", "", NULL, - OFFSETS_TEXT, OFFSETS_LONGTEXT, false ); + OFFSETS_TEXT, OFFSETS_LONGTEXT, false ) add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, - 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", @@ -254,14 +254,14 @@ static void __mosaic_ParseSetOffsets( vlc_object_t *p_this, { i_index++; - p_sys->pi_x_offsets = - realloc( p_sys->pi_x_offsets, i_index * sizeof(int) ); + p_sys->pi_x_offsets = xrealloc( p_sys->pi_x_offsets, + i_index * sizeof(int) ); p_sys->pi_x_offsets[i_index - 1] = atoi( psz_offsets ); psz_end = strchr( psz_offsets, ',' ); psz_offsets = psz_end + 1; - p_sys->pi_y_offsets = - realloc( p_sys->pi_y_offsets, i_index * sizeof(int) ); + p_sys->pi_y_offsets = xrealloc( p_sys->pi_y_offsets, + i_index * sizeof(int) ); p_sys->pi_y_offsets[i_index - 1] = atoi( psz_offsets ); psz_end = strchr( psz_offsets, ',' ); psz_offsets = psz_end + 1; @@ -283,10 +283,11 @@ 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 = VLC_OBJECT( p_filter->p_libvlc ); - char *psz_order; + char *psz_order, *_psz_order; char *psz_offsets; int i_index; vlc_value_t val; + int i_command; /* The mosaic thread is more important than the decoder threads */ vlc_thread_set_priority( p_this, VLC_THREAD_PRIORITY_OUTPUT ); @@ -294,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 ); @@ -312,8 +310,8 @@ static int CreateFilter( vlc_object_t *p_this ) p_filter->p_cfg ); #define GET_VAR( name, min, max ) \ - p_sys->i_##name = __MIN( max, __MAX( min, \ - var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ) ) ); \ + i_command = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ); \ + p_sys->i_##name = __MIN( max, __MAX( min, i_command ) ); \ var_AddCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys ); GET_VAR( width, 0, INT_MAX ); @@ -332,6 +330,7 @@ static int CreateFilter( vlc_object_t *p_this ) GET_VAR( alpha, 0, 255 ); GET_VAR( position, 0, 2 ); GET_VAR( delay, 100, INT_MAX ); +#undef GET_VAR p_sys->i_delay *= 1000; p_sys->b_ar = var_CreateGetBoolCommand( p_filter, @@ -349,6 +348,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 ) @@ -359,8 +359,8 @@ static int CreateFilter( vlc_object_t *p_this ) { psz_end = strchr( psz_order, ',' ); i_index++; - p_sys->ppsz_order = realloc( p_sys->ppsz_order, - i_index * sizeof(char *) ); + p_sys->ppsz_order = xrealloc( p_sys->ppsz_order, + i_index * sizeof(char *) ); p_sys->ppsz_order[i_index - 1] = strndup( psz_order, psz_end - psz_order ); psz_order = psz_end+1; @@ -368,12 +368,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 ); @@ -388,9 +391,27 @@ static void DestroyFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t*)p_this; filter_sys_t *p_sys = p_filter->p_sys; - int i_index; - vlc_mutex_lock( &p_sys->lock ); +#define DEL_CB( name ) \ + var_DelCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys ) + DEL_CB( width ); + DEL_CB( height ); + DEL_CB( xoffset ); + DEL_CB( yoffset ); + + DEL_CB( align ); + + DEL_CB( borderw ); + DEL_CB( borderh ); + DEL_CB( rows ); + DEL_CB( cols ); + DEL_CB( alpha ); + DEL_CB( position ); + DEL_CB( delay ); + + DEL_CB( keep-aspect-ratio ); + DEL_CB( order ); +#undef DEL_CB if( !p_sys->b_keep ) { @@ -399,7 +420,7 @@ static void DestroyFilter( vlc_object_t *p_this ) if( p_sys->i_order_length ) { - for( i_index = 0; i_index < p_sys->i_order_length; i_index++ ) + for( int i_index = 0; i_index < p_sys->i_order_length; i_index++ ) { free( p_sys->ppsz_order[i_index] ); } @@ -412,21 +433,10 @@ static void DestroyFilter( vlc_object_t *p_this ) p_sys->i_offsets_length = 0; } - vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); } -/***************************************************************************** - * MosaicReleasePicture : Hack to avoid picture duplication - *****************************************************************************/ -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 ); -} - /***************************************************************************** * Filter *****************************************************************************/ @@ -446,11 +456,9 @@ 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; @@ -458,7 +466,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) p_spu->i_stop = 0; 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 = false; vlc_mutex_lock( &p_sys->lock ); @@ -496,7 +503,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 */ @@ -544,14 +551,14 @@ 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; @@ -597,7 +604,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_CODEC_YUVA || + fmt_in.i_chroma == VLC_CODEC_RGBA ) + fmt_out.i_chroma = VLC_CODEC_YUVA; + else + fmt_out.i_chroma = VLC_CODEC_I420; fmt_out.i_width = col_inner_width; fmt_out.i_height = row_inner_height; @@ -631,7 +642,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; @@ -639,31 +649,22 @@ 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" ); p_filter->pf_sub_buffer_del( p_filter, p_spu ); - vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_unlock( p_sys->p_lock ); + vlc_mutex_unlock( &p_sys->lock ); 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 - { - /* 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; - } - if( p_es->i_x >= 0 && p_es->i_y >= 0 ) { p_region->i_x = p_es->i_x; @@ -748,7 +749,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing alpha from %d/255 to %d/255", - p_sys->i_alpha, newval.i_int); + p_sys->i_alpha, (int)newval.i_int); p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -756,7 +757,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing height from %dpx to %dpx", - p_sys->i_height, newval.i_int ); + p_sys->i_height, (int)newval.i_int ); p_sys->i_height = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -764,7 +765,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing width from %dpx to %dpx", - p_sys->i_width, newval.i_int ); + p_sys->i_width, (int)newval.i_int ); p_sys->i_width = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -772,7 +773,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing x offset from %dpx to %dpx", - p_sys->i_xoffset, newval.i_int ); + p_sys->i_xoffset, (int)newval.i_int ); p_sys->i_xoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -780,7 +781,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing y offset from %dpx to %dpx", - p_sys->i_yoffset, newval.i_int ); + p_sys->i_yoffset, (int)newval.i_int ); p_sys->i_yoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -795,7 +796,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, while( pi_align_values[i_new] != newval.i_int ) i_new++; msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)", p_sys->i_align, ppsz_align_descriptions[i_old], - newval.i_int, ppsz_align_descriptions[i_new] ); + (int)newval.i_int, ppsz_align_descriptions[i_new] ); p_sys->i_align = newval.i_int; vlc_mutex_unlock( &p_sys->lock ); } @@ -803,7 +804,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing border width from %dpx to %dpx", - p_sys->i_borderw, newval.i_int ); + p_sys->i_borderw, (int)newval.i_int ); p_sys->i_borderw = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -811,7 +812,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing border height from %dpx to %dpx", - p_sys->i_borderh, newval.i_int ); + p_sys->i_borderh, (int)newval.i_int ); p_sys->i_borderh = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -830,7 +831,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)", p_sys->i_position, ppsz_pos_descriptions[p_sys->i_position], - newval.i_int, ppsz_pos_descriptions[newval.i_int]); + (int)newval.i_int, ppsz_pos_descriptions[newval.i_int]); p_sys->i_position = newval.i_int; vlc_mutex_unlock( &p_sys->lock ); } @@ -839,7 +840,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of rows from %d to %d", - p_sys->i_rows, newval.i_int ); + p_sys->i_rows, (int)newval.i_int ); p_sys->i_rows = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -847,7 +848,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of columns from %d to %d", - p_sys->i_cols, newval.i_int ); + p_sys->i_cols, (int)newval.i_int ); p_sys->i_cols = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -875,8 +876,8 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { psz_end = strchr( psz_order, ',' ); i_index++; - p_sys->ppsz_order = realloc( p_sys->ppsz_order, - i_index * sizeof(char *) ); + p_sys->ppsz_order = xrealloc( p_sys->ppsz_order, + i_index * sizeof(char *) ); p_sys->ppsz_order[i_index - 1] = strndup( psz_order, psz_end - psz_order ); psz_order = psz_end+1;