/*****************************************************************************
* vout_subpictures.c : subpicture management functions
*****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2005 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "video_output.h"
#include "vlc_spu.h"
#include "vlc_filter.h"
-#include "osd.h"
/*****************************************************************************
* Local prototypes
char *psz_filter, *psz_filter_orig;
vlc_value_t val;
- /* If the user requested an SPU margin, we force the position. */
- var_Create( p_spu, "spumargin", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_spu, "spumargin", &val );
+ /* If the user requested a sub margin, we force the position. */
+ var_Create( p_spu, "sub-margin", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_spu, "sub-margin", &val );
p_spu->i_margin = val.i_int;
var_Create( p_spu, "sub-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
psz_filter = psz_filter_orig = val.psz_string;
while( psz_filter && *psz_filter )
{
- char *psz_parser = strchr( psz_filter, ',' );
- if( !psz_parser ) psz_parser = strchr( psz_filter, ':' );
+ char *psz_parser = strchr( psz_filter, ':' );
if( psz_parser ) *psz_parser++ = 0;
p_region->p_cache = 0;
p_region->fmt = *p_fmt;
p_region->psz_text = 0;
+ p_region->i_text_color = 0xFFFFFF;
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 = 0;
+ p_region->picture.p_data_orig = NULL;
if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region;
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) );
+ memset( p_region, 0, sizeof(subpicture_region_t) );
+ p_region->p_next = 0;
+ p_region->p_cache = 0;
+ p_region->fmt = *p_fmt;
+ p_region->psz_text = 0;
+ p_region->i_text_color = 0xFFFFFF;
+
+ 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.pf_release = RegionPictureRelease;
+
+ return p_region;
+}
+
/**
* Destroy a subpicture region
*
memset( p_subpic, 0, sizeof(subpicture_t) );
p_subpic->i_status = RESERVED_SUBPICTURE;
p_subpic->b_absolute = VLC_TRUE;
+ p_subpic->b_fade = VLC_FALSE;
+ p_subpic->i_alpha = 0xFF;
+ p_subpic->p_region = 0;
p_subpic->pf_render = 0;
p_subpic->pf_destroy = 0;
p_subpic->p_sys = 0;
-
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;
}
void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
picture_t *p_pic_dst, picture_t *p_pic_src,
subpicture_t *p_subpic,
- int i_scale_width, int i_scale_height )
+ int i_scale_width_orig, int i_scale_height_orig )
{
/* Get lock */
vlc_mutex_lock( &p_spu->subpicture_lock );
while( p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE )
{
subpicture_region_t *p_region = p_subpic->p_region;
+ int i_scale_width, i_scale_height;
+ int i_subpic_x = p_subpic->i_x;
/* Load the blending module */
if( !p_spu->p_blend && p_region )
{
- p_spu->p_blend = vlc_object_create( p_spu, sizeof(filter_t) );
+ p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
vlc_object_attach( p_spu->p_blend, p_spu );
p_spu->p_blend->fmt_out.video.i_x_offset =
p_spu->p_blend->fmt_out.video.i_y_offset = 0;
p_spu->p_blend->fmt_out.video.i_aspect = p_fmt->i_aspect;
p_spu->p_blend->fmt_out.video.i_chroma = p_fmt->i_chroma;
-
p_spu->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','P');
p_spu->p_blend->p_module =
/* Load the text rendering module */
if( !p_spu->p_text && p_region )
{
- p_spu->p_text = vlc_object_create( p_spu, sizeof(filter_t) );
+ p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
vlc_object_attach( p_spu->p_text, p_spu );
p_spu->p_text->fmt_out.video.i_width =
p_spu->p_text->pf_sub_buffer_new = spu_new_buffer;
p_spu->p_text->pf_sub_buffer_del = spu_del_buffer;
-
p_spu->p_text->p_module =
module_Need( p_spu->p_text, "text renderer", 0, 0 );
}
+ else if( p_region )
+ {
+ 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;
+ }
+
+ i_scale_width = i_scale_width_orig;
+ i_scale_height = i_scale_height_orig;
+
+ if( p_subpic->i_original_picture_width &&
+ p_subpic->i_original_picture_height )
+ {
+ i_scale_width = i_scale_width * p_fmt->i_width /
+ p_subpic->i_original_picture_width;
+ i_scale_height = i_scale_height * p_fmt->i_height /
+ p_subpic->i_original_picture_height;
+ }
+
+ /* Set default subpicture aspect ratio */
+ if( p_region && p_region->fmt.i_aspect &&
+ (!p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den) )
+ {
+ p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
+ p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
+ }
+ if( p_region &&
+ (!p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den) )
+ {
+ p_region->fmt.i_sar_den = p_fmt->i_sar_den;
+ p_region->fmt.i_sar_num = p_fmt->i_sar_num;
+ }
+
+ /* Take care of the aspect ratio */
+ if( p_region && p_region->fmt.i_sar_num * p_fmt->i_sar_den !=
+ p_region->fmt.i_sar_den * p_fmt->i_sar_num )
+ {
+ i_scale_width = i_scale_width *
+ (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
+ p_region->fmt.i_sar_den / p_fmt->i_sar_num;
+ i_subpic_x = p_subpic->i_x * i_scale_width / 1000;
+ }
/* Load the scaling module */
if( !p_spu->p_scale && (i_scale_width != 1000 ||
module_Need( p_spu->p_scale, "video filter2", 0, 0 );
}
- if( p_subpic->pf_render )
- {
- /* HACK to remove when the ogt subpic decoder is gone */
- if( p_spu->p_parent &&
- p_spu->p_parent->i_object_type == VLC_OBJECT_VOUT )
- {
- vout_thread_t *p_vout = (vout_thread_t *)p_spu->p_parent;
- p_subpic->pf_render( p_vout, p_pic_dst, p_subpic );
- }
- }
- else while( p_region && p_spu->p_blend &&
- p_spu->p_blend->pf_video_blend )
+ while( p_region && p_spu->p_blend && p_spu->p_blend->pf_video_blend )
{
- int i_x_offset = p_region->i_x + p_subpic->i_x;
+ int i_fade_alpha = 255;
+ int i_x_offset = p_region->i_x + i_subpic_x;
int i_y_offset = p_region->i_y + p_subpic->i_y;
if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
{
if( p_spu->p_text && p_spu->p_text->p_module &&
- p_spu->p_text->pf_render_string )
- {
- /* TODO: do it in a less hacky way
- * (modify text renderer API) */
- subpicture_t *p_subpic_tmp;
- subpicture_region_t tmp_region;
- block_t *p_new_block =
- block_New( p_spu, strlen(p_region->psz_text) + 1 );
-
- if( p_new_block )
- {
- memcpy( p_new_block->p_buffer, p_region->psz_text,
- p_new_block->i_buffer );
- p_new_block->i_pts = p_new_block->i_dts =
- p_subpic->i_start;
- p_new_block->i_length =
- p_subpic->i_start - p_subpic->i_stop;
- p_subpic_tmp = p_spu->p_text->pf_render_string(
- p_spu->p_text, p_new_block );
-
- if( p_subpic_tmp )
- {
- tmp_region = *p_region;
- *p_region = *p_subpic_tmp->p_region;
- p_region->p_next = tmp_region.p_next;
- *p_subpic_tmp->p_region = tmp_region;
- p_spu->p_text->pf_sub_buffer_del( p_spu->p_text,
- p_subpic_tmp );
- }
- }
- }
- }
-
- if( p_subpic->i_flags & OSD_ALIGN_BOTTOM )
- {
- i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
- p_subpic->i_y;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_TOP) )
- {
- i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
- }
-
- if( p_subpic->i_flags & OSD_ALIGN_RIGHT )
- {
- i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
- p_subpic->i_x;
- }
- else if ( !(p_subpic->i_flags & OSD_ALIGN_LEFT) )
- {
- i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
- }
-
- if( p_subpic->b_absolute )
- {
- i_x_offset = p_region->i_x + p_subpic->i_x;
- i_y_offset = p_region->i_y + p_subpic->i_y;
-
- if( p_spu->i_margin >= 0 )
- {
- if( p_subpic->i_height + (unsigned int)p_spu->i_margin <=
- p_fmt->i_height )
- {
- i_y_offset = p_fmt->i_height -
- p_spu->i_margin - p_subpic->i_height;
- }
- }
- }
-
- /* Force cropping if requested */
- if( p_spu->b_force_crop )
- {
- video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
-
- /* Find the intersection */
- if( p_spu->i_crop_x + p_spu->i_crop_width <= i_x_offset ||
- i_x_offset + (int)p_fmt->i_visible_width <
- p_spu->i_crop_x ||
- p_spu->i_crop_y + p_spu->i_crop_height <= i_y_offset ||
- i_y_offset + (int)p_fmt->i_visible_height <
- p_spu->i_crop_y )
- {
- /* No intersection */
- p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
- }
- else
+ p_spu->p_text->pf_render_text )
{
- int i_x, i_y, i_x_end, i_y_end;
- i_x = __MAX( p_spu->i_crop_x, i_x_offset );
- i_y = __MAX( p_spu->i_crop_y, i_y_offset );
- i_x_end = __MIN( p_spu->i_crop_x + p_spu->i_crop_width,
- i_x_offset + (int)p_fmt->i_visible_width );
- i_y_end = __MIN( p_spu->i_crop_y + p_spu->i_crop_height,
- i_y_offset + (int)p_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;
-
- i_x_offset = i_x;
- i_y_offset = i_y;
+ p_region->i_text_align = p_subpic->i_flags & 0x3;
+ p_spu->p_text->pf_render_text( p_spu->p_text,
+ p_region, p_region );
}
}
/* Force palette if requested */
- if( p_spu->b_force_alpha && VLC_FOURCC('Y','U','V','P') ==
- p_spu->p_blend->fmt_in.video.i_chroma )
+ if( p_spu->b_force_palette && VLC_FOURCC('Y','U','V','P') ==
+ p_region->fmt.i_chroma )
{
- p_spu->p_blend->fmt_in.video.p_palette->palette[0][3] =
- p_spu->pi_alpha[0];
- p_spu->p_blend->fmt_in.video.p_palette->palette[1][3] =
- p_spu->pi_alpha[1];
- p_spu->p_blend->fmt_in.video.p_palette->palette[2][3] =
- p_spu->pi_alpha[2];
- p_spu->p_blend->fmt_in.video.p_palette->palette[3][3] =
- p_spu->pi_alpha[3];
+ memcpy( p_region->fmt.p_palette->palette,
+ p_spu->palette, 16 );
}
/* Scale SPU if necessary */
p_region->p_cache = 0;
}
}
+
if( (i_scale_width != 1000 || i_scale_height != 1000) &&
p_spu->p_scale && !p_region->p_cache )
{
p_spu->p_scale->fmt_out.video.i_visible_height =
p_region->fmt.i_visible_height * i_scale_height / 1000;
p_region->p_cache->fmt = p_spu->p_scale->fmt_out.video;
+ p_region->p_cache->i_x = p_region->i_x * i_scale_width / 1000;
+ p_region->p_cache->i_y = p_region->i_y * i_scale_height / 1000;
p_pic = p_spu->p_scale->pf_video_filter(
p_spu->p_scale, &p_region->p_cache->picture );
p_region = p_region->p_cache;
}
+ if( p_subpic->i_flags & SUBPICTURE_ALIGN_BOTTOM )
+ {
+ i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
+ p_subpic->i_y;
+ }
+ else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_TOP) )
+ {
+ i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
+ }
+
+ if( p_subpic->i_flags & SUBPICTURE_ALIGN_RIGHT )
+ {
+ i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
+ i_subpic_x;
+ }
+ else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_LEFT) )
+ {
+ i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
+ }
+
if( p_subpic->b_absolute )
{
- i_x_offset = i_x_offset * i_scale_width / 1000;
- i_y_offset = i_y_offset * i_scale_height / 1000;
+ i_x_offset = p_region->i_x +
+ i_subpic_x * i_scale_width / 1000;
+ i_y_offset = p_region->i_y +
+ p_subpic->i_y * i_scale_height / 1000;
+
+ }
+
+ if( p_spu->i_margin != 0 && p_spu->b_force_crop == VLC_FALSE )
+ {
+ int i_diff = 0;
+ int i_low = i_y_offset - p_spu->i_margin;
+ int i_high = i_y_offset + p_region->fmt.i_height - p_spu->i_margin;
+
+ /* 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 );
}
p_spu->p_blend->fmt_in.video = p_region->fmt;
+ /* Force cropping if requested */
+ if( p_spu->b_force_crop )
+ {
+ video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
+ int i_crop_x = p_spu->i_crop_x * i_scale_width / 1000;
+ int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
+ int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
+ int i_crop_height = p_spu->i_crop_height * i_scale_height/1000;
+
+ /* 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_crop_y + i_crop_height <= i_y_offset ||
+ i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
+ {
+ /* No intersection */
+ p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
+ }
+ else
+ {
+ int i_x, i_y, i_x_end, i_y_end;
+ 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_y_end = __MIN( i_crop_y + i_crop_height,
+ i_y_offset + (int)p_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;
+
+ i_x_offset = i_x;
+ i_y_offset = i_y;
+ }
+ }
+
/* Update the output picture size */
p_spu->p_blend->fmt_out.video.i_width =
p_spu->p_blend->fmt_out.video.i_visible_width =
p_spu->p_blend->fmt_out.video.i_visible_height =
p_fmt->i_height;
- p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
- p_pic_src, &p_region->picture, i_x_offset, i_y_offset );
+ 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 );
+ }
+ }
+
+ p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
+ p_pic_src, &p_region->picture, i_x_offset, i_y_offset,
+ i_fade_alpha * p_subpic->i_alpha / 255 );
p_region = p_region->p_next;
}
{
continue;
}
-
if( display_date &&
display_date < p_spu->p_subpicture[i_index].i_start )
{
{
vlc_value_t val;
- p_spu->b_force_alpha = VLC_FALSE;
+ p_spu->b_force_palette = VLC_FALSE;
p_spu->b_force_crop = VLC_FALSE;
if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return;
var_Get( p_object, "y-end", &val );
p_spu->i_crop_height = val.i_int - p_spu->i_crop_y;
-#if 0
- if( var_Get( p_object, "color", &val ) == VLC_SUCCESS )
+ if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS )
{
- int i;
- for( i = 0; i < 4; i++ )
- {
- p_spu->pi_color[i] = ((uint8_t *)val.p_address)[i];
- }
- }
-#endif
-
- if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS )
- {
- int i;
- for( i = 0; i < 4; i++ )
- {
- p_spu->pi_alpha[i] = ((uint8_t *)val.p_address)[i];
- p_spu->pi_alpha[i] = p_spu->pi_alpha[i] == 0xf ?
- 0xff : p_spu->pi_alpha[i] << 4;
- }
- p_spu->b_force_alpha = VLC_TRUE;
+ memcpy( p_spu->palette, val.p_address, 16 );
+ p_spu->b_force_palette = VLC_TRUE;
}
- msg_Dbg( p_object, "crop: %i,%i,%i,%i, alpha: %i",
+ msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i",
p_spu->i_crop_x, p_spu->i_crop_y,
- p_spu->i_crop_width, p_spu->i_crop_height, p_spu->b_force_alpha );
+ p_spu->i_crop_width, p_spu->i_crop_height,
+ p_spu->b_force_palette );
}
/*****************************************************************************
p_subpic->b_absolute = VLC_TRUE;
p_subpic->pf_create_region = __spu_CreateRegion;
+ p_subpic->pf_make_region = __spu_MakeRegion;
p_subpic->pf_destroy_region = __spu_DestroyRegion;
return p_subpic;
projects / vlc / blobdiff