* Local prototypes
*****************************************************************************/
static int InitThread ( vout_thread_t * );
-static void* RunThread ( vlc_object_t * );
+static void* RunThread ( void * );
static void ErrorThread ( vout_thread_t * );
static void CleanThread ( vout_thread_t * );
static void EndThread ( vout_thread_t * );
vlc_value_t, vlc_value_t, void * );
static int VideoFilter2Callback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static void PostProcessEnable( vout_thread_t * );
+static void PostProcessDisable( vout_thread_t * );
+static void PostProcessSetFilterQuality( vout_thread_t *p_vout );
+static int PostProcessCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/* From vout_intf.c */
int vout_Snapshot( vout_thread_t *, picture_t * );
vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
video_format_t *p_fmt )
{
- const bool b_vout_provided = p_vout != NULL;
if( !p_fmt )
{
/* Video output is no longer used.
vlc_object_detach( p_vout );
vlc_object_attach( p_vout, p_this );
-
- /* Display title if we are not using the vout given to vout_Request.
- * XXX for now b_vout_provided is always true at this stage */
- if( p_vout->p->b_title_show && !b_vout_provided )
- DisplayTitleOnOSD( p_vout );
}
}
/* Initialize misc stuff */
p_vout->i_changes = 0;
- p_vout->b_scale = 1;
+ p_vout->b_autoscale = 1;
+ p_vout->i_zoom = ZOOM_FP_FACTOR;
p_vout->b_fullscreen = 0;
p_vout->i_alignment = 0;
p_vout->p->render_time = 10;
p_vout->p->b_paused = false;
p_vout->p->i_pause_date = 0;
p_vout->pf_control = NULL;
- p_vout->p_window = NULL;
p_vout->p->i_par_num =
p_vout->p->i_par_den = 1;
p_vout->p->p_picture_displayed = NULL;
p_vout->p->i_picture_displayed_date = 0;
p_vout->p->b_picture_displayed = false;
p_vout->p->b_picture_empty = false;
+ p_vout->p->i_picture_qtype = QTYPE_NONE;
+
+ p_vout->p->snapshot.b_available = true;
+ p_vout->p->snapshot.i_request = 0;
+ p_vout->p->snapshot.p_picture = NULL;
+ vlc_mutex_init( &p_vout->p->snapshot.lock );
+ vlc_cond_init( &p_vout->p->snapshot.wait );
/* Initialize locks */
vlc_mutex_init( &p_vout->picture_lock );
var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
- var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_BOOL );
/* Initialize subpicture unit */
p_vout->p_spu = spu_Create( p_vout );
/* If the parent is not a VOUT object, that means we are at the start of
* the video output pipe */
- if( p_parent->i_object_type != VLC_OBJECT_VOUT )
+ if( vlc_internals( p_parent )->i_object_type != VLC_OBJECT_VOUT )
{
/* Look for the default filter configuration */
p_vout->p->psz_filter_chain =
"video filter" : "video output", psz_name, p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain );
free( psz_name );
+ vlc_object_set_destructor( p_vout, vout_Destructor );
+
if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
- vlc_object_set_destructor( p_vout, vout_Destructor );
+ spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
+ spu_Destroy( p_vout->p_spu );
+ p_vout->p_spu = NULL;
vlc_object_release( p_vout );
return NULL;
}
/* Create a few object variables for interface interaction */
+ /* Deinterlacing */
var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
text.psz_string = _("Deinterlace");
var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
}
var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
+ /* */
var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
text.psz_string = _("Filters");
var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
- if( vlc_thread_create( p_vout, "video output", RunThread,
- VLC_THREAD_PRIORITY_OUTPUT, true ) )
+ vlc_cond_init( &p_vout->p->change_wait );
+ if( vlc_clone( &p_vout->p->thread, RunThread, p_vout,
+ VLC_THREAD_PRIORITY_OUTPUT ) )
{
module_unneed( p_vout, p_vout->p_module );
p_vout->p_module = NULL;
- vlc_object_set_destructor( p_vout, vout_Destructor );
+ spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
+ spu_Destroy( p_vout->p_spu );
+ p_vout->p_spu = NULL;
vlc_object_release( p_vout );
return NULL;
}
- vlc_object_set_destructor( p_vout, vout_Destructor );
+ vlc_mutex_lock( &p_vout->change_lock );
+ while( !p_vout->p->b_ready )
+ { /* We are (ab)using the same condition in opposite directions for
+ * b_ready and b_done. This works because of the strict ordering. */
+ assert( !p_vout->p->b_done );
+ vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock );
+ }
+ vlc_mutex_unlock( &p_vout->change_lock );
if( p_vout->b_error )
{
* You HAVE to call it on vout created by vout_Create before vlc_object_release.
* You should NEVER call it on vout not obtained through vout_Create
* (like with vout_Request or vlc_object_find.)
- * You can use vout_CloseAndRelease() as a convenient method.
+ * You can use vout_CloseAndRelease() as a convenience method.
*****************************************************************************/
void vout_Close( vout_thread_t *p_vout )
{
assert( p_vout );
- vlc_object_kill( p_vout );
- vlc_thread_join( p_vout );
+ vlc_mutex_lock( &p_vout->change_lock );
+ p_vout->p->b_done = true;
+ vlc_cond_signal( &p_vout->p->change_wait );
+ vlc_mutex_unlock( &p_vout->change_lock );
+
+ vlc_mutex_lock( &p_vout->p->snapshot.lock );
+ p_vout->p->snapshot.b_available = false;
+ vlc_cond_broadcast( &p_vout->p->snapshot.wait );
+ vlc_mutex_unlock( &p_vout->p->snapshot.lock );
+
+ vlc_join( p_vout->p->thread, NULL );
module_unneed( p_vout, p_vout->p_module );
p_vout->p_module = NULL;
}
assert( !p_vout->p_module );
/* */
- spu_Destroy( p_vout->p_spu );
+ if( p_vout->p_spu )
+ spu_Destroy( p_vout->p_spu );
/* Destroy the locks */
+ vlc_cond_destroy( &p_vout->p->change_wait );
vlc_cond_destroy( &p_vout->p->picture_wait );
vlc_mutex_destroy( &p_vout->picture_lock );
vlc_mutex_destroy( &p_vout->change_lock );
vlc_mutex_destroy( &p_vout->p->vfilter_lock );
+ /* */
+ for( ;; )
+ {
+ picture_t *p_picture = p_vout->p->snapshot.p_picture;
+ if( !p_picture )
+ break;
+
+ p_vout->p->snapshot.p_picture = p_picture->p_next;
+
+ picture_Release( p_picture );
+ }
+ vlc_cond_destroy( &p_vout->p->snapshot.wait );
+ vlc_mutex_destroy( &p_vout->p->snapshot.lock );
+
+ /* */
free( p_vout->p->psz_filter_chain );
+ free( p_vout->p->psz_title );
config_ChainDestroy( p_vout->p_cfg );
/* */
void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date )
{
- vlc_object_lock( p_vout );
+ vlc_mutex_lock( &p_vout->change_lock );
assert( !p_vout->p->b_paused || !b_paused );
p_vout->p->b_paused = b_paused;
p_vout->p->i_pause_date = i_date;
- vlc_object_unlock( p_vout );
+ vlc_mutex_unlock( &p_vout->change_lock );
}
+
void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost )
{
- vlc_object_lock( p_vout );
+ vlc_mutex_lock( &p_vout->change_lock );
*pi_displayed = p_vout->p->i_picture_displayed;
*pi_lost = p_vout->p->i_picture_lost;
p_vout->p->i_picture_displayed = 0;
p_vout->p->i_picture_lost = 0;
- vlc_object_unlock( p_vout );
+ vlc_mutex_unlock( &p_vout->change_lock );
}
+
void vout_Flush( vout_thread_t *p_vout, mtime_t i_date )
{
vlc_mutex_lock( &p_vout->picture_lock );
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
}
+
void vout_FixLeaks( vout_thread_t *p_vout, bool b_forced )
{
int i_pic, i_ready_pic;
msg_Dbg( p_vout, "[%d] %d %d", i_pic, p_pic->i_status, p_pic->i_refcount );
p_pic->i_refcount = 0;
- vout_UsePictureLocked( p_vout, p_pic );
+
+ switch( p_pic->i_status )
+ {
+ case READY_PICTURE:
+ case DISPLAYED_PICTURE:
+ case RESERVED_PICTURE:
+ if( p_pic != p_vout->p->p_picture_displayed )
+ vout_UsePictureLocked( p_vout, p_pic );
+ break;
+ }
}
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
vlc_mutex_unlock( &p_vout->picture_lock );
}
+void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title )
+{
+ assert( psz_title );
+
+ if( !config_GetInt( p_vout, "osd" ) )
+ return;
+
+ vlc_mutex_lock( &p_vout->change_lock );
+ free( p_vout->p->psz_title );
+ p_vout->p->psz_title = strdup( psz_title );
+ vlc_mutex_unlock( &p_vout->change_lock );
+}
+
/*****************************************************************************
* InitThread: initialize video output thread
*****************************************************************************
AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y );
- msg_Dbg( p_vout, "picture in %ix%i (%i,%i,%ix%i), "
- "chroma %4.4s, ar %i:%i, sar %i:%i",
- p_vout->fmt_render.i_width, p_vout->fmt_render.i_height,
- p_vout->fmt_render.i_x_offset, p_vout->fmt_render.i_y_offset,
- p_vout->fmt_render.i_visible_width,
- p_vout->fmt_render.i_visible_height,
- (char*)&p_vout->fmt_render.i_chroma,
- i_aspect_x, i_aspect_y,
- p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den );
-
AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y );
- msg_Dbg( p_vout, "picture user %ix%i (%i,%i,%ix%i), "
- "chroma %4.4s, ar %i:%i, sar %i:%i",
- p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
- p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
- p_vout->fmt_in.i_visible_width,
- p_vout->fmt_in.i_visible_height,
- (char*)&p_vout->fmt_in.i_chroma,
- i_aspect_x, i_aspect_y,
- p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
-
if( !p_vout->fmt_out.i_width || !p_vout->fmt_out.i_height )
{
p_vout->fmt_out.i_width = p_vout->fmt_out.i_visible_width =
AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y );
- msg_Dbg( p_vout, "picture out %ix%i (%i,%i,%ix%i), "
- "chroma %4.4s, ar %i:%i, sar %i:%i",
- p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
- p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset,
- p_vout->fmt_out.i_visible_width,
- p_vout->fmt_out.i_visible_height,
- (char*)&p_vout->fmt_out.i_chroma,
- i_aspect_x, i_aspect_y,
- p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
-
/* FIXME removed the need of both fmt_* and heap infos */
/* Calculate shifts from system-updated masks */
PictureHeapFixRgb( &p_vout->render );
PictureHeapFixRgb( &p_vout->output );
VideoFormatImportRgb( &p_vout->fmt_out, &p_vout->output );
+ /* print some usefull debug info about different vout formats
+ */
+ msg_Dbg( p_vout, "pic render sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, ar %i:%i, sar %i:%i, msk r0x%x g0x%x b0x%x",
+ p_vout->fmt_render.i_width, p_vout->fmt_render.i_height,
+ p_vout->fmt_render.i_x_offset, p_vout->fmt_render.i_y_offset,
+ p_vout->fmt_render.i_visible_width,
+ p_vout->fmt_render.i_visible_height,
+ (char*)&p_vout->fmt_render.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den,
+ p_vout->fmt_render.i_rmask, p_vout->fmt_render.i_gmask, p_vout->fmt_render.i_bmask );
+
+ msg_Dbg( p_vout, "pic in sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, ar %i:%i, sar %i:%i, msk r0x%x g0x%x b0x%x",
+ p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
+ p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
+ p_vout->fmt_in.i_visible_width,
+ p_vout->fmt_in.i_visible_height,
+ (char*)&p_vout->fmt_in.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den,
+ p_vout->fmt_in.i_rmask, p_vout->fmt_in.i_gmask, p_vout->fmt_in.i_bmask );
+
+ msg_Dbg( p_vout, "pic out sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, ar %i:%i, sar %i:%i, msk r0x%x g0x%x b0x%x",
+ p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
+ p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset,
+ p_vout->fmt_out.i_visible_width,
+ p_vout->fmt_out.i_visible_height,
+ (char*)&p_vout->fmt_out.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den,
+ p_vout->fmt_out.i_rmask, p_vout->fmt_out.i_gmask, p_vout->fmt_out.i_bmask );
+
/* Check whether we managed to create direct buffers similar to
* the render buffers, ie same size and chroma */
if( ( p_vout->output.i_width == p_vout->render.i_width )
* terminated. It handles the pictures arriving in the video heap and the
* display device events.
*****************************************************************************/
-static void* RunThread( vlc_object_t *p_this )
+static void* RunThread( void *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ vout_thread_t *p_vout = p_this;
int i_idle_loops = 0; /* loops without displaying a picture */
+ int i_picture_qtype_last = QTYPE_NONE;
bool b_drop_late;
- int canc = vlc_savecancel();
-
/*
* Initialize thread
*/
b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" );
/* signal the creation of the vout */
- vlc_thread_ready( p_vout );
+ p_vout->p->b_ready = true;
+ vlc_cond_signal( &p_vout->p->change_wait );
if( p_vout->b_error )
{
EndThread( p_vout );
vlc_mutex_unlock( &p_vout->change_lock );
- vlc_restorecancel( canc );
return NULL;
}
- vlc_object_lock( p_vout );
-
- if( p_vout->p->b_title_show )
- DisplayTitleOnOSD( p_vout );
-
/*
* Main loop - it is not executed if an error occurred during
* initialization
*/
- while( vlc_object_alive( p_vout ) && !p_vout->b_error )
+ while( !p_vout->p->b_done && !p_vout->b_error )
{
/* Initialize loop variables */
const mtime_t current_date = mdate();
picture_t *p_directbuffer;
int i_index;
+ if( p_vout->p->b_title_show && p_vout->p->psz_title )
+ DisplayTitleOnOSD( p_vout );
+
vlc_mutex_lock( &p_vout->picture_lock );
/* Look for the earliest picture but after the last displayed one */
vout_UsePictureLocked( p_vout, p_pic );
p_vout->p->i_picture_lost++;
- msg_Warn( p_vout, "late picture skipped (%"PRId64")",
- current_date - p_pic->date );
+ msg_Warn( p_vout, "late picture skipped (%"PRId64" > %d)",
+ current_date - p_pic->date, - p_vout->p->render_time );
}
else if( ( !p_last || p_last->date < p_pic->date ) &&
( p_picture == NULL || p_pic->date < p_picture->date ) )
p_vout->p->p_picture_displayed = p_picture;
}
}
+
+ /* */
+ const int i_postproc_type = p_vout->p->i_picture_qtype;
+ const int i_postproc_state = (p_vout->p->i_picture_qtype != QTYPE_NONE) - (i_picture_qtype_last != QTYPE_NONE);
+
vlc_mutex_unlock( &p_vout->picture_lock );
if( p_picture == NULL )
/* FIXME it is ugly that b_snapshot is not locked but I do not
* know which lock to use (here and in the snapshot callback) */
- const bool b_snapshot = p_vout->p->b_snapshot && p_picture != NULL;
+ vlc_mutex_lock( &p_vout->p->snapshot.lock );
+ const bool b_snapshot = p_vout->p->snapshot.i_request > 0 && p_picture != NULL;
+ vlc_mutex_unlock( &p_vout->p->snapshot.lock );
/*
* Check for subpictures to display
*/
if( p_directbuffer && b_snapshot )
{
- /* FIXME lock (see b_snapshot) */
- p_vout->p->b_snapshot = false;
-
- vout_Snapshot( p_vout, p_directbuffer );
+ vlc_mutex_lock( &p_vout->p->snapshot.lock );
+ assert( p_vout->p->snapshot.i_request > 0 );
+ while( p_vout->p->snapshot.i_request > 0 )
+ {
+ picture_t *p_pic = picture_New( p_vout->fmt_out.i_chroma,
+ p_vout->fmt_out.i_width,
+ p_vout->fmt_out.i_height,
+ p_vout->fmt_out.i_aspect );
+ if( !p_pic )
+ break;
+
+ picture_Copy( p_pic, p_directbuffer );
+
+ p_pic->p_next = p_vout->p->snapshot.p_picture;
+ p_vout->p->snapshot.p_picture = p_pic;
+ p_vout->p->snapshot.i_request--;
+ }
+ vlc_cond_broadcast( &p_vout->p->snapshot.wait );
+ vlc_mutex_unlock( &p_vout->p->snapshot.lock );
}
/*
p_vout->p->render_time += current_render_time;
p_vout->p->render_time >>= 2;
}
+ else
+ msg_Dbg( p_vout, "skipped big render time %d > %d", (int) current_render_time,
+ (int) (p_vout->p->render_time +VOUT_DISPLAY_DELAY ) ) ;
}
/* Give back change lock */
vlc_mutex_unlock( &p_vout->change_lock );
- vlc_object_unlock( p_vout );
-
/* Sleep a while or until a given date */
if( display_date != 0 )
{
}
else
{
- /* Wait until a frame is being sent or a supurious wakeup (not a problem here) */
+ /* Wait until a frame is being sent or a spurious wakeup (not a problem here) */
vlc_mutex_lock( &p_vout->picture_lock );
vlc_cond_timedwait( &p_vout->p->picture_wait, &p_vout->picture_lock, current_date + VOUT_IDLE_SLEEP );
vlc_mutex_unlock( &p_vout->picture_lock );
/* On awakening, take back lock and send immediately picture
* to display. */
- vlc_object_lock( p_vout );
- /* Note: vlc_object_alive() could be false here, and we
- * could be dead */
+ /* Note: p_vout->p->b_done could be true here and now */
vlc_mutex_lock( &p_vout->change_lock );
/*
break;
}
+ while( p_vout->i_changes & VOUT_ON_TOP_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_ON_TOP_CHANGE;
+ vlc_mutex_unlock( &p_vout->change_lock );
+ vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, p_vout->b_on_top );
+ vlc_mutex_lock( &p_vout->change_lock );
+ }
+
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
/* this must only happen when the vout plugin is incapable of
p_vout->b_error = InitThread( p_vout );
if( p_vout->b_error )
- msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" );
+ msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed" );
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
break;
}
+ /* Post processing */
+ if( i_postproc_state == 1 )
+ PostProcessEnable( p_vout );
+ else if( i_postproc_state == -1 )
+ PostProcessDisable( p_vout );
+ if( i_postproc_state != 0 )
+ i_picture_qtype_last = i_postproc_type;
+
/* Check for "video filter2" changes */
vlc_mutex_lock( &p_vout->p->vfilter_lock );
if( p_vout->p->psz_vf2 )
free( p_vout->p->psz_vf2 );
p_vout->p->psz_vf2 = NULL;
+
+ if( i_picture_qtype_last != QTYPE_NONE )
+ PostProcessSetFilterQuality( p_vout );
}
vlc_mutex_unlock( &p_vout->p->vfilter_lock );
}
EndThread( p_vout );
vlc_mutex_unlock( &p_vout->change_lock );
- vlc_object_unlock( p_vout );
- vlc_restorecancel( canc );
return NULL;
}
*****************************************************************************/
static void ErrorThread( vout_thread_t *p_vout )
{
- /* Wait until a `die' order */
- while( vlc_object_alive( p_vout ) )
- vlc_object_wait( p_vout );
+ /* Wait until a `close' order */
+ while( !p_vout->p->b_done )
+ vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock );
}
/*****************************************************************************
/* FIXME does that function *really* need to be called inside the thread ? */
- /* Destroy subpicture unit */
+ /* Detach subpicture unit from both input and vout */
spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
+ vlc_object_detach( p_vout->p_spu );
/* Destroy the video filters2 */
filter_chain_Delete( p_vout->p->p_vf2_chain );
VideoFormatImportRgb( &p_chroma->fmt_in.video, &p_vout->render );
VideoFormatImportRgb( &p_chroma->fmt_out.video, &p_vout->output );
- p_chroma->p_module = module_need( p_chroma, "video filter2", NULL, 0 );
+ p_chroma->p_module = module_need( p_chroma, "video filter2", NULL, false );
if( p_chroma->p_module == NULL )
{
return VLC_SUCCESS;
}
-static void DisplayTitleOnOSD( vout_thread_t *p_vout )
+/*****************************************************************************
+ * Post-processing
+ *****************************************************************************/
+static bool PostProcessIsPresent( const char *psz_filter )
{
- input_thread_t *p_input;
- mtime_t i_now, i_stop;
+ const char *psz_pp = "postproc";
+ const size_t i_pp = strlen(psz_pp);
+ return psz_filter &&
+ !strncmp( psz_filter, psz_pp, strlen(psz_pp) ) &&
+ ( psz_filter[i_pp] == '\0' || psz_filter[i_pp] == ':' );
+}
- if( !config_GetInt( p_vout, "osd" ) ) return;
+static int PostProcessCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
+
+ static const char *psz_pp = "postproc";
- p_input = (input_thread_t *)vlc_object_find( p_vout,
- VLC_OBJECT_INPUT, FIND_ANYWHERE );
- if( p_input )
+ char *psz_vf2 = var_GetString( p_vout, "video-filter" );
+
+ if( newval.i_int <= 0 )
{
- i_now = mdate();
- i_stop = i_now + (mtime_t)(p_vout->p->i_title_timeout * 1000);
- char *psz_nowplaying =
- input_item_GetNowPlaying( input_GetItem( p_input ) );
- char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
- char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
- if( EMPTY_STR( psz_name ) )
+ if( PostProcessIsPresent( psz_vf2 ) )
{
- free( psz_name );
- psz_name = input_item_GetName( input_GetItem( p_input ) );
+ strcpy( psz_vf2, &psz_vf2[strlen(psz_pp)] );
+ if( *psz_vf2 == ':' )
+ strcpy( psz_vf2, &psz_vf2[1] );
}
- if( !EMPTY_STR( psz_nowplaying ) )
- {
- vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
- psz_nowplaying, NULL,
- p_vout->p->i_title_position,
- 30 + p_vout->fmt_in.i_width
- - p_vout->fmt_in.i_visible_width
- - p_vout->fmt_in.i_x_offset,
- 20 + p_vout->fmt_in.i_y_offset,
- i_now, i_stop );
- }
- else if( !EMPTY_STR( psz_artist ) )
+ }
+ else
+ {
+ if( !PostProcessIsPresent( psz_vf2 ) )
{
- char *psz_string = NULL;
- if( asprintf( &psz_string, "%s - %s", psz_name, psz_artist ) != -1 )
+ if( psz_vf2 )
+ {
+ char *psz_tmp = psz_vf2;
+ if( asprintf( &psz_vf2, "%s:%s", psz_pp, psz_tmp ) < 0 )
+ psz_vf2 = psz_tmp;
+ else
+ free( psz_tmp );
+ }
+ else
{
- vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
- psz_string, NULL,
- p_vout->p->i_title_position,
- 30 + p_vout->fmt_in.i_width
- - p_vout->fmt_in.i_visible_width
- - p_vout->fmt_in.i_x_offset,
- 20 + p_vout->fmt_in.i_y_offset,
- i_now, i_stop );
- free( psz_string );
+ psz_vf2 = strdup( psz_pp );
}
}
+ }
+ if( psz_vf2 )
+ var_SetString( p_vout, "video-filter", psz_vf2 );
+
+ return VLC_SUCCESS;
+}
+static void PostProcessEnable( vout_thread_t *p_vout )
+{
+ msg_Dbg( p_vout, "Post-processing available" );
+ var_Create( p_vout, "postprocess", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
+ for( int i = 0; i <= 6; i++ )
+ {
+ vlc_value_t val;
+ vlc_value_t text;
+ char psz_text[1+1];
+
+ val.i_int = i;
+ snprintf( psz_text, sizeof(psz_text), "%d", i );
+ if( i == 0 )
+ text.psz_string = _("Disable");
else
- {
- vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
- psz_name, NULL,
- p_vout->p->i_title_position,
- 30 + p_vout->fmt_in.i_width
- - p_vout->fmt_in.i_visible_width
- - p_vout->fmt_in.i_x_offset,
- 20 + p_vout->fmt_in.i_y_offset,
- i_now, i_stop );
- }
- vlc_object_release( p_input );
- free( psz_artist );
- free( psz_name );
- free( psz_nowplaying );
+ text.psz_string = psz_text;
+ var_Change( p_vout, "postprocess", VLC_VAR_ADDCHOICE, &val, &text );
}
+ var_AddCallback( p_vout, "postprocess", PostProcessCallback, NULL );
+
+ /* */
+ char *psz_filter = var_GetNonEmptyString( p_vout, "video-filter" );
+ int i_postproc_q = 0;
+ if( PostProcessIsPresent( psz_filter ) )
+ i_postproc_q = var_CreateGetInteger( p_vout, "postproc-q" );
+
+ var_SetInteger( p_vout, "postprocess", i_postproc_q );
+
+ free( psz_filter );
+}
+static void PostProcessDisable( vout_thread_t *p_vout )
+{
+ msg_Dbg( p_vout, "Post-processing no more available" );
+ var_Destroy( p_vout, "postprocess" );
+}
+static void PostProcessSetFilterQuality( vout_thread_t *p_vout )
+{
+ vlc_object_t *p_pp = vlc_object_find_name( p_vout, "postproc", FIND_CHILD );
+ if( !p_pp )
+ return;
+
+ var_SetInteger( p_pp, "postproc-q", var_GetInteger( p_vout, "postprocess" ) );
+ vlc_object_release( p_pp );
+}
+
+
+static void DisplayTitleOnOSD( vout_thread_t *p_vout )
+{
+ const mtime_t i_start = mdate();
+ const mtime_t i_stop = i_start + INT64_C(1000) * p_vout->p->i_title_timeout;
+
+ vlc_assert_locked( &p_vout->change_lock );
+
+ vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+ p_vout->p->psz_title, NULL,
+ p_vout->p->i_title_position,
+ 30 + p_vout->fmt_in.i_width
+ - p_vout->fmt_in.i_visible_width
+ - p_vout->fmt_in.i_x_offset,
+ 20 + p_vout->fmt_in.i_y_offset,
+ i_start, i_stop );
+
+ free( p_vout->p->psz_title );
+
+ p_vout->p->psz_title = NULL;
}
projects / vlc / blobdiff