/*****************************************************************************
* vout_subpictures.c : subpicture management functions
*****************************************************************************
- * Copyright (C) 2000 VideoLAN
- * $Id: vout_subpictures.c,v 1.6 2002/01/21 00:52:07 sam Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
+#include "vlc_filter.h"
+#include "osd.h"
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static void vout_RenderRGBSPU( const vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu );
-static void vout_RenderYUVSPU( const vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu );
+static void UpdateSPU ( vout_thread_t *, vlc_object_t * );
+static int CropCallback ( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
-/* FIXME: fake palette - the real one has to be sought in the .IFO */
-static int p_palette[4] = { 0x0000, 0x0000, 0xffff, 0x8888 };
+static subpicture_t *spu_new_buffer( filter_t * );
+static void spu_del_buffer( filter_t *, subpicture_t * );
-/*****************************************************************************
- * vout_DisplaySubPicture: display a subpicture unit
- *****************************************************************************
- * Remove the reservation flag of a subpicture, which will cause it to be ready
- * for display. The picture does not need to be locked, since it is ignored by
- * the output thread if is reserved.
- *****************************************************************************/
-void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
+/**
+ * Initialise the subpicture decoder unit
+ *
+ * \param p_vout the vout in which to create the subpicture unit
+ */
+void vout_InitSPU( vout_thread_t *p_vout )
+{
+ vlc_object_t *p_input;
+ int i_index;
+
+ for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
+ {
+ p_vout->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
+ p_vout->p_subpicture[i_index].i_type = EMPTY_SUBPICTURE;
+ }
+
+ /* Load the text rendering module */
+ p_vout->p_text = vlc_object_create( p_vout, sizeof(filter_t) );
+ p_vout->p_text->pf_spu_buffer_new = spu_new_buffer;
+ p_vout->p_text->pf_spu_buffer_del = spu_del_buffer;
+ p_vout->p_text->p_owner = (filter_owner_sys_t *)p_vout;
+ vlc_object_attach( p_vout->p_text, p_vout );
+ p_vout->p_text->p_module =
+ module_Need( p_vout->p_text, "text renderer", 0, 0 );
+ if( p_vout->p_text->p_module == NULL )
+ {
+ msg_Warn( p_vout, "no suitable text renderer module" );
+ vlc_object_detach( p_vout->p_text );
+ vlc_object_destroy( p_vout->p_text );
+ p_vout->p_text = NULL;
+ }
+
+ p_vout->p_blend = NULL;
+
+ p_vout->i_crop_x = p_vout->i_crop_y =
+ p_vout->i_crop_width = p_vout->i_crop_height = 0;
+ p_vout->b_force_alpha = VLC_FALSE;
+ p_vout->b_force_crop = VLC_FALSE;
+
+ /* Create callback */
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( p_input )
+ {
+ UpdateSPU( p_vout, VLC_OBJECT(p_input) );
+ var_AddCallback( p_input, "highlight", CropCallback, p_vout );
+ vlc_object_release( p_input );
+ }
+}
+
+/**
+ * Destroy the subpicture decoder unit
+ *
+ * \param p_vout the vout in which to destroy the subpicture unit
+ */
+void vout_DestroySPU( vout_thread_t *p_vout )
+{
+ vlc_object_t *p_input;
+ int i_index;
+
+ /* Destroy all remaining subpictures */
+ for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
+ {
+ if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
+ {
+ vout_DestroySubPicture( p_vout,
+ &p_vout->p_subpicture[i_index] );
+ }
+ }
+
+ if( p_vout->p_text )
+ {
+ if( p_vout->p_text->p_module )
+ module_Unneed( p_vout->p_text, p_vout->p_text->p_module );
+
+ vlc_object_detach( p_vout->p_text );
+ vlc_object_destroy( p_vout->p_text );
+ }
+
+ if( p_vout->p_blend )
+ {
+ if( p_vout->p_blend->p_module )
+ module_Unneed( p_vout->p_blend, p_vout->p_blend->p_module );
+
+ vlc_object_detach( p_vout->p_blend );
+ vlc_object_destroy( p_vout->p_blend );
+ }
+
+ /* Delete callback */
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( p_input )
+ {
+ var_DelCallback( p_input, "highlight", CropCallback, p_vout );
+ vlc_object_release( p_input );
+ }
+}
+
+/**
+ * Create a subpicture region
+ *
+ * \param p_this vlc_object_t
+ * \param p_fmt the format that this subpicture region should have
+ */
+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) );
+ memset( p_region, 0, sizeof(subpicture_region_t) );
+ p_region->p_next = 0;
+ p_region->fmt = *p_fmt;
+
+ 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 );
+ return 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;
+
+ return p_region;
+}
+
+/**
+ * Destroy a subpicture region
+ *
+ * \param p_this vlc_object_t
+ * \param p_region the subpicture region to destroy
+ */
+void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
+{
+ if( !p_region ) return;
+ if( p_region->picture.p_data_orig ) free( p_region->picture.p_data_orig );
+ if( p_region->fmt.p_palette ) free( p_region->fmt.p_palette );
+ free( p_region );
+}
+
+/**
+ * Display a subpicture unit
+ *
+ * Remove the reservation flag of a subpicture, which will cause it to be
+ * ready for display.
+ * \param p_vout the video output this subpicture should be displayed on
+ * \param p_subpic the subpicture to display
+ */
+void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
{
-#ifdef TRACE_VOUT
- char psz_start[ MSTRTIME_MAX_SIZE ]; /* buffer for date string */
- char psz_stop[ MSTRTIME_MAX_SIZE ]; /* buffer for date string */
-#endif
int i_margin;
-#ifdef DEBUG
/* Check if status is valid */
if( p_subpic->i_status != RESERVED_SUBPICTURE )
{
- intf_ErrMsg( "error: subpicture %p has invalid status #%d",
- p_subpic, p_subpic->i_status );
+ msg_Err( p_vout, "subpicture %p has invalid status #%d",
+ p_subpic, p_subpic->i_status );
}
-#endif
/* If the user requested an SPU margin, we force the position after
* having checked that it was a valid value. */
- i_margin = main_GetIntVariable( VOUT_SPUMARGIN_VAR,
- VOUT_SPUMARGIN_DEFAULT );
+ i_margin = config_GetInt( p_vout, "spumargin" );
if( i_margin >= 0 )
{
- if( p_subpic->i_height + i_margin <= p_vout->output.i_height )
+ if( p_subpic->i_height + (unsigned int)i_margin
+ <= p_vout->output.i_height )
{
p_subpic->i_y = p_vout->output.i_height
- i_margin - p_subpic->i_height;
/* Remove reservation flag */
p_subpic->i_status = READY_SUBPICTURE;
-
-#ifdef TRACE_VOUT
- /* Send subpicture information */
- intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s",
- p_subpic, p_subpic->i_type,
- mstrtime( psz_start, p_subpic->i_start ),
- mstrtime( psz_stop, p_subpic->i_stop ) );
-#endif
}
-/*****************************************************************************
- * vout_CreateSubPicture: allocate a subpicture in the video output heap.
- *****************************************************************************
+/**
+ * Allocate a subpicture in the video output heap.
+ *
* This function create a reserved subpicture in the video output heap.
* A null pointer is returned if the function fails. This method provides an
* already allocated zone of memory in the spu data fields. It needs locking
* since several pictures can be created by several producers threads.
- *****************************************************************************/
-subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
- int i_size )
+ * \param p_vout the vout in which to create the subpicture
+ * \param i_channel the channel this subpicture should belong to
+ * \param i_type the type of the subpicture
+ * \return NULL on error, a reserved subpicture otherwise
+ */
+subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_channel,
+ int i_type )
{
int i_subpic; /* subpicture index */
- subpicture_t * p_free_subpic = NULL; /* first free subpicture */
- subpicture_t * p_destroyed_subpic = NULL; /* first destroyed subpic */
+ subpicture_t * p_subpic = NULL; /* first free subpicture */
+
+ /* Clear the default channel before writing into it */
+ if( i_channel == DEFAULT_CHAN )
+ {
+ vout_ClearOSDChannel( p_vout, DEFAULT_CHAN );
+ }
/* Get lock */
vlc_mutex_lock( &p_vout->subpicture_lock );
/*
* Look for an empty place
*/
+ p_subpic = NULL;
for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
{
- if( p_vout->p_subpicture[i_subpic].i_status == DESTROYED_SUBPICTURE )
- {
- /* Subpicture is marked for destruction, but is still allocated */
- if( (p_vout->p_subpicture[i_subpic].i_type == i_type) &&
- (p_vout->p_subpicture[i_subpic].i_size >= i_size) )
- {
- /* Memory size do match or is smaller : memory will not be
- * reallocated, and function can end immediately - this is
- * the best possible case, since no memory allocation needs
- * to be done */
- p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
-#ifdef TRACE_VOUT
- intf_DbgMsg("subpicture %p (in destroyed subpicture slot)",
- &p_vout->p_subpicture[i_subpic] );
-#endif
- vlc_mutex_unlock( &p_vout->subpicture_lock );
- return( &p_vout->p_subpicture[i_subpic] );
- }
- else if( p_destroyed_subpic == NULL )
- {
- /* Memory size do not match, but subpicture index will be kept
- * in case we find no other place */
- p_destroyed_subpic = &p_vout->p_subpicture[i_subpic];
- }
- }
- else if( (p_free_subpic == NULL) &&
- (p_vout->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE ))
+ if( p_vout->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE )
{
/* Subpicture is empty and ready for allocation */
- p_free_subpic = &p_vout->p_subpicture[i_subpic];
+ p_subpic = &p_vout->p_subpicture[i_subpic];
+ p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
+ break;
}
}
- /* If no free subpictures are available, use a destroyed subpicture */
- if( (p_free_subpic == NULL) && (p_destroyed_subpic != NULL ) )
+ /* If no free subpicture could be found */
+ if( p_subpic == NULL )
{
- /* No free subpicture or matching destroyed subpictures have been
- * found, but a destroyed subpicture is still avalaible */
- free( p_destroyed_subpic->p_data );
- p_free_subpic = p_destroyed_subpic;
+ msg_Err( p_vout, "subpicture heap is full" );
+ vlc_mutex_unlock( &p_vout->subpicture_lock );
+ return NULL;
}
- /*
- * Prepare subpicture
- */
- if( p_free_subpic != NULL )
+ /* Copy subpicture information, set some default values */
+ p_subpic->i_channel = i_channel;
+ p_subpic->i_type = i_type;
+ p_subpic->i_status = RESERVED_SUBPICTURE;
+
+ p_subpic->i_start = 0;
+ p_subpic->i_stop = 0;
+ p_subpic->b_ephemer = VLC_FALSE;
+
+ p_subpic->i_x = 0;
+ p_subpic->i_y = 0;
+ p_subpic->i_width = 0;
+ p_subpic->i_height = 0;
+ p_subpic->b_absolute= VLC_TRUE;
+ p_subpic->i_flags = 0;
+ p_subpic->pf_render = 0;
+ p_subpic->pf_destroy= 0;
+ p_subpic->p_sys = 0;
+
+ /* Remain last subpicture displayed in DEFAULT_CHAN */
+ if( i_channel == DEFAULT_CHAN )
{
- /* Allocate memory */
- switch( i_type )
- {
- case TEXT_SUBPICTURE: /* text subpicture */
- p_free_subpic->p_data = memalign( 16, i_size + 1 );
- break;
- case DVD_SUBPICTURE: /* DVD subpicture unit */
- p_free_subpic->p_data = memalign( 16, i_size );
- break;
-#ifdef DEBUG
- default:
- intf_ErrMsg("error: unknown subpicture type %d", i_type );
- p_free_subpic->p_data = NULL;
- break;
-#endif
- }
-
- if( p_free_subpic->p_data != NULL )
- {
- /* Copy subpicture information, set some default values */
- p_free_subpic->i_type = i_type;
- p_free_subpic->i_status = RESERVED_SUBPICTURE;
- p_free_subpic->i_size = i_size;
- p_free_subpic->i_x = 0;
- p_free_subpic->i_y = 0;
- p_free_subpic->i_width = 0;
- p_free_subpic->i_height = 0;
- p_free_subpic->i_horizontal_align = CENTER_RALIGN;
- p_free_subpic->i_vertical_align = CENTER_RALIGN;
- }
- else
- {
- /* Memory allocation failed : set subpicture as empty */
- p_free_subpic->i_type = EMPTY_SUBPICTURE;
- p_free_subpic->i_status = FREE_SUBPICTURE;
- p_free_subpic = NULL;
- intf_ErrMsg( "vout error: spu allocation returned %s",
- strerror( ENOMEM ) );
- }
-
-#ifdef TRACE_VOUT
- intf_DbgMsg("subpicture %p (in free subpicture slot)", p_free_subpic );
-#endif
- vlc_mutex_unlock( &p_vout->subpicture_lock );
- return( p_free_subpic );
+ p_vout->p_default_channel = p_subpic;
}
- /* No free or destroyed subpicture could be found */
- intf_DbgMsg( "warning: subpicture heap is full" );
vlc_mutex_unlock( &p_vout->subpicture_lock );
- return( NULL );
+
+ p_subpic->pf_create_region = __spu_CreateRegion;
+ p_subpic->pf_destroy_region = __spu_DestroyRegion;
+
+ return p_subpic;
}
-/*****************************************************************************
- * vout_DestroySubPicture: remove a subpicture from the heap
- *****************************************************************************
+/**
+ * Remove a subpicture from the heap
+ *
* This function frees a previously reserved subpicture.
* It is meant to be used when the construction of a picture aborted.
* This function does not need locking since reserved subpictures are ignored
* by the output thread.
- *****************************************************************************/
+ */
void vout_DestroySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
{
-#ifdef DEBUG
- /* Check if status is valid */
- if( ( p_subpic->i_status != RESERVED_SUBPICTURE )
- && ( p_subpic->i_status != READY_SUBPICTURE ) )
- {
- intf_ErrMsg("error: subpicture %p has invalid status %d",
- p_subpic, p_subpic->i_status );
- }
-#endif
+ /* Get lock */
+ vlc_mutex_lock( &p_vout->subpicture_lock );
- p_subpic->i_status = DESTROYED_SUBPICTURE;
+ /* There can be race conditions so we need to check the status */
+ if( p_subpic->i_status == FREE_SUBPICTURE )
+ {
+ vlc_mutex_unlock( &p_vout->subpicture_lock );
+ return;
+ }
-#ifdef TRACE_VOUT
- intf_DbgMsg("subpicture %p", p_subpic);
-#endif
+ /* Check if status is valid */
+ if( ( p_subpic->i_status != RESERVED_SUBPICTURE )
+ && ( p_subpic->i_status != READY_SUBPICTURE ) )
+ {
+ msg_Err( p_vout, "subpicture %p has invalid status %d",
+ p_subpic, p_subpic->i_status );
+ }
+
+ while( p_subpic->p_region )
+ {
+ subpicture_region_t *p_region = p_subpic->p_region;
+ p_subpic->p_region = p_region->p_next;
+ spu_DestroyRegion( p_vout, p_region );
+ }
+
+ if( p_subpic->pf_destroy )
+ {
+ p_subpic->pf_destroy( p_subpic );
+ }
+
+ p_subpic->i_status = FREE_SUBPICTURE;
+
+ vlc_mutex_unlock( &p_vout->subpicture_lock );
}
/*****************************************************************************
* vout_RenderSubPictures: render a subpicture list
*****************************************************************************
- * This function renders a sub picture unit.
+ * This function renders all sub picture units in the list.
*****************************************************************************/
void vout_RenderSubPictures( vout_thread_t *p_vout, picture_t *p_pic,
subpicture_t *p_subpic )
{
-#if 0
- p_vout_font_t p_font; /* text font */
- int i_width, i_height; /* subpicture dimensions */
-#endif
+ /* Load the blending module */
+ if( !p_vout->p_blend && p_subpic && p_subpic->p_region )
+ {
+ p_vout->p_blend = vlc_object_create( p_vout, sizeof(filter_t) );
+ vlc_object_attach( p_vout->p_blend, p_vout );
+ p_vout->p_blend->fmt_out.video.i_width =
+ p_vout->p_blend->fmt_out.video.i_visible_width =
+ p_vout->render.i_width;
+ p_vout->p_blend->fmt_out.video.i_height =
+ p_vout->p_blend->fmt_out.video.i_visible_height =
+ p_vout->render.i_height;
+ p_vout->p_blend->fmt_out.video.i_x_offset =
+ p_vout->p_blend->fmt_out.video.i_y_offset = 0;
+ p_vout->p_blend->fmt_out.video.i_aspect =
+ p_vout->render.i_aspect;
+ p_vout->p_blend->fmt_out.video.i_chroma =
+ p_vout->output.i_chroma;
+
+ p_vout->p_blend->fmt_in.video = p_subpic->p_region->fmt;
+
+ p_vout->p_blend->p_module =
+ module_Need( p_vout->p_blend, "video blending", 0, 0 );
+ }
+
+ /* Get lock */
+ vlc_mutex_lock( &p_vout->subpicture_lock );
- while( p_subpic != NULL )
+ /* Check i_status again to make sure spudec hasn't destroyed the subpic */
+ while( p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE )
{
- switch( p_subpic->i_type )
+ subpicture_region_t *p_region = p_subpic->p_region;
+
+ if( p_subpic->pf_render )
{
- case DVD_SUBPICTURE: /* DVD subpicture unit */
- vout_RenderRGBSPU( p_vout, p_pic, p_subpic );
- vout_RenderYUVSPU( p_vout, p_pic, p_subpic );
- break;
+ p_subpic->pf_render( p_vout, p_pic, p_subpic );
+ }
+ else while( p_region && p_vout->p_blend &&
+ p_vout->p_blend->pf_video_blend )
+ {
+ int i_x_offset = p_region->i_x + p_subpic->i_x;
+ int i_y_offset = p_region->i_y + p_subpic->i_y;
-#if 0
- case TEXT_SUBPICTURE: /* single line text */
- /* Select default font if not specified */
- p_font = p_subpic->type.text.p_font;
- if( p_font == NULL )
+ if( p_subpic->i_flags & OSD_ALIGN_BOTTOM )
+ {
+ i_y_offset += p_vout->output.i_height - p_region->fmt.i_height;
+ }
+ else if ( !(p_subpic->i_flags & OSD_ALIGN_TOP) )
{
- p_font = p_vout->p_default_font;
+ i_y_offset += p_vout->output.i_height / 2 -
+ p_region->fmt.i_height / 2;
}
- /* Compute text size (width and height fields are ignored)
- * and print it */
- vout_TextSize( p_font, p_subpic->type.text.i_style,
- p_subpic->p_data, &i_width, &i_height );
- if( !Align( p_vout, &p_subpic->i_x, &p_subpic->i_y,
- i_width, i_height, p_subpic->i_horizontal_align,
- p_subpic->i_vertical_align ) )
+ if( p_subpic->i_flags & OSD_ALIGN_RIGHT )
{
- vout_Print( p_font,
- p_vout->p_buffer[ p_vout->i_buffer_index ].p_data +
- p_subpic->i_x * p_vout->i_bytes_per_pixel +
- p_subpic->i_y * p_vout->i_bytes_per_line,
- p_vout->i_bytes_per_pixel, p_vout->i_bytes_per_line, p_subpic->type.text.i_char_color,
- p_subpic->type.text.i_border_color,
- p_subpic->type.text.i_bg_color,
- p_subpic->type.text.i_style, p_subpic->p_data, 100 );
- SetBufferArea( p_vout, p_subpic->i_x, p_subpic->i_y,
- i_width, i_height );
+ i_x_offset += p_vout->output.i_width - p_region->fmt.i_width;
+ }
+ else if ( !(p_subpic->i_flags & OSD_ALIGN_LEFT) )
+ {
+ i_x_offset += p_vout->output.i_width / 2 -
+ p_region->fmt.i_width / 2;
}
- break;
-#endif
- default:
-#ifdef DEBUG
- intf_ErrMsg( "error: unknown subpicture %p type %d",
- p_subpic, p_subpic->i_type );
-#endif
- break;
+ 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;
+ }
+
+ p_vout->p_blend->fmt_in.video = p_region->fmt;
+
+ /* Force cropping if requested */
+ if( p_vout->b_force_crop )
+ {
+ p_vout->p_blend->fmt_in.video.i_x_offset = p_vout->i_crop_x;
+ p_vout->p_blend->fmt_in.video.i_y_offset = p_vout->i_crop_y;
+ p_vout->p_blend->fmt_in.video.i_visible_width =
+ p_vout->i_crop_width;
+ p_vout->p_blend->fmt_in.video.i_visible_height =
+ p_vout->i_crop_height;
+ i_x_offset += p_vout->i_crop_x;
+ i_y_offset += p_vout->i_crop_y;
+ }
+
+ /* Force palette if requested */
+ if( p_vout->b_force_alpha && VLC_FOURCC('Y','U','V','P') ==
+ p_vout->p_blend->fmt_in.video.i_chroma )
+ {
+ p_vout->p_blend->fmt_in.video.p_palette->palette[0][3] =
+ p_vout->pi_alpha[0];
+ p_vout->p_blend->fmt_in.video.p_palette->palette[1][3] =
+ p_vout->pi_alpha[1];
+ p_vout->p_blend->fmt_in.video.p_palette->palette[2][3] =
+ p_vout->pi_alpha[2];
+ p_vout->p_blend->fmt_in.video.p_palette->palette[3][3] =
+ p_vout->pi_alpha[3];
+ }
+
+ p_vout->p_blend->pf_video_blend( p_vout->p_blend,
+ p_pic, p_pic, &p_region->picture, i_x_offset, i_y_offset );
+
+ p_region = p_region->p_next;
}
p_subpic = p_subpic->p_next;
}
+
+ vlc_mutex_unlock( &p_vout->subpicture_lock );
}
/*****************************************************************************
if( p_vout->p_subpicture[i_index].i_status == READY_SUBPICTURE )
{
/* If it is a DVD subpicture, check its date */
- if( p_vout->p_subpicture[i_index].i_type == DVD_SUBPICTURE )
+ if( p_vout->p_subpicture[i_index].i_type == MEMORY_SUBPICTURE )
{
- if( display_date > p_vout->p_subpicture[i_index].i_stop )
+ if( !p_vout->p_subpicture[i_index].b_ephemer
+ && display_date > p_vout->p_subpicture[i_index].i_stop )
{
/* Too late, destroy the subpic */
vout_DestroySubPicture( p_vout,
continue;
}
- if( display_date < p_vout->p_subpicture[i_index].i_start )
+ if( display_date
+ && display_date < p_vout->p_subpicture[i_index].i_start )
{
/* Too early, come back next monday */
continue;
p_vout->p_subpicture[i_index].p_next = p_subpic;
p_subpic = &p_vout->p_subpicture[i_index];
- /* If it's the 2nd youngest subpicture, register its date */ if( !ephemer_date || ephemer_date > p_subpic->i_start )
+ /* If it's the 2nd youngest subpicture, register its date */
+ if( !ephemer_date || ephemer_date > p_subpic->i_start )
{
ephemer_date = p_subpic->i_start;
}
}
/*****************************************************************************
- * vout_RenderRGBSPU: draw an SPU on a picture
+ * vout_RegisterOSDChannel: register an OSD channel
*****************************************************************************
- * This is a fast implementation of the subpicture drawing code. The data
- * has been preprocessed once in spu_decoder.c, so we don't need to parse the
- * RLE buffer again and again. Most sanity checks are done in spu_decoder.c
- * so that this routine can be as fast as possible.
+ * This function affects an ID to an OSD channel
*****************************************************************************/
-static void vout_RenderRGBSPU( const vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu )
+int vout_RegisterOSDChannel( vout_thread_t *p_vout )
{
-#if 0
- int i_len, i_color;
- u16 *p_source = (u16 *)p_spu->p_data;
-
- int i_xscale = ( p_buffer->i_pic_width << 6 ) / p_pic->i_width;
- int i_yscale = ( p_buffer->i_pic_height << 6 ) / p_pic->i_height;
-
- int i_width = p_spu->i_width * i_xscale;
- int i_height = p_spu->i_height * i_yscale;
+ msg_Dbg( p_vout, "Registering OSD channel, ID: %i",
+ p_vout->i_channel_count + 1 );
+ return ++p_vout->i_channel_count;
+}
- int i_x, i_y, i_ytmp, i_yreal, i_ynext;
+/*****************************************************************************
+ * vout_ClearOSDChannel: clear an OSD channel
+ *****************************************************************************
+ * This function destroys the subpictures which belong to the OSD channel
+ * corresponding to i_channel_id.
+ *****************************************************************************/
+void vout_ClearOSDChannel( vout_thread_t *p_vout, int i_channel )
+{
+ int i_subpic; /* subpicture index */
+ subpicture_t * p_subpic = NULL; /* first free subpicture */
- u8 *p_dest = p_buffer->p_data + ( i_width >> 6 ) * i_bytes_per_pixel
- /* Add the picture coordinates and the SPU coordinates */
- + ( p_buffer->i_pic_x + ((p_spu->i_x * i_xscale) >> 6))
- * i_bytes_per_pixel
- + ( p_buffer->i_pic_y + ((p_spu->i_y * i_yscale) >> 6))
- * i_bytes_per_line;
+ if( i_channel == DEFAULT_CHAN )
+ {
+ if( p_vout->p_default_channel != NULL )
+ {
+ vout_DestroySubPicture( p_vout, p_vout->p_default_channel );
+ }
+ p_vout->p_default_channel = NULL;
+ return;
+ }
- /* Draw until we reach the bottom of the subtitle */
- i_y = 0;
+ vlc_mutex_lock( &p_vout->subpicture_lock );
- while( i_y < i_height )
+ for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
{
- i_ytmp = i_y >> 6;
- i_y += i_yscale;
-
- /* Check whether we need to draw one line or more than one */
- if( i_ytmp + 1 >= ( i_y >> 6 ) )
+ p_subpic = &p_vout->p_subpicture[i_subpic];
+ if( p_subpic->i_status == FREE_SUBPICTURE
+ || ( p_subpic->i_status != RESERVED_SUBPICTURE
+ && p_subpic->i_status != READY_SUBPICTURE ) )
{
- /* Just one line : we precalculate i_y >> 6 */
- i_yreal = i_bytes_per_line * i_ytmp;
-
- /* Draw until we reach the end of the line */
- i_x = i_width;
+ continue;
+ }
- while( i_x )
+ if( p_subpic->i_channel == i_channel )
+ {
+ while( p_subpic->p_region )
{
- /* Get the RLE part */
- i_color = *p_source & 0x3;
-
- /* Draw the line */
- if( i_color )
- {
- i_len = i_xscale * ( *p_source++ >> 2 );
-
- memset( p_dest - i_bytes_per_pixel * ( i_x >> 6 )
- + i_yreal,
- p_palette[ i_color ],
- i_bytes_per_pixel * ( ( i_len >> 6 ) + 1 ) );
-
- i_x -= i_len;
- continue;
- }
-
- i_x -= i_xscale * ( *p_source++ >> 2 );
+ subpicture_region_t *p_region = p_subpic->p_region;
+ p_subpic->p_region = p_region->p_next;
+ spu_DestroyRegion( p_vout, p_region );
}
- }
- else
- {
- i_yreal = i_bytes_per_line * i_ytmp;
- i_ynext = i_bytes_per_line * i_y >> 6;
- /* Draw until we reach the end of the line */
- i_x = i_width;
-
- while( i_x )
+ if( p_subpic->pf_destroy )
{
- /* Get the RLE part */
- i_color = *p_source & 0x3;
-
- /* Draw as many lines as needed */
- if( i_color )
- {
- i_len = i_xscale * ( *p_source++ >> 2 );
-
- for( i_ytmp = i_yreal ;
- i_ytmp < i_ynext ;
- i_ytmp += i_bytes_per_line )
- {
- memset( p_dest - i_bytes_per_pixel * ( i_x >> 6 )
- + i_ytmp,
- p_palette[ i_color ],
- i_bytes_per_pixel * ( ( i_len >> 6 ) + 1 ) );
- }
-
- i_x -= i_len;
- continue;
- }
-
- i_x -= i_xscale * ( *p_source++ >> 2 );
+ p_subpic->pf_destroy( p_subpic );
}
+ p_subpic->i_status = FREE_SUBPICTURE;
}
}
-#endif
+
+ vlc_mutex_unlock( &p_vout->subpicture_lock );
}
/*****************************************************************************
- * vout_RenderYUVSPU: draw an SPU on an YUV overlay
+ * UpdateSPU: update subpicture settings
*****************************************************************************
- * This is a fast implementation of the subpicture drawing code. The data
- * has been preprocessed once in spu_decoder.c, so we don't need to parse the
- * RLE buffer again and again. Most sanity checks are done in spu_decoder.c
- * so that this routine can be as fast as possible.
+ * This function is called from CropCallback and at initialization time, to
+ * retrieve crop information from the input.
*****************************************************************************/
-static void vout_RenderYUVSPU( const vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu )
+static void UpdateSPU( vout_thread_t *p_vout, vlc_object_t *p_object )
{
- int i_len, i_color;
- u16 *p_source = (u16 *)p_spu->p_data;
+ vlc_value_t val;
- int i_x, i_y;
+ p_vout->b_force_alpha = VLC_FALSE;
+ p_vout->b_force_crop = VLC_FALSE;
- u8 *p_dest = p_pic->p->p_pixels + p_spu->i_x + p_spu->i_width
- + p_vout->output.i_width * ( p_spu->i_y + p_spu->i_height );
+ if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return;
- /* Draw until we reach the bottom of the subtitle */
- i_y = p_spu->i_height * p_vout->output.i_width;
+ p_vout->b_force_crop = VLC_TRUE;
+ var_Get( p_object, "x-start", &val );
+ p_vout->i_crop_x = val.i_int;
+ var_Get( p_object, "y-start", &val );
+ p_vout->i_crop_y = val.i_int;
+ var_Get( p_object, "x-end", &val );
+ p_vout->i_crop_width = val.i_int - p_vout->i_crop_x;
+ var_Get( p_object, "y-end", &val );
+ p_vout->i_crop_height = val.i_int - p_vout->i_crop_y;
- while( i_y )
+#if 0
+ if( var_Get( p_object, "color", &val ) == VLC_SUCCESS )
{
- /* Draw until we reach the end of the line */
- i_x = p_spu->i_width;
+ int i;
+ for( i = 0; i < 4; i++ )
+ {
+ p_vout->pi_color[i] = ((uint8_t *)val.p_address)[i];
+ }
+ }
+#endif
- while( i_x )
+ if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS )
+ {
+ int i;
+ for( i = 0; i < 4; i++ )
{
- /* Draw the line if needed */
- i_color = *p_source & 0x3;
+ p_vout->pi_alpha[i] = ((uint8_t *)val.p_address)[i];
+ p_vout->pi_alpha[i] = p_vout->pi_alpha[i] == 0xf ?
+ 0xff : p_vout->pi_alpha[i] << 4;
+ }
+ p_vout->b_force_alpha = VLC_TRUE;
+ }
- if( i_color )
- {
- i_len = *p_source++ >> 2;
- memset( p_dest - i_x - i_y, p_palette[ i_color ], i_len );
- i_x -= i_len;
- continue;
- }
+ msg_Dbg( p_vout, "crop: %i,%i,%i,%i, alpha: %i",
+ p_vout->i_crop_x, p_vout->i_crop_y,
+ p_vout->i_crop_width, p_vout->i_crop_height,
+ p_vout->b_force_alpha );
+}
- i_x -= *p_source++ >> 2;
- }
+/*****************************************************************************
+ * CropCallback: called when the highlight properties are changed
+ *****************************************************************************
+ * This callback is called from the input thread when we need cropping
+ *****************************************************************************/
+static int CropCallback( vlc_object_t *p_object, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ UpdateSPU( (vout_thread_t *)p_data, p_object );
+ return VLC_SUCCESS;
+}
- i_y -= p_vout->output.i_width;
- }
+/*****************************************************************************
+ * Buffers allocation callbacks for the filters
+ *****************************************************************************/
+static subpicture_t *spu_new_buffer( filter_t *p_filter )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_filter->p_owner;
+ subpicture_t *p_spu;
+
+ p_spu = vout_CreateSubPicture( p_vout, !DEFAULT_CHAN, MEMORY_SUBPICTURE );
+ return p_spu;
}
+static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_spu )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_filter->p_owner;
+ vout_DestroySubPicture( p_vout, p_spu );
+}
projects / vlc / blobdiff