X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=4a16f224ac364daf264c6dba0e1e6a124f588a29;hb=a804eaa4782f3f8a384c19a223383be309e62023;hp=b62da83cdcc90ebc3db6e88d968d9500dbc2b12d;hpb=20fa5b0a9e8fdadb660b1c2ced348f51977f272f;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index b62da83cdc..4a16f224ac 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -174,13 +174,13 @@ static const char *const ppsz_align_descriptions[] = #define CFG_PREFIX "mosaic-" -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 ); +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 ); @@ -192,7 +192,7 @@ vlc_module_begin(); add_integer( CFG_PREFIX "align", 5, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true); - change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); + change_integer_list( pi_align_values, ppsz_align_descriptions, NULL ); add_integer( CFG_PREFIX "xoffset", 0, NULL, XOFFSET_TEXT, XOFFSET_LONGTEXT, true ); @@ -201,14 +201,14 @@ vlc_module_begin(); add_integer( CFG_PREFIX "borderw", 0, NULL, BORDERW_TEXT, BORDERW_LONGTEXT, true ); - add_deprecated_alias( CFG_PREFIX "vborder" ); + add_deprecated_alias( CFG_PREFIX "vborder" ) add_integer( CFG_PREFIX "borderh", 0, NULL, BORDERH_TEXT, BORDERH_LONGTEXT, true ); - add_deprecated_alias( CFG_PREFIX "hborder" ); + 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 ); + change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_integer( CFG_PREFIX "rows", 2, NULL, ROWS_TEXT, ROWS_LONGTEXT, false ); add_integer( CFG_PREFIX "cols", 2, NULL, @@ -227,7 +227,7 @@ vlc_module_begin(); add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, false ); -vlc_module_end(); +vlc_module_end () static const char *const ppsz_filter_options[] = { "alpha", "height", "width", "align", "xoffset", "yoffset", @@ -448,11 +448,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; @@ -460,7 +458,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 ); @@ -498,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 */ @@ -599,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; @@ -633,7 +634,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) else { p_converted = p_es->p_picture; - picture_Yield( p_converted ); 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; @@ -641,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" ); @@ -652,20 +657,6 @@ 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 - { - /* 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;