#include "../libvlc.h"
#include <assert.h>
+#include <limits.h>
/*****************************************************************************
* Local prototypes
static int SubFilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static int sub_filter_allocation_init( filter_t *, void * );
-static void sub_filter_allocation_clear( filter_t * );
+static int SubFilterAllocationInit( filter_t *, void * );
+static void SubFilterAllocationClean( filter_t * );
struct filter_owner_sys_t
{
spu_t *p_spu;
int i_channel;
};
-enum {
- SCALE_DEFAULT,
- SCALE_TEXT,
- SCALE_SIZE
-};
-
#define SCALE_UNIT (1000)
-static void FilterRelease( filter_t *p_filter )
-{
- if( p_filter->p_module )
- module_Unneed( p_filter, p_filter->p_module );
-
- vlc_object_detach( p_filter );
- vlc_object_release( p_filter );
-}
+/* */
+static void SpuRenderCreateAndLoadText( spu_t *p_spu );
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu );
+static void FilterRelease( filter_t *p_filter );
/**
* Creates the subpicture unit
int i_index;
spu_t *p_spu = vlc_custom_create( p_this, sizeof( spu_t ),
VLC_OBJECT_GENERIC, "subpicture" );
-
+ /* */
+ p_spu->i_subpicture_order = 1;
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
{
p_spu->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
vlc_object_attach( p_spu, p_this );
p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false,
- sub_filter_allocation_init,
- sub_filter_allocation_clear,
+ SubFilterAllocationInit,
+ SubFilterAllocationClean,
p_spu );
+
+ /* Load text and scale module */
+ SpuRenderCreateAndLoadText( p_spu );
+ SpuRenderCreateAndLoadScale( p_spu );
+
return p_spu;
}
}
}
+
+/* */
+static void RegionPictureRelease( picture_t *p_picture )
+{
+ if( --p_picture->i_refcount > 0 )
+ return;
+
+ assert( p_picture->i_refcount == 0 );
+ free( p_picture->p_q );
+ free( p_picture->p_data_orig );
+ free( p_picture->p_sys );
+}
+
/**
* Create a subpicture region
*
* \param p_this vlc_object_t
* \param p_fmt the format that this subpicture region should have
*/
-static void RegionPictureRelease( picture_t *p_pic )
-{
- free( p_pic->p_data_orig );
- /* We use pf_release nullity to know if the picture has already been released. */
- p_pic->pf_release = NULL;
-}
subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this,
video_format_t *p_fmt )
{
- subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
- if( !p_region ) return NULL;
+ subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
+ if( !p_region )
+ return NULL;
+
+ /* FIXME is that *really* wanted? */
+ if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
+ p_fmt->p_palette = calloc( 1, sizeof(video_palette_t) );
+ else
+ p_fmt->p_palette = NULL; /* XXX and that above all? */
- memset( p_region, 0, sizeof(subpicture_region_t) );
+ p_region->fmt = *p_fmt;
p_region->i_alpha = 0xff;
p_region->p_next = NULL;
p_region->p_cache = NULL;
- p_region->fmt = *p_fmt;
p_region->psz_text = NULL;
p_region->p_style = NULL;
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
- p_fmt->p_palette = p_region->fmt.p_palette =
- malloc( sizeof(video_palette_t) );
- else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
-
- p_region->picture.p_data_orig = NULL;
-
- if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region;
+ if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') )
+ return p_region;
vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma,
p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
if( !p_region->picture.i_planes )
{
- free( p_region );
free( p_fmt->p_palette );
+ free( p_region );
return NULL;
}
- p_region->picture.pf_release = RegionPictureRelease;
-
- return p_region;
-}
-
-/**
- * Make a subpicture region from an existing picture_t
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- * \param p_pic a pointer to the picture creating the region (not freed)
- */
-subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
- video_format_t *p_fmt,
- picture_t *p_pic )
-{
- subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
- (void)p_this;
- if( !p_region ) return NULL;
- memset( p_region, 0, sizeof(subpicture_region_t) );
- p_region->i_alpha = 0xff;
- p_region->p_next = 0;
- p_region->p_cache = 0;
- p_region->fmt = *p_fmt;
- p_region->psz_text = 0;
- p_region->p_style = NULL;
-
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
- p_fmt->p_palette = p_region->fmt.p_palette =
- malloc( sizeof(video_palette_t) );
- else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
-
- memcpy( &p_region->picture, p_pic, sizeof(picture_t) );
+ p_region->picture.i_refcount = 1;
p_region->picture.pf_release = RegionPictureRelease;
return p_region;
*/
void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
{
- if( !p_region ) return;
- if( p_region->picture.pf_release )
- p_region->picture.pf_release( &p_region->picture );
+ if( !p_region )
+ return;
+
+ picture_Release( &p_region->picture );
+
free( p_region->fmt.p_palette );
- if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache );
+ if( p_region->p_cache )
+ __spu_DestroyRegion( p_this, p_region->p_cache );
free( p_region->psz_text );
free( p_region->psz_html );
p_subpic, p_subpic->i_status );
}
- /* Remove reservation flag */
- p_subpic->i_status = READY_SUBPICTURE;
-
if( p_subpic->i_channel == DEFAULT_CHAN )
{
p_subpic->i_channel = 0xFFFF;
spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
p_subpic->i_channel = DEFAULT_CHAN;
}
+
+ /* Remove reservation flag */
+ p_subpic->i_status = READY_SUBPICTURE;
}
/**
/* Copy subpicture information, set some default values */
memset( p_subpic, 0, sizeof(subpicture_t) );
+ p_subpic->i_order = p_spu->i_subpicture_order++;
p_subpic->i_status = RESERVED_SUBPICTURE;
p_subpic->b_absolute = true;
p_subpic->b_fade = false;
vlc_mutex_unlock( &p_spu->subpicture_lock );
p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
p_subpic->pf_destroy_region = __spu_DestroyRegion;
return p_subpic;
vlc_mutex_unlock( &p_spu->subpicture_lock );
}
-/*****************************************************************************
- * spu_RenderSubpictures: render a subpicture list
- *****************************************************************************
- * This function renders all sub picture units in the list.
- *****************************************************************************/
+static void FilterRelease( filter_t *p_filter )
+{
+ if( p_filter->p_module )
+ module_Unneed( p_filter, p_filter->p_module );
+
+ vlc_object_detach( p_filter );
+ vlc_object_release( p_filter );
+}
+
static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect )
{
filter_t *p_blend;
if( !p_blend->p_module )
p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
}
-static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height )
+static void SpuRenderCreateAndLoadText( spu_t *p_spu )
{
filter_t *p_text;
es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 );
p_text->fmt_out.video.i_width =
- p_text->fmt_out.video.i_visible_width = i_width;
+ p_text->fmt_out.video.i_visible_width = 32;
p_text->fmt_out.video.i_height =
- p_text->fmt_out.video.i_visible_height = i_height;
+ p_text->fmt_out.video.i_visible_height = 32;
p_text->pf_sub_buffer_new = spu_new_buffer;
p_text->pf_sub_buffer_del = spu_del_buffer;
return p_scale;
}
-
static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
{
/* FIXME: We'll also be using it for YUVA and RGBA blending ... */
p_region->i_align |= SUBPICTURE_RENDERED;
}
+/**
+ * A few scale functions helpers.
+ */
+typedef struct
+{
+ int w;
+ int h;
+} spu_scale_t;
+
+static spu_scale_t spu_scale_create( int w, int h )
+{
+ spu_scale_t s = { .w = w, .h = h };
+ if( s.w <= 0 )
+ s.w = SCALE_UNIT;
+ if( s.h <= 0 )
+ s.h = SCALE_UNIT;
+ return s;
+}
+static spu_scale_t spu_scale_unit(void )
+{
+ return spu_scale_create( SCALE_UNIT, SCALE_UNIT );
+}
+static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd )
+{
+ return spu_scale_create( wn * SCALE_UNIT / wd,
+ hn * SCALE_UNIT / hd );
+}
+static int spu_scale_w( int v, const spu_scale_t s )
+{
+ return v * s.w / SCALE_UNIT;
+}
+static int spu_scale_h( int v, const spu_scale_t s )
+{
+ return v * s.h / SCALE_UNIT;
+}
+static int spu_invscale_w( int v, const spu_scale_t s )
+{
+ return v * SCALE_UNIT / s.w;
+}
+static int spu_invscale_h( int v, const spu_scale_t s )
+{
+ return v * SCALE_UNIT / s.h;
+}
+
+/**
+ * A few area functions helpers
+ */
+
+typedef struct
+{
+ int i_x;
+ int i_y;
+ int i_width;
+ int i_height;
+
+ spu_scale_t scale;
+} spu_area_t;
+
+static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s )
+{
+ spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s };
+ return a;
+}
+static spu_area_t spu_area_scaled( spu_area_t a )
+{
+ if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT )
+ return a;
+
+ a.i_x = spu_scale_w( a.i_x, a.scale );
+ a.i_y = spu_scale_h( a.i_y, a.scale );
+
+ a.i_width = spu_scale_w( a.i_width, a.scale );
+ a.i_height = spu_scale_h( a.i_height, a.scale );
+
+ a.scale = spu_scale_unit();
+ return a;
+}
+static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s )
+{
+ if( a.scale.w == s.w && a.scale.h == s.h )
+ return a;
+
+ a = spu_area_scaled( a );
+
+ a.i_x = spu_invscale_w( a.i_x, s );
+ a.i_y = spu_invscale_h( a.i_y, s );
+
+ a.i_width = spu_invscale_w( a.i_width, s );
+ a.i_height = spu_invscale_h( a.i_height, s );
+
+ a.scale = s;
+ return a;
+}
+static bool spu_area_overlap( spu_area_t a, spu_area_t b )
+{
+ const int i_dx = 0;
+ const int i_dy = 0;
+
+ a = spu_area_scaled( a );
+ b = spu_area_scaled( b );
+
+ return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) &&
+ __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height );
+}
+
+/**
+ * Avoid area overlapping
+ */
+static void SpuAreaFixOverlap( spu_area_t *p_dst,
+ const spu_area_t *p_master,
+ const spu_area_t *p_sub, int i_sub, int i_align )
+{
+ spu_area_t a = spu_area_scaled( *p_dst );
+ bool b_moved = false;
+ bool b_ok;
+
+ assert( p_master->i_x == 0 && p_master->i_y == 0 );
+
+ /* Check for overlap
+ * XXX It is not fast O(n^2) but we should not have a lot of region */
+ do
+ {
+ b_ok = true;
+ for( int i = 0; i < i_sub; i++ )
+ {
+ spu_area_t sub = spu_area_scaled( p_sub[i] );
+
+ if( !spu_area_overlap( a, sub ) )
+ continue;
+
+ if( i_align & SUBPICTURE_ALIGN_TOP )
+ {
+ /* We go down */
+ int i_y = sub.i_y + sub.i_height;
+ if( i_y + a.i_height > p_master->i_height )
+ break;
+ a.i_y = i_y;
+ b_moved = true;
+ }
+ else if( i_align & SUBPICTURE_ALIGN_BOTTOM )
+ {
+ /* We go up */
+ int i_y = sub.i_y - a.i_height;
+ if( i_y < 0 )
+ break;
+ a.i_y = i_y;
+ b_moved = true;
+ }
+ else
+ {
+ /* TODO what to do in this case? */
+ //fprintf( stderr, "Overlap with unsupported alignment\n" );
+ break;
+ }
+
+ b_ok = false;
+ break;
+ }
+ } while( !b_ok );
+
+ if( b_moved )
+ *p_dst = spu_area_unscaled( a, p_dst->scale );
+}
+
+
/**
* Place a region
*/
static void SpuRegionPlace( int *pi_x, int *pi_y,
- const video_format_t *p_fmt,
const subpicture_t *p_subpic,
const subpicture_region_t *p_region,
- int i_subpic_x,
- int i_inv_scale_x, int i_inv_scale_y,
- int i_scale_width, int i_scale_height )
+ int i_margin_y )
{
- /* FIXME i_delta_x/y and i_x/y in absolute mode does not use the same
- * it seems weird unless I missed something
- * At this point we have:
- * i_subpic_x == p_subpic->i_x * i_scale_width / SCALE_UNIT
- * p_region->i_x/i_y have already been scaled by i_scale_width/i_scale_height.
- * */
- int i_delta_x = ( i_subpic_x + p_region->i_x ) *
- i_inv_scale_x / SCALE_UNIT;
- int i_delta_y = ( p_subpic->i_y + p_region->i_y ) *
- i_inv_scale_y / SCALE_UNIT;
+ const int i_delta_x = p_region->i_x;
+ const int i_delta_y = p_region->i_y;
int i_x, i_y;
+ assert( p_region->i_x != INT_MAX && p_region->i_y != INT_MAX );
if( p_region->i_align & SUBPICTURE_ALIGN_TOP )
{
i_y = i_delta_y;
}
else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM )
{
- i_y = p_fmt->i_height - p_region->fmt.i_height - i_delta_y;
+ i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y;
}
else
{
- i_y = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
+ i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2;
}
if( p_region->i_align & SUBPICTURE_ALIGN_LEFT )
}
else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
{
- i_x = p_fmt->i_width - p_region->fmt.i_width - i_delta_x;
+ i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x;
}
else
{
- i_x = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
+ i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2;
}
if( p_subpic->b_absolute )
{
- i_x = (p_region->i_x + i_subpic_x * i_scale_width / SCALE_UNIT) *
- i_inv_scale_x / SCALE_UNIT;
- i_y = (p_region->i_y + p_subpic->i_y * i_scale_height / SCALE_UNIT) *
- i_inv_scale_y / SCALE_UNIT;
+ i_x = i_delta_x;
+ i_y = i_delta_y;
}
- *pi_x = __MAX( i_x, 0 );
- *pi_y = __MAX( i_y, 0 );
+ /* Margin shifts all subpictures */
+ if( i_margin_y != 0 )
+ i_y -= i_margin_y;
+
+ /* Clamp offset to not go out of the screen (when possible) */
+ const int i_error_x = (i_x + p_region->fmt.i_width) - p_subpic->i_original_picture_width;
+ if( i_error_x > 0 )
+ i_x -= i_error_x;
+ if( i_x < 0 )
+ i_x = 0;
+
+ const int i_error_y = (i_y + p_region->fmt.i_height) - p_subpic->i_original_picture_height;
+ if( i_error_y > 0 )
+ i_y -= i_error_y;
+ if( i_y < 0 )
+ i_y = 0;
+
+ *pi_x = i_x;
+ *pi_y = i_y;
}
+/**
+ * This function computes the current alpha value for a given region.
+ */
+static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region )
+{
+ /* Compute alpha blend value */
+ int i_fade_alpha = 255;
+ if( p_subpic->b_fade )
+ {
+ mtime_t i_fade_start = ( p_subpic->i_stop +
+ p_subpic->i_start ) / 2;
+ mtime_t i_now = mdate();
+
+ if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
+ {
+ i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
+ ( p_subpic->i_stop - i_fade_start );
+ }
+ }
+ return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025;
+}
+
+/**
+ * It will render the provided region onto p_pic_dst.
+ */
+
static void SpuRenderRegion( spu_t *p_spu,
- picture_t *p_pic_dst,
+ picture_t *p_pic_dst, spu_area_t *p_area,
subpicture_t *p_subpic, subpicture_region_t *p_region,
- const int i_scale_width_orig, const int i_scale_height_orig,
- const int pi_subpic_x[SCALE_SIZE],
- const int pi_scale_width[SCALE_SIZE],
- const int pi_scale_height[SCALE_SIZE],
- const video_format_t *p_fmt )
+ const spu_scale_t scale_size,
+ const video_format_t *p_fmt,
+ const spu_area_t *p_subtitle_area, int i_subtitle_area )
{
- video_format_t fmt_original;
- bool b_rerender_text;
+ video_format_t fmt_original = p_region->fmt;
+ bool b_rerender_text = false;
bool b_restore_format = false;
- int i_fade_alpha;
int i_x_offset;
int i_y_offset;
- int i_scale_idx;
- int i_inv_scale_x;
- int i_inv_scale_y;
filter_t *p_scale;
vlc_assert_locked( &p_spu->subpicture_lock );
- fmt_original = p_region->fmt;
- b_rerender_text = false;
+ /* Invalidate area by default */
+ *p_area = spu_area_create( 0,0, 0,0, scale_size );
+
+ /* Render text region */
if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
{
- SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, __MIN(i_scale_width_orig, i_scale_height_orig) );
+ const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */
+ SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio );
b_restore_format = b_rerender_text;
/* Check if the rendering has failed ... */
goto exit;
}
- if( p_region->i_align & SUBPICTURE_RENDERED )
- {
- /* We are using a region which come from rendered text */
- i_scale_idx = SCALE_TEXT;
- i_inv_scale_x = i_scale_width_orig;
- i_inv_scale_y = i_scale_height_orig;
- }
- else
- {
- i_scale_idx = SCALE_DEFAULT;
- i_inv_scale_x = SCALE_UNIT;
- i_inv_scale_y = SCALE_UNIT;
- }
-
/* Force palette if requested
* FIXME b_force_palette and b_force_crop are applied to all subpictures using palette
* instead of only the right one (being the dvd spu).
const bool b_force_palette = b_using_palette && p_spu->b_force_palette;
const bool b_force_crop = b_force_palette && p_spu->b_force_crop;
+
+ /* Compute the margin which is expressed in destination pixel unit
+ * The margin is applied only to subtitle and when no forced crop is
+ * requested (dvd menu) */
+ int i_margin_y = 0;
+ if( !b_force_crop && p_subpic->b_subtitle )
+ i_margin_y = spu_invscale_h( p_spu->i_margin, scale_size );
+
+ /* Place the picture
+ * We compute the position in the rendered size */
+ SpuRegionPlace( &i_x_offset, &i_y_offset,
+ p_subpic, p_region, i_margin_y );
+
+ /* Save this position for subtitle overlap support
+ * it is really important that there are given without scale_size applied */
+ *p_area = spu_area_create( i_x_offset, i_y_offset,
+ p_region->fmt.i_width, p_region->fmt.i_height,
+ scale_size );
+
+ /* Handle overlapping subtitles when possible */
+ if( p_subpic->b_subtitle && !p_subpic->b_absolute )
+ {
+ spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, spu_scale_unit() );
+
+ SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area, p_region->i_align );
+ }
+
+ /* Fix the position for the current scale_size */
+ i_x_offset = spu_scale_w( p_area->i_x, p_area->scale );
+ i_y_offset = spu_scale_h( p_area->i_y, p_area->scale );
+
if( b_force_palette )
{
/* It looks so wrong I won't comment
else
p_scale = p_spu->p_scale;
+ /* Scale from rendered size to destination size */
if( p_scale &&
- ( ( pi_scale_width[i_scale_idx] > 0 && pi_scale_width[i_scale_idx] != SCALE_UNIT ) ||
- ( pi_scale_height[i_scale_idx] > 0 && pi_scale_height[i_scale_idx] != SCALE_UNIT ) ||
- ( b_force_palette ) ) )
+ ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) )
{
- const unsigned i_dst_width = p_region->fmt.i_width * pi_scale_width[i_scale_idx] / SCALE_UNIT;
- const unsigned i_dst_height = p_region->fmt.i_height * pi_scale_height[i_scale_idx] / SCALE_UNIT;
+ const unsigned i_dst_width = spu_scale_w( p_region->fmt.i_width, scale_size );
+ const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size );
+
+ /* TODO when b_using_palette is true, we should first convert it to YUVA to allow
+ * a proper rescaling */
/* Destroy if cache is unusable */
if( p_region->p_cache )
p_scale->fmt_in.video = p_region->fmt;
p_scale->fmt_out.video = p_region->fmt;
- p_region->p_cache =
- p_subpic->pf_create_region( VLC_OBJECT(p_spu),
- &p_scale->fmt_out.video );
- p_region->p_cache->p_next = p_region->p_next;
-
- if( p_scale->fmt_out.video.p_palette )
- *p_scale->fmt_out.video.p_palette =
- *p_region->fmt.p_palette;
-
- vout_CopyPicture( p_spu, &p_region->p_cache->picture,
- &p_region->picture );
-
p_scale->fmt_out.video.i_width = i_dst_width;
p_scale->fmt_out.video.i_height = i_dst_height;
p_scale->fmt_out.video.i_visible_width =
- p_region->fmt.i_visible_width * pi_scale_width[ i_scale_idx ] / SCALE_UNIT;
+ spu_scale_w( p_region->fmt.i_visible_width, scale_size );
p_scale->fmt_out.video.i_visible_height =
- p_region->fmt.i_visible_height * pi_scale_height[ i_scale_idx ] / SCALE_UNIT;
+ spu_scale_h( p_region->fmt.i_visible_height, scale_size );
- p_region->p_cache->fmt = p_scale->fmt_out.video;
- p_region->p_cache->i_x = p_region->i_x * pi_scale_width[ i_scale_idx ] / SCALE_UNIT;
- p_region->p_cache->i_y = p_region->i_y * pi_scale_height[ i_scale_idx ] / SCALE_UNIT;
- p_region->p_cache->i_align = p_region->i_align;
- p_region->p_cache->i_alpha = p_region->i_alpha;
+ p_region->p_cache =
+ p_subpic->pf_create_region( VLC_OBJECT(p_spu),
+ &p_scale->fmt_out.video );
p_pic = NULL;
if( p_scale->p_module )
- p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture );
- else
- msg_Err( p_spu, "scaling failed (module not loaded)" );
-
+ {
+ picture_Yield( &p_region->picture );
+ p_pic = p_scale->pf_video_filter( p_scale, &p_region->picture );
+ }
if( p_pic )
{
- p_region->p_cache->picture = *p_pic;
- free( p_pic );
+ picture_CopyPixels( &p_region->p_cache->picture, p_pic );
+ picture_Release( p_pic );
+
+ if( p_region->p_cache->fmt.p_palette )
+ *p_region->p_cache->fmt.p_palette = *p_region->fmt.p_palette;
+
+ /* i_x/i_y of cached region should NOT be used. I set them to
+ * an invalid value to catch it (assert) */
+ p_region->p_cache->i_x = INT_MAX;
+ p_region->p_cache->i_y = INT_MAX;
+ p_region->p_cache->i_align = p_region->i_align;
+ p_region->p_cache->i_alpha = p_region->i_alpha;
}
else
{
+ msg_Err( p_spu, "scaling failed (module not loaded)" );
p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
p_region->p_cache );
p_region->p_cache = NULL;
}
}
- /* */
- SpuRegionPlace( &i_x_offset, &i_y_offset,
- p_fmt, p_subpic, p_region, pi_subpic_x[i_scale_idx],
- i_inv_scale_x, i_inv_scale_y,
- pi_scale_width[i_scale_idx], pi_scale_height[i_scale_idx] );
-
- if( p_spu->i_margin != 0 && !b_force_crop )
- {
- int i_diff = 0;
- int i_low = (i_y_offset - p_spu->i_margin) * i_inv_scale_y / SCALE_UNIT;
- int i_high = i_low + p_region->fmt.i_height;
-
- /* crop extra margin to keep within bounds */
- if( i_low < 0 )
- i_diff = i_low;
- if( i_high > (int)p_fmt->i_height )
- i_diff = i_high - p_fmt->i_height;
- i_y_offset -= ( p_spu->i_margin * i_inv_scale_y / SCALE_UNIT + i_diff );
- }
-
/* Force cropping if requested */
if( b_force_crop )
{
video_format_t *p_fmt = &p_region->fmt;
- int i_crop_x = p_spu->i_crop_x * pi_scale_width[ i_scale_idx ] / SCALE_UNIT
- * i_inv_scale_x / SCALE_UNIT;
- int i_crop_y = p_spu->i_crop_y * pi_scale_height[ i_scale_idx ] / SCALE_UNIT
- * i_inv_scale_y / SCALE_UNIT;
- int i_crop_width = p_spu->i_crop_width * pi_scale_width[ i_scale_idx ] / SCALE_UNIT
- * i_inv_scale_x / SCALE_UNIT;
- int i_crop_height = p_spu->i_crop_height * pi_scale_height[ i_scale_idx ] / SCALE_UNIT
- * i_inv_scale_y / SCALE_UNIT;
+ int i_crop_x = spu_scale_w( p_spu->i_crop_x, scale_size );
+ int i_crop_y = spu_scale_h( p_spu->i_crop_y, scale_size );
+ int i_crop_width = spu_scale_w( p_spu->i_crop_width, scale_size );
+ int i_crop_height= spu_scale_h( p_spu->i_crop_height,scale_size );
/* Find the intersection */
if( i_crop_x + i_crop_width <= i_x_offset ||
p_fmt->i_visible_width = i_x_end - i_x;
p_fmt->i_visible_height = i_y_end - i_y;
- i_x_offset = i_x;
- i_y_offset = i_y;
+ i_x_offset = __MAX( i_x, 0 );
+ i_y_offset = __MAX( i_y, 0 );
}
b_restore_format = true;
}
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
-
- /* Compute alpha blend value */
- i_fade_alpha = 255;
- if( p_subpic->b_fade )
- {
- mtime_t i_fade_start = ( p_subpic->i_stop +
- p_subpic->i_start ) / 2;
- mtime_t i_now = mdate();
- if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
- {
- i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
- ( p_subpic->i_stop - i_fade_start );
- }
- }
-
/* Update the blender */
SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt );
if( p_spu->p_blend->p_module )
{
+ const int i_alpha = SpuRegionAlpha( p_subpic, p_region );
+
p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
- &p_region->picture, i_x_offset, i_y_offset,
- i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 );
+ &p_region->picture, i_x_offset, i_y_offset, i_alpha );
}
else
{
p_region->fmt = fmt_original;
}
-void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
- picture_t *p_pic_dst,
+/**
+ * This function compares two 64 bits integers.
+ * It can be used by qsort.
+ */
+static int IntegerCmp( int64_t i0, int64_t i1 )
+{
+ return i0 < i1 ? -1 : i0 > i1 ? 1 : 0;
+}
+/**
+ * This function compares 2 subpictures using the following properties
+ * (ordered by priority)
+ * 1. absolute positionning
+ * 2. start time
+ * 3. creation order
+ *
+ * It can be used by qsort.
+ *
+ * XXX spu_RenderSubpictures depends heavily on this order.
+ */
+static int SubpictureCmp( const void *s0, const void *s1 )
+{
+ subpicture_t *p_subpic0 = *(subpicture_t**)s0;
+ subpicture_t *p_subpic1 = *(subpicture_t**)s1;
+ int r;
+
+ r = IntegerCmp( !p_subpic0->b_absolute, !p_subpic1->b_absolute );
+ if( !r )
+ r = IntegerCmp( p_subpic0->i_start, p_subpic1->i_start );
+ if( !r )
+ r = IntegerCmp( p_subpic0->i_order, p_subpic1->i_order );
+ return r;
+}
+/**
+ * This function renders all sub picture units in the list.
+ */
+void spu_RenderSubpictures( spu_t *p_spu,
+ picture_t *p_pic_dst, const video_format_t *p_fmt_dst,
subpicture_t *p_subpic_list,
- int i_scale_width_orig, int i_scale_height_orig )
+ const video_format_t *p_fmt_src )
{
+ const int i_source_video_width = p_fmt_src->i_width;
+ const int i_source_video_height = p_fmt_src->i_height;
const mtime_t i_current_date = mdate();
- int i_source_video_width;
- int i_source_video_height;
- subpicture_t *p_subpic;
- /* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ unsigned int i_subpicture;
+ subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
- if( i_scale_width_orig <= 0 )
- i_scale_width_orig = SCALE_UNIT;
- if( i_scale_height_orig <= 0 )
- i_scale_height_orig = SCALE_UNIT;
+ unsigned int i_subtitle_region_count;
+ spu_area_t p_subtitle_area_buffer[VOUT_MAX_SUBPICTURES];
+ spu_area_t *p_subtitle_area;
+ int i_subtitle_area;
- i_source_video_width = p_fmt->i_width * SCALE_UNIT / i_scale_width_orig;
- i_source_video_height = p_fmt->i_height * SCALE_UNIT / i_scale_height_orig;
+ /* Get lock */
+ vlc_mutex_lock( &p_spu->subpicture_lock );
- /* Check i_status again to make sure spudec hasn't destroyed the subpic */
- for( p_subpic = p_subpic_list;
- p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE;
+ /* Preprocess subpictures */
+ i_subpicture = 0;
+ i_subtitle_region_count = 0;
+ for( subpicture_t * p_subpic = p_subpic_list;
+ p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */
p_subpic = p_subpic->p_next )
{
- /* If the source video and subtitles stream agree on the size of
- * the video then disregard all further references to the subtitle
- * stream.
- */
- if( ( i_source_video_height == p_subpic->i_original_picture_height ) &&
- ( i_source_video_width == p_subpic->i_original_picture_width ) )
- {
- /* FIXME this looks wrong */
- p_subpic->i_original_picture_height = 0;
- p_subpic->i_original_picture_width = 0;
- }
-
/* */
if( p_subpic->pf_pre_render )
- p_subpic->pf_pre_render( p_fmt, p_spu, p_subpic );
+ p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst );
if( p_subpic->pf_update_regions )
{
- /* TODO do not reverse the scaling that was done before calling
- * spu_RenderSubpictures, just pass it along (or do it inside
- * spu_RenderSubpictures) */
- video_format_t fmt_org = *p_fmt;
+ video_format_t fmt_org = *p_fmt_dst;
fmt_org.i_width =
fmt_org.i_visible_width = i_source_video_width;
fmt_org.i_height =
fmt_org.i_visible_height = i_source_video_height;
- p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, i_current_date );
+ p_subpic->pf_update_regions( p_spu, p_subpic, &fmt_org, i_current_date );
+ }
+
+ /* */
+ if( p_subpic->b_subtitle )
+ {
+ for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
+ i_subtitle_region_count++;
}
+
+ /* */
+ pp_subpicture[i_subpicture++] = p_subpic;
+ }
+
+ /* Be sure we have at least 1 picture to process */
+ if( i_subpicture <= 0 )
+ {
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
+ return;
}
+ /* Now order subpicture array
+ * XXX The order is *really* important for overlap subtitles positionning */
+ qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp );
+
+ /* Allocate area array for subtitle overlap */
+ i_subtitle_area = 0;
+ p_subtitle_area = p_subtitle_area_buffer;
+ if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) )
+ p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) );
+
/* Create the blending module */
if( !p_spu->p_blend )
- SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect );
-
- /* Load the scaling module */
- if( !p_spu->p_scale && !p_spu->p_scale_yuvp )
- SpuRenderCreateAndLoadScale( p_spu );
-
- /* Load the text rendering module; it is possible there is a
- * text region somewhere in the subpicture other than the first
- * element in the region list, so just load it anyway as we'll
- * probably want it sooner or later. */
- if( !p_spu->p_text )
- SpuRenderCreateAndLoadText( p_spu, p_fmt->i_width, p_fmt->i_height );
-
- /* Process all subpictures and regions */
- for( p_subpic = p_subpic_list;
- p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE;
- p_subpic = p_subpic->p_next )
+ SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect );
+
+ /* Process all subpictures and regions (in the right order) */
+ for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ )
{
+ subpicture_t *p_subpic = pp_subpicture[i_index];
subpicture_region_t *p_region;
- int pi_scale_width[ SCALE_SIZE ];
- int pi_scale_height[ SCALE_SIZE ];
- int pi_subpic_x[ SCALE_SIZE ];
- int k;
if( !p_subpic->p_region )
continue;
- /* */
- if( p_spu->p_text )
+ /* FIXME when possible use a better rendering size than source size
+ * (max of display size and source size for example) FIXME */
+ int i_render_width = p_subpic->i_original_picture_width;
+ int i_render_height = p_subpic->i_original_picture_height;
+ if( !i_render_width || !i_render_height )
{
- subpicture_region_t *p_text_region = p_subpic->p_region;
-
- /* Only overwrite the size fields if the region is still in
- * pre-rendered TEXT format. We have to traverse the subregion
- * list because if more than one subregion is present, the text
- * region isn't guarentteed to be the first in the list, and
- * only text regions use this flag. All of this effort assists
- * with the rescaling of text that has been rendered at native
- * resolution, rather than video resolution.
- */
- while( p_text_region &&
- p_text_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') )
- {
- p_text_region = p_text_region->p_next;
- }
+ if( i_render_width != 0 || i_render_height != 0 )
+ msg_Err( p_spu, "unsupported original picture size %dx%d",
+ i_render_width, i_render_height );
- if( p_text_region &&
- ( ( p_text_region->i_align & SUBPICTURE_RENDERED ) == 0 ) )
- {
- if( p_subpic->i_original_picture_height > 0 &&
- p_subpic->i_original_picture_width > 0 )
- {
- p_spu->p_text->fmt_out.video.i_width =
- p_spu->p_text->fmt_out.video.i_visible_width =
- p_subpic->i_original_picture_width;
- p_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_subpic->i_original_picture_height;
- }
- else
- {
- p_spu->p_text->fmt_out.video.i_width =
- p_spu->p_text->fmt_out.video.i_visible_width =
- p_fmt->i_width;
- p_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_fmt->i_height;
- }
- }
-
- /* XXX for text:
- * scale[] allows to pass from rendered size (by text module) to video output size */
- pi_scale_width[SCALE_TEXT] = p_fmt->i_width * SCALE_UNIT /
- p_spu->p_text->fmt_out.video.i_width;
- pi_scale_height[SCALE_TEXT]= p_fmt->i_height * SCALE_UNIT /
- p_spu->p_text->fmt_out.video.i_height;
- }
- else
- {
- /* Just set a value to avoid using invalid memory while looping over the array */
- pi_scale_width[SCALE_TEXT] =
- pi_scale_height[SCALE_TEXT]= SCALE_UNIT;
+ p_subpic->i_original_picture_width = i_render_width = i_source_video_width;
+ p_subpic->i_original_picture_height = i_render_height = i_source_video_height;
}
- /* XXX for default:
- * scale[] allows to pass from native (either video or original) size to output size */
- if( p_subpic->i_original_picture_height > 0 &&
- p_subpic->i_original_picture_width > 0 )
- {
- pi_scale_width[SCALE_DEFAULT] = p_fmt->i_width * SCALE_UNIT / p_subpic->i_original_picture_width;
- pi_scale_height[SCALE_DEFAULT] = p_fmt->i_height * SCALE_UNIT / p_subpic->i_original_picture_height;
- }
- else
+ if( p_spu->p_text )
{
- pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig;
- pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig;
- }
+ p_spu->p_text->fmt_out.video.i_width =
+ p_spu->p_text->fmt_out.video.i_visible_width = i_render_width;
- for( k = 0; k < SCALE_SIZE ; k++ )
- {
- /* Case of both width and height being specified has been dealt
- * with above by instead rendering to an output pane of the
- * explicit dimensions specified - we don't need to scale it.
- */
- if( p_subpic->i_original_picture_height > 0 &&
- p_subpic->i_original_picture_width <= 0 )
- {
- pi_scale_height[ k ] = pi_scale_height[ k ] * i_source_video_height /
- p_subpic->i_original_picture_height;
- pi_scale_width[ k ] = pi_scale_width[ k ] * i_source_video_height /
- p_subpic->i_original_picture_height;
- }
+ p_spu->p_text->fmt_out.video.i_height =
+ p_spu->p_text->fmt_out.video.i_visible_height = i_render_height;
}
+ /* Compute scaling from picture to source size */
+ spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width,
+ i_source_video_height, i_render_height );
+
+ /* Update scaling from source size to display size(p_fmt_dst) */
+ scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width;
+ scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height;
+
/* Set default subpicture aspect ratio
* FIXME if we only handle 1 aspect ratio per picture, why is it set per
* region ? */
}
else
{
- p_region->fmt.i_sar_den = p_fmt->i_sar_den;
- p_region->fmt.i_sar_num = p_fmt->i_sar_num;
+ p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den;
+ p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num;
}
}
/* Take care of the aspect ratio */
- for( k = 0; k < SCALE_SIZE ; k++ )
- pi_subpic_x[k] = p_subpic->i_x;
+ if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den !=
+ p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num )
+ {
+ /* FIXME FIXME what about region->i_x/i_y ? */
+ scale.w = scale.w *
+ (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den /
+ p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num;
+ }
- if( ( p_region->fmt.i_sar_num * p_fmt->i_sar_den ) !=
- ( p_region->fmt.i_sar_den * p_fmt->i_sar_num ) )
+ /* Render all regions
+ * We always transform non absolute subtitle into absolute one on the
+ * first rendering to allow good subtitle overlap support.
+ */
+ for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
{
- for( k = 0; k < SCALE_SIZE; k++ )
- {
- pi_scale_width[k] = pi_scale_width[k] *
- (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
- p_region->fmt.i_sar_den / p_fmt->i_sar_num;
+ spu_area_t area;
+
+ /* Check scale validity */
+ if( scale.w <= 0 || scale.h <= 0 )
+ continue;
- pi_subpic_x[k] = p_subpic->i_x * pi_scale_width[ k ] / SCALE_UNIT;
+ /* */
+ SpuRenderRegion( p_spu, p_pic_dst, &area,
+ p_subpic, p_region, scale, p_fmt_dst,
+ p_subtitle_area, i_subtitle_area );
+
+ if( p_subpic->b_subtitle )
+ {
+ area = spu_area_unscaled( area, scale );
+ if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 )
+ {
+ p_region->i_x = area.i_x;
+ p_region->i_y = area.i_y;
+ }
+ if( p_subtitle_area )
+ p_subtitle_area[i_subtitle_area++] = area;
}
}
-
- /* Render all regions */
- for( ; p_region != NULL; p_region = p_region->p_next )
- SpuRenderRegion( p_spu, p_pic_dst,
- p_subpic, p_region, i_scale_width_orig, i_scale_height_orig,
- pi_subpic_x, pi_scale_width, pi_scale_height,
- p_fmt );
+ if( p_subpic->b_subtitle )
+ p_subpic->b_absolute = true;
}
+ /* */
+ if( p_subtitle_area != p_subtitle_area_buffer )
+ free( p_subtitle_area );
+
vlc_mutex_unlock( &p_spu->subpicture_lock );
}
static subpicture_t *spu_new_buffer( filter_t *p_filter )
{
- (void)p_filter;
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- if( !p_subpic ) return NULL;
- memset( p_subpic, 0, sizeof(subpicture_t) );
+ subpicture_t *p_subpic = calloc( 1, sizeof(subpicture_t) );
+ if( !p_subpic )
+ return NULL;
+
p_subpic->b_absolute = true;
+ p_subpic->i_alpha = 0xFF;
p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ VLC_UNUSED(p_filter);
return p_subpic;
}
static picture_t *spu_new_video_buffer( filter_t *p_filter )
{
- picture_t *p_picture = malloc( sizeof(picture_t) );
- if( !p_picture ) return NULL;
- if( vout_AllocatePicture( p_filter, p_picture,
- p_filter->fmt_out.video.i_chroma,
- p_filter->fmt_out.video.i_width,
- p_filter->fmt_out.video.i_height,
- p_filter->fmt_out.video.i_aspect )
- != VLC_SUCCESS )
- {
- free( p_picture );
- return NULL;
- }
+ const video_format_t *p_fmt = &p_filter->fmt_out.video;
- p_picture->pf_release = RegionPictureRelease;
-
- return p_picture;
+ VLC_UNUSED(p_filter);
+ return picture_New( p_fmt->i_chroma,
+ p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
}
-static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
+static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture )
{
- (void)p_filter;
- if( p_pic )
- {
- free( p_pic->p_data_orig );
- free( p_pic );
- }
+ VLC_UNUSED(p_filter);
+ picture_Release( p_picture );
}
static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ spu_t *p_spu = p_data;
+
VLC_UNUSED(p_object); VLC_UNUSED(oldval);
VLC_UNUSED(newval); VLC_UNUSED(psz_var);
- spu_t *p_spu = (spu_t *)p_data;
vlc_mutex_lock( &p_spu->subpicture_lock );
filter_chain_Reset( p_spu->p_chain, NULL, NULL );
spu_ParseChain( p_spu );
return VLC_SUCCESS;
}
-static int sub_filter_allocation_init( filter_t *p_filter, void *p_data )
+static int SubFilterAllocationInit( filter_t *p_filter, void *p_data )
{
- spu_t *p_spu = (spu_t *)p_data;
+ spu_t *p_spu = p_data;
+
+ filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
+ if( !p_sys )
+ return VLC_EGENERIC;
p_filter->pf_sub_buffer_new = sub_new_buffer;
p_filter->pf_sub_buffer_del = sub_del_buffer;
- filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
- if( !p_sys ) return VLC_EGENERIC;
-
p_filter->p_owner = p_sys;
spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
p_sys->p_spu = p_spu;
return VLC_SUCCESS;
}
-static void sub_filter_allocation_clear( filter_t *p_filter )
+static void SubFilterAllocationClean( filter_t *p_filter )
{
filter_owner_sys_t *p_sys = p_filter->p_owner;
+
SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true );
free( p_filter->p_owner );
}
+
projects / vlc / blobdiff