#include "../libvlc.h"
#include <assert.h>
+#include <limits.h>
/*****************************************************************************
* Local prototypes
#define SCALE_UNIT (1000)
+#define VLC_FOURCC_YUVP VLC_FOURCC('Y','U','V','P')
+#define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A')
+#define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A')
+#define VLC_FOURCC_TEXT VLC_FOURCC('T','E','X','T')
+
+/* */
+struct subpicture_region_private_t
+{
+ video_format_t fmt;
+ picture_t *p_picture;
+};
+
+static subpicture_region_private_t *SpuRegionPrivateCreate( video_format_t *p_fmt )
+{
+ subpicture_region_private_t *p_private = malloc( sizeof(*p_private) );
+
+ if( !p_private )
+ return NULL;
+
+ p_private->fmt = *p_fmt;
+ if( p_fmt->p_palette )
+ {
+ p_private->fmt.p_palette = malloc( sizeof(*p_private->fmt.p_palette) );
+ if( p_private->fmt.p_palette )
+ *p_private->fmt.p_palette = *p_fmt->p_palette;
+ }
+ p_private->p_picture = NULL;
+
+ return p_private;
+}
+static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private )
+{
+ if( p_private->p_picture )
+ picture_Release( p_private->p_picture );
+ free( p_private->fmt.p_palette );
+ free( p_private );
+}
+
/* */
static void SpuRenderCreateAndLoadText( spu_t *p_spu );
static void SpuRenderCreateAndLoadScale( spu_t *p_spu );
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;
}
}
-
-/* */
-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
*
return NULL;
/* FIXME is that *really* wanted? */
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
+ if( p_fmt->i_chroma == VLC_FOURCC_YUVP )
p_fmt->p_palette = calloc( 1, sizeof(video_palette_t) );
else
p_fmt->p_palette = NULL; /* XXX and that above all? */
p_region->fmt = *p_fmt;
p_region->i_alpha = 0xff;
p_region->p_next = NULL;
- p_region->p_cache = NULL;
+ p_region->p_private = NULL;
p_region->psz_text = NULL;
p_region->p_style = NULL;
+ p_region->p_picture = NULL;
- if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') )
+ if( p_fmt->i_chroma == VLC_FOURCC_TEXT )
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 )
+ p_region->p_picture = picture_New( p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height,
+ p_fmt->i_aspect );
+ if( !p_region->p_picture )
{
free( p_fmt->p_palette );
free( p_region );
return NULL;
}
- p_region->picture.i_refcount = 1;
- p_region->picture.pf_release = RegionPictureRelease;
-
return p_region;
}
if( !p_region )
return;
- picture_Release( &p_region->picture );
+ if( p_region->p_private )
+ SpuRegionPrivateDestroy( p_region->p_private );
+
+ if( p_region->p_picture )
+ picture_Release( p_region->p_picture );
free( p_region->fmt.p_palette );
- 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 );
}
-/*****************************************************************************
- * 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 )
/* */
vlc_object_attach( p_blend, p_spu );
}
-static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, const video_format_t *p_in_fmt )
+static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height,
+ const video_format_t *p_in_fmt )
{
filter_t *p_blend = p_spu->p_blend;
p_text->p_module = module_Need( p_text, "text renderer", NULL, false );
}
-static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma )
+static filter_t *CreateAndLoadScale( vlc_object_t *p_obj,
+ vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma,
+ bool b_resize )
{
filter_t *p_scale;
return NULL;
es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
- p_scale->fmt_in.video.i_chroma = i_chroma;
+ p_scale->fmt_in.video.i_chroma = i_src_chroma;
p_scale->fmt_in.video.i_width =
p_scale->fmt_in.video.i_height = 32;
es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 );
- p_scale->fmt_out.video.i_chroma = i_chroma;
+ p_scale->fmt_out.video.i_chroma = i_dst_chroma;
p_scale->fmt_out.video.i_width =
- p_scale->fmt_out.video.i_height = 16;
+ p_scale->fmt_out.video.i_height = b_resize ? 16 : 32;
p_scale->pf_vout_buffer_new = spu_new_video_buffer;
p_scale->pf_vout_buffer_del = spu_del_video_buffer;
}
static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
{
- /* FIXME: We'll also be using it for YUVA and RGBA blending ... */
-
assert( !p_spu->p_scale );
assert( !p_spu->p_scale_yuvp );
- p_spu->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','A') );
- p_spu->p_scale_yuvp = p_spu->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','P') );
+ /* XXX p_spu->p_scale is used for all conversion/scaling except yuvp to
+ * yuva/rgba */
+ p_spu->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu),
+ VLC_FOURCC_YUVA, VLC_FOURCC_YUVA, true );
+ /* This one is used for YUVP to YUVA/RGBA without scaling
+ * FIXME rename it */
+ p_spu->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu),
+ VLC_FOURCC_YUVP, VLC_FOURCC_YUVA, false );
}
static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text,
- subpicture_t *p_subpic, subpicture_region_t *p_region, int i_min_scale_ratio )
+ subpicture_t *p_subpic, subpicture_region_t *p_region,
+ int i_min_scale_ratio )
{
- assert( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') );
+ assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT );
if( !p_spu->p_text || !p_spu->p_text->p_module )
goto exit;
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,
{
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 )
+ const subpicture_region_t *p_region,
+ int i_margin_y )
{
- int i_delta_x = p_region->i_x;
- int i_delta_y = p_region->i_y;
+ 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 = i_delta_x;
i_y = i_delta_y;
}
+
+ /* 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_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 spu_scale_t scale_size,
- const video_format_t *p_fmt )
+ 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;
- filter_t *p_scale;
+
+ video_format_t region_fmt;
+ picture_t *p_region_picture;
vlc_assert_locked( &p_spu->subpicture_lock );
- fmt_original = p_region->fmt;
- b_rerender_text = false;
- if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ /* 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_TEXT )
{
- SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, SCALE_UNIT );
+ 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 ... */
- if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT )
goto exit;
}
* 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_using_palette = p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P');
+ const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC_YUVP;
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;
+ bool b_changed_palette = false;
+
+
+ /* 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
- * p_palette->palette is [256][4] with a int i_entries
- * p_spu->palette is [4][4]
- * */
- p_region->fmt.p_palette->i_entries = 4;
- memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 4*sizeof(uint32_t) );
+ video_palette_t *p_palette = p_region->fmt.p_palette;
+ video_palette_t palette;
+
+ /* We suppose DVD palette here */
+ palette.i_entries = 4;
+ for( int i = 0; i < 4; i++ )
+ for( int j = 0; j < 4; j++ )
+ palette.palette[i][j] = p_spu->palette[i][j];
+
+ if( p_palette->i_entries == palette.i_entries )
+ {
+ for( int i = 0; i < p_palette->i_entries; i++ )
+ for( int j = 0; j < 4; j++ )
+ b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j];
+ }
+ else
+ {
+ b_changed_palette = true;
+ }
+ *p_palette = palette;
}
- if( b_using_palette )
- p_scale = p_spu->p_scale_yuvp;
- else
- p_scale = p_spu->p_scale;
+ /* */
+ region_fmt = p_region->fmt;
+ p_region_picture = p_region->p_picture;
+
- if( p_scale &&
- ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) )
+ /* Scale from rendered size to destination size */
+ if( p_spu->p_scale && p_spu->p_scale->p_module &&
+ ( !b_using_palette || ( p_spu->p_scale_yuvp && p_spu->p_scale_yuvp->p_module ) ) &&
+ ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_using_palette ) )
{
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 );
- /* Destroy if cache is unusable */
- if( p_region->p_cache )
+ /* Destroy the cache if unusable */
+ if( p_region->p_private )
{
- if( p_region->p_cache->fmt.i_width != i_dst_width ||
- p_region->p_cache->fmt.i_height != i_dst_height ||
- b_force_palette )
+ subpicture_region_private_t *p_private = p_region->p_private;
+ bool b_changed = false;
+
+ /* Check resize changes */
+ if( i_dst_width != p_private->fmt.i_width ||
+ i_dst_height != p_private->fmt.i_height )
+ b_changed = true;
+
+ /* Check forced palette changes */
+ if( b_changed_palette )
+ b_changed = true;
+
+ if( b_changed )
{
- p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
- p_region->p_cache );
- p_region->p_cache = NULL;
+ SpuRegionPrivateDestroy( p_private );
+ p_region->p_private = NULL;
}
}
/* Scale if needed into cache */
- if( !p_region->p_cache )
+ if( !p_region->p_private )
{
- picture_t *p_pic;
+ filter_t *p_scale = p_spu->p_scale;
- p_scale->fmt_in.video = p_region->fmt;
- p_scale->fmt_out.video = p_region->fmt;
+ picture_t *p_picture = p_region->p_picture;
+ picture_Hold( p_picture );
- if( p_scale->fmt_out.video.p_palette )
- *p_scale->fmt_out.video.p_palette =
- *p_region->fmt.p_palette;
+ /* Convert YUVP to YUVA/RGBA first for better scaling quality */
+ if( b_using_palette )
+ {
+ filter_t *p_scale_yuvp = p_spu->p_scale_yuvp;
+
+ p_scale_yuvp->fmt_in.video = p_region->fmt;
+
+ /* TODO converting to RGBA for RGB video output is better */
+ p_scale_yuvp->fmt_out.video = p_region->fmt;
+ p_scale_yuvp->fmt_out.video.i_chroma = VLC_FOURCC_YUVA;
+
+ p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture );
+ if( !p_picture )
+ {
+ /* Well we will try conversion+scaling */
+ msg_Warn( p_spu, "%4.4s to %4.4s conversion failed",
+ (const char*)&p_scale_yuvp->fmt_in.video.i_chroma,
+ (const char*)&p_scale_yuvp->fmt_out.video.i_chroma );
+ }
+ }
- p_scale->fmt_out.video.i_width = i_dst_width;
- p_scale->fmt_out.video.i_height = i_dst_height;
+ /* Conversion(except from YUVP)/Scaling */
+ if( p_picture &&
+ ( p_picture->format.i_width != i_dst_width ||
+ p_picture->format.i_height != i_dst_height ) )
+ {
+ p_scale->fmt_in.video = p_picture->format;
+ p_scale->fmt_out.video = p_picture->format;
- p_scale->fmt_out.video.i_visible_width =
- spu_scale_w( p_region->fmt.i_visible_width, scale_size );
- p_scale->fmt_out.video.i_visible_height =
- spu_scale_h( p_region->fmt.i_visible_height, scale_size );
+ p_scale->fmt_out.video.i_width = i_dst_width;
+ p_scale->fmt_out.video.i_height = i_dst_height;
- p_region->p_cache =
- p_subpic->pf_create_region( VLC_OBJECT(p_spu),
- &p_scale->fmt_out.video );
+ p_scale->fmt_out.video.i_visible_width =
+ spu_scale_w( p_region->fmt.i_visible_width, scale_size );
+ p_scale->fmt_out.video.i_visible_height =
+ spu_scale_h( p_region->fmt.i_visible_height, scale_size );
- p_pic = NULL;
- if( p_scale->p_module )
- {
- picture_t picture = p_region->picture;
- picture.pf_release = NULL; /* That's an ugly hack */
- p_pic = p_scale->pf_video_filter( p_scale, &picture );
+ p_picture = p_scale->pf_video_filter( p_scale, p_picture );
+ if( !p_picture )
+ msg_Err( p_spu, "scaling failed" );
}
- if( p_pic )
+
+ /* */
+ p_region->p_private = SpuRegionPrivateCreate( &p_picture->format );
+ if( p_region->p_private )
{
- picture_Copy( &p_region->p_cache->picture, p_pic );
- picture_Release( p_pic );
-
- p_region->p_cache->fmt = p_scale->fmt_out.video;
- p_region->p_cache->i_x = spu_scale_w( p_region->i_x, scale_size );
- p_region->p_cache->i_y = spu_scale_h( p_region->i_y, scale_size );
- p_region->p_cache->i_align = p_region->i_align;
- p_region->p_cache->i_alpha = p_region->i_alpha;
+ p_region->p_private->p_picture = p_picture;
+ if( !p_region->p_private->p_picture )
+ {
+ SpuRegionPrivateDestroy( p_region->p_private );
+ p_region->p_private = NULL;
+ }
}
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;
+ picture_Release( p_picture );
}
-
}
/* And use the scaled picture */
- if( p_region->p_cache )
+ if( p_region->p_private )
{
- p_region = p_region->p_cache;
- fmt_original = p_region->fmt;
+ region_fmt = p_region->p_private->fmt;
+ p_region_picture = p_region->p_private->p_picture;
}
}
- /* */
- SpuRegionPlace( &i_x_offset, &i_y_offset,
- p_fmt, p_subpic, p_region );
-
- if( p_spu->i_margin != 0 && !b_force_crop )
- {
- int i_diff = 0;
- int i_low = i_y_offset - p_spu->i_margin;
- 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_diff;
- }
-
/* Force cropping if requested */
if( b_force_crop )
{
- video_format_t *p_fmt = &p_region->fmt;
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 );
/* Find the intersection */
if( i_crop_x + i_crop_width <= i_x_offset ||
- i_x_offset + (int)p_fmt->i_visible_width < i_crop_x ||
+ i_x_offset + (int)region_fmt.i_visible_width < i_crop_x ||
i_crop_y + i_crop_height <= i_y_offset ||
- i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
+ i_y_offset + (int)region_fmt.i_visible_height < i_crop_y )
{
/* No intersection */
- p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
+ region_fmt.i_visible_width =
+ region_fmt.i_visible_height = 0;
}
else
{
i_x = __MAX( i_crop_x, i_x_offset );
i_y = __MAX( i_crop_y, i_y_offset );
i_x_end = __MIN( i_crop_x + i_crop_width,
- i_x_offset + (int)p_fmt->i_visible_width );
+ i_x_offset + (int)region_fmt.i_visible_width );
i_y_end = __MIN( i_crop_y + i_crop_height,
- i_y_offset + (int)p_fmt->i_visible_height );
+ i_y_offset + (int)region_fmt.i_visible_height );
- p_fmt->i_x_offset = i_x - i_x_offset;
- p_fmt->i_y_offset = i_y - i_y_offset;
- p_fmt->i_visible_width = i_x_end - i_x;
- p_fmt->i_visible_height = i_y_end - i_y;
+ region_fmt.i_x_offset = i_x - i_x_offset;
+ region_fmt.i_y_offset = i_y - i_y_offset;
+ region_fmt.i_visible_width = i_x_end - i_x;
+ region_fmt.i_visible_height = i_y_end - i_y;
- i_x_offset = i_x;
- i_y_offset = i_y;
- }
- 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 );
+ i_x_offset = __MAX( i_x, 0 );
+ i_y_offset = __MAX( i_y, 0 );
}
}
/* Update the blender */
- SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt );
+ SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, ®ion_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
{
* pre-rendered state, so the next time through everything is
* calculated again.
*/
- p_region->picture.pf_release( &p_region->picture );
- memset( &p_region->picture, 0, sizeof( picture_t ) );
+ picture_Release( p_region->p_picture );
+ p_region->p_picture = NULL;
+ if( p_region->p_private )
+ {
+ SpuRegionPrivateDestroy( p_region->p_private );
+ p_region->p_private = NULL;
+ }
p_region->i_align &= ~SUBPICTURE_RENDERED;
}
if( b_restore_format )
p_region->fmt = fmt_original;
}
+/**
+ * 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,
const int i_source_video_height = p_fmt_src->i_height;
const mtime_t i_current_date = mdate();
- subpicture_t *p_subpic;
+ unsigned int i_subpicture;
+ subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
+
+ 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;
/* Get lock */
vlc_mutex_lock( &p_spu->subpicture_lock );
- /* Be sure we have at least 1 picture to process */
- if( !p_subpic_list || p_subpic_list->i_status == FREE_SUBPICTURE )
- {
- vlc_mutex_unlock( &p_spu->subpicture_lock );
- return;
- }
-
- /* */
- for( p_subpic = p_subpic_list;
+ /* 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 )
{
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_dst->i_chroma, p_fmt_dst->i_aspect );
- /* */
- for( p_subpic = p_subpic_list; ; p_subpic = p_subpic->p_next )
+ /* 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;
- if( !p_subpic || p_subpic->i_status == FREE_SUBPICTURE )
- break;
-
if( !p_subpic->p_region )
continue;
msg_Err( p_spu, "unsupported original picture size %dx%d",
i_render_width, i_render_height );
- i_render_width = i_source_video_width;
- i_render_height = i_source_video_height;
+ 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;
}
if( p_spu->p_text )
p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num;
}
- /* Render all regions */
+ /* 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 )
{
+ spu_area_t area;
+
/* Check scale validity */
if( scale.w <= 0 || scale.h <= 0 )
continue;
/* */
- SpuRenderRegion( p_spu, p_pic_dst, p_subpic, p_region,
- scale, p_fmt_dst );
+ 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;
+ }
}
+ 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 );
}
projects / vlc / blobdiff