Skip to content

V
vlc
Commit 958ae35d authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Reworked the way pictures are handled by the vout core. 

As a side effects, it may improve a bit frame stepping.
parent 889ae4fb
Show whitespace changes
Inline Side-by-side
Showing with 588 additions and 943 deletions
src/video_output/chrono.h 0 → 100644
View file @ 958ae35d
/*****************************************************************************
* chrono.h: vout chrono
*****************************************************************************
* Copyright (C) 2009-2010 Laurent Aimar
* $Id$
*
* Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
# error This header file can only be included from LibVLC.
#endif
#ifndef _VOUT_CHRONO_H
#define _VOUT_CHRONO_H
typedef struct {
int shift;
mtime_t avg;
mtime_t avg_initial;
int shift_var;
mtime_t var;
mtime_t start;
} vout_chrono_t;
static inline void vout_chrono_Init(vout_chrono_t *chrono, int shift, mtime_t avg_initial)
{
chrono->shift = shift;
chrono->avg_initial =
chrono->avg = avg_initial;
chrono->shift_var = shift+1;
chrono->var = avg_initial / 2;
chrono->start = VLC_TS_INVALID;
}
static inline void vout_chrono_Clean(vout_chrono_t *chrono)
{
VLC_UNUSED(chrono);
}
static inline void vout_chrono_Start(vout_chrono_t *chrono)
{
chrono->start = mdate();
}
static inline mtime_t vout_chrono_GetHigh(vout_chrono_t *chrono)
{
return chrono->avg + 2 * chrono->var;
}
static inline mtime_t vout_chrono_GetLow(vout_chrono_t *chrono)
{
return __MAX(chrono->avg - 2 * chrono->var, 0);
}
static inline void vout_chrono_Stop(vout_chrono_t *chrono)
{
assert(chrono->start != VLC_TS_INVALID);
/* */
const mtime_t duration = mdate() - chrono->start;
const mtime_t var = llabs( duration - chrono->avg );
/* Update average only if the current point is 'valid' */
if( duration < vout_chrono_GetHigh( chrono ) )
chrono->avg = (((1 << chrono->shift) - 1) * chrono->avg + duration) >> chrono->shift;
/* Always update the variance */
chrono->var = (((1 << chrono->shift_var) - 1) * chrono->var + var) >> chrono->shift_var;
/* For assert */
chrono->start = VLC_TS_INVALID;
}
static inline void vout_chrono_Reset(vout_chrono_t *chrono)
{
vout_chrono_t ch = *chrono;
vout_chrono_Clean(chrono);
vout_chrono_Init(chrono, ch.shift, ch.avg_initial);
}
#endif
src/video_output/display.c
View file @ 958ae35d
...@@ -58,7 +58,7 @@ static picture_t *VideoBufferNew(filter_t *filter) ...@@ -58,7 +58,7 @@ static picture_t *VideoBufferNew(filter_t *filter)
vd->fmt.i_width == fmt->i_width && vd->fmt.i_width == fmt->i_width &&
vd->fmt.i_height == fmt->i_height); vd->fmt.i_height == fmt->i_height);
picture_pool_t *pool = vout_display_Pool(vd, 1); picture_pool_t *pool = vout_display_Pool(vd, 3);
if (!pool) if (!pool)
return NULL; return NULL;
return picture_pool_Get(pool); return picture_pool_Get(pool);
......
src/video_output/video_output.c
View file @ 958ae35d
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org> * Gildas Bazin <gbazin@videolan.org>
* Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -37,20 +38,12 @@ ...@@ -37,20 +38,12 @@
#include <stdlib.h> /* free() */ #include <stdlib.h> /* free() */
#include <string.h> #include <string.h>
#include <assert.h>
#include <vlc_vout.h> #include <vlc_vout.h>
#include <vlc_filter.h> #include <vlc_filter.h>
#include <vlc_osd.h> #include <vlc_osd.h>
#include <assert.h>
#if defined( __APPLE__ )
/* Include darwin_specific.h here if needed */
#endif
/** FIXME This is quite ugly but needed while we don't have counters
* helpers */
//#include "input/input_internal.h"
#include <libvlc.h> #include <libvlc.h>
#include <vlc_input.h> #include <vlc_input.h>
...@@ -62,7 +55,6 @@ ...@@ -62,7 +55,6 @@
*****************************************************************************/ *****************************************************************************/
static int InitThread ( vout_thread_t * ); static int InitThread ( vout_thread_t * );
static void* RunThread ( void * ); static void* RunThread ( void * );
static void ErrorThread ( vout_thread_t * );
static void CleanThread ( vout_thread_t * ); static void CleanThread ( vout_thread_t * );
static void EndThread ( vout_thread_t * ); static void EndThread ( vout_thread_t * );
...@@ -104,34 +96,19 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout ); ...@@ -104,34 +96,19 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout );
/* Better be in advance when awakening than late... */ /* Better be in advance when awakening than late... */
#define VOUT_MWAIT_TOLERANCE ((mtime_t)(0.020*CLOCK_FREQ)) #define VOUT_MWAIT_TOLERANCE ((mtime_t)(0.020*CLOCK_FREQ))
/* Minimum number of direct pictures the video output will accept without
* creating additional pictures in system memory */
#ifdef OPTIMIZE_MEMORY
# define VOUT_MIN_DIRECT_PICTURES (VOUT_MAX_PICTURES/2)
#else
# define VOUT_MIN_DIRECT_PICTURES (3*VOUT_MAX_PICTURES/4)
#endif
/***************************************************************************** /*****************************************************************************
* Video Filter2 functions * Video Filter2 functions
*****************************************************************************/ *****************************************************************************/
static picture_t *video_new_buffer_filter( filter_t *p_filter ) static picture_t *video_new_buffer_filter( filter_t *p_filter )
{ {
vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner; vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner;
picture_t *p_picture = vout_CreatePicture( p_vout, 0, 0, 0 ); return picture_pool_Get(p_vout->p->private_pool);
p_picture->i_status = READY_PICTURE;
return p_picture;
} }
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic ) static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
{ {
vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner; vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner;
picture_Release(p_pic);
vlc_mutex_lock( &p_vout->p->picture_lock );
vout_UsePictureLocked( p_vout, p_pic );
vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data ) static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
...@@ -279,8 +256,7 @@ vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, ...@@ -279,8 +256,7 @@ vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
*****************************************************************************/ *****************************************************************************/
vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
{ {
vout_thread_t * p_vout; /* thread descriptor */ vout_thread_t *p_vout; /* thread descriptor */
int i_index; /* loop variable */
vlc_value_t text; vlc_value_t text;
...@@ -312,18 +288,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) ...@@ -312,18 +288,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
return NULL; return NULL;
} }
/* Initialize pictures - translation tables and functions /* */
* will be initialized later in InitThread */
for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++)
{
p_vout->p->p_picture[i_index].i_status = FREE_PICTURE;
p_vout->p->p_picture[i_index].i_type = EMPTY_PICTURE;
p_vout->p->p_picture[i_index].b_slow = 0;
}
/* Initialize the rendering heap */
I_RENDERPICTURES = 0;
p_vout->fmt_render = *p_fmt; /* FIXME palette */ p_vout->fmt_render = *p_fmt; /* FIXME palette */
p_vout->fmt_in = *p_fmt; /* FIXME palette */ p_vout->fmt_in = *p_fmt; /* FIXME palette */
...@@ -332,28 +297,29 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) ...@@ -332,28 +297,29 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
video_format_FixRgb( &p_vout->fmt_render ); video_format_FixRgb( &p_vout->fmt_render );
video_format_FixRgb( &p_vout->fmt_in ); video_format_FixRgb( &p_vout->fmt_in );
p_vout->p->render.i_last_used_pic = -1;
/* Zero the output heap */
I_OUTPUTPICTURES = 0;
/* Initialize misc stuff */ /* Initialize misc stuff */
p_vout->p->i_changes = 0; p_vout->p->i_changes = 0;
p_vout->p->b_fullscreen = 0; p_vout->p->b_fullscreen = 0;
p_vout->p->render_time = 10; vout_chrono_Init( &p_vout->p->render, 5, 10000 ); /* Arbitrary initial time */
p_vout->p->c_fps_samples = 0;
vout_statistic_Init( &p_vout->p->statistic ); vout_statistic_Init( &p_vout->p->statistic );
p_vout->p->b_filter_change = 0; p_vout->p->b_filter_change = 0;
p_vout->p->b_paused = false; p_vout->p->b_paused = false;
p_vout->p->i_pause_date = 0; p_vout->p->i_pause_date = 0;
p_vout->p->i_par_num = p_vout->p->i_par_num =
p_vout->p->i_par_den = 1; p_vout->p->i_par_den = 1;
p_vout->p->p_picture_displayed = NULL; p_vout->p->is_late_dropped = var_InheritBool( p_vout, "drop-late-frames" );
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->b_picture_empty = false;
p_vout->p->i_picture_qtype = QTYPE_NONE; p_vout->p->displayed.clock = VLC_TS_INVALID;
p_vout->p->b_picture_interlaced = false; p_vout->p->displayed.decoded = NULL;
p_vout->p->displayed.timestampX = VLC_TS_INVALID;
p_vout->p->displayed.qtype = QTYPE_NONE;
p_vout->p->displayed.is_interlaced = false;
p_vout->p->step.is_requested = false;
p_vout->p->step.last = VLC_TS_INVALID;
p_vout->p->step.timestamp = VLC_TS_INVALID;
p_vout->p->decoder_fifo = picture_fifo_New();
p_vout->p->decoder_pool = NULL;
vlc_mouse_Init( &p_vout->p->mouse ); vlc_mouse_Init( &p_vout->p->mouse );
...@@ -532,6 +498,12 @@ static void vout_Destructor( vlc_object_t * p_this ) ...@@ -532,6 +498,12 @@ static void vout_Destructor( vlc_object_t * p_this )
if( p_vout->p->p_spu ) if( p_vout->p->p_spu )
spu_Destroy( p_vout->p->p_spu ); spu_Destroy( p_vout->p->p_spu );
vout_chrono_Clean( &p_vout->p->render );
if( p_vout->p->decoder_fifo )
picture_fifo_Delete( p_vout->p->decoder_fifo );
assert( !p_vout->p->decoder_pool );
/* Destroy the locks */ /* Destroy the locks */
vlc_cond_destroy( &p_vout->p->change_wait ); vlc_cond_destroy( &p_vout->p->change_wait );
vlc_cond_destroy( &p_vout->p->picture_wait ); vlc_cond_destroy( &p_vout->p->picture_wait );
...@@ -564,19 +536,18 @@ void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date ) ...@@ -564,19 +536,18 @@ void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date )
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
p_vout->p->i_picture_displayed_date = 0;
if( p_vout->p->b_paused ) if( p_vout->p->b_paused )
{ {
const mtime_t i_duration = i_date - p_vout->p->i_pause_date; const mtime_t i_duration = i_date - p_vout->p->i_pause_date;
for( int i_index = 0; i_index < I_RENDERPICTURES; i_index++ ) if (p_vout->p->step.timestamp > VLC_TS_INVALID)
{ p_vout->p->step.timestamp += i_duration;
picture_t *p_pic = PP_RENDERPICTURE[i_index]; if (!b_paused)
p_vout->p->step.last = p_vout->p->step.timestamp;
picture_fifo_OffsetDate( p_vout->p->decoder_fifo, i_duration );
if (p_vout->p->displayed.decoded)
p_vout->p->displayed.decoded->date += i_duration;
if( p_pic->i_status == READY_PICTURE )
p_pic->date += i_duration;
}
vlc_cond_signal( &p_vout->p->picture_wait ); vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
...@@ -584,6 +555,8 @@ void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date ) ...@@ -584,6 +555,8 @@ void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date )
} }
else else
{ {
if (b_paused)
p_vout->p->step.last = p_vout->p->step.timestamp;
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
p_vout->p->b_paused = b_paused; p_vout->p->b_paused = b_paused;
...@@ -598,110 +571,98 @@ void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_l ...@@ -598,110 +571,98 @@ void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_l
pi_displayed, pi_lost ); pi_displayed, pi_lost );
} }
void vout_Flush( vout_thread_t *p_vout, mtime_t i_date ) static void Flush(vout_thread_t *vout, mtime_t date, bool below)
{ {
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_assert_locked(&vout->p->picture_lock);
p_vout->p->i_picture_displayed_date = 0; vout->p->step.timestamp = VLC_TS_INVALID;
for( int i = 0; i < p_vout->p->render.i_pictures; i++ ) vout->p->step.last = VLC_TS_INVALID;
{
picture_t *p_pic = p_vout->p->render.pp_picture[i];
if( p_pic->i_status == READY_PICTURE || picture_t *last = vout->p->displayed.decoded;
p_pic->i_status == DISPLAYED_PICTURE ) if (last &&
{ (( below && last->date <= date) ||
/* We cannot change picture status if it is in READY_PICTURE state, (!below && last->date >= date))) {
* Just make sure they won't be displayed */ vout->p->step.is_requested = true;
if( p_pic->date > i_date )
p_pic->date = i_date;
} }
} picture_fifo_Flush( vout->p->decoder_fifo, date, below );
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
void vout_FixLeaks( vout_thread_t *p_vout, bool b_forced ) void vout_Flush(vout_thread_t *vout, mtime_t date)
{ {
int i_pic, i_ready_pic; vlc_mutex_lock(&vout->p->picture_lock);
vlc_mutex_lock( &p_vout->p->picture_lock ); Flush(vout, date, false);
for( i_pic = 0, i_ready_pic = 0; i_pic < p_vout->p->render.i_pictures && !b_forced; i_pic++ ) vlc_cond_signal(&vout->p->picture_wait);
{ vlc_mutex_unlock(&vout->p->picture_lock);
const picture_t *p_pic = p_vout->p->render.pp_picture[i_pic]; }
if( p_pic->i_status == READY_PICTURE ) static void vout_Reset(vout_thread_t *vout)
{ {
i_ready_pic++; #warning "TODO reset pause in vout_Reset"
/* If we have at least 2 ready pictures, wait for the vout thread to vlc_mutex_lock(&vout->p->picture_lock);
* process one */ Flush(vout, INT64_MAX, true);
if( i_ready_pic >= 2 ) if (vout->p->decoder_pool)
break; picture_pool_NonEmpty(vout->p->decoder_pool, true);
vlc_cond_signal( &vout->p->picture_wait );
vlc_mutex_unlock(&vout->p->picture_lock);
}
continue; void vout_FixLeaks( vout_thread_t *vout, bool b_forced )
{
#warning "TODO split vout_FixLeaks into vout_FixLeaks and vout_Reset"
if (b_forced) {
vout_Reset(vout);
return;
} }
if( p_pic->i_status == DISPLAYED_PICTURE ) vlc_mutex_lock(&vout->p->picture_lock);
{
/* If at least one displayed picture is not referenced picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo);
* let vout free it */ if (!picture) {
if( p_pic->i_refcount == 0 ) picture = picture_pool_Get(vout->p->decoder_pool);
break;
}
} }
if( i_pic < p_vout->p->render.i_pictures && !b_forced )
{ if (picture) {
vlc_mutex_unlock( &p_vout->p->picture_lock ); picture_Release(picture);
/* Not all pictures has been displayed yet or some are
* free */
vlc_mutex_unlock(&vout->p->picture_lock);
return; return;
} }
/* Too many pictures are still referenced, there is probably a bug /* There is no reason that no pictures are available, force one
* with the decoder */ * from the pool, becarefull with it though */
if( !b_forced ) msg_Err(vout, "pictures leaked, trying to workaround");
msg_Err( p_vout, "pictures leaked, resetting the heap" );
/* Just free all the pictures */ /* */
for( i_pic = 0; i_pic < p_vout->p->render.i_pictures; i_pic++ ) picture_pool_NonEmpty(vout->p->decoder_pool, false);
{
picture_t *p_pic = p_vout->p->render.pp_picture[i_pic];
msg_Dbg( p_vout, "[%d] %d %d", i_pic, p_pic->i_status, p_pic->i_refcount );
p_pic->i_refcount = 0;
switch( p_pic->i_status ) vlc_cond_signal(&vout->p->picture_wait);
{ vlc_mutex_unlock(&vout->p->picture_lock);
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->p->picture_lock );
} }
void vout_NextPicture( vout_thread_t *p_vout, mtime_t *pi_duration ) void vout_NextPicture(vout_thread_t *vout, mtime_t *duration)
{ {
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock(&vout->p->picture_lock);
const mtime_t i_displayed_date = p_vout->p->i_picture_displayed_date; vout->p->b_picture_empty = false;
vout->p->step.is_requested = true;
p_vout->p->b_picture_displayed = false; /* FIXME I highly doubt that it can works with only one cond_t FIXME */
p_vout->p->b_picture_empty = false; vlc_cond_signal(&vout->p->picture_wait);
if( p_vout->p->p_picture_displayed )
{
p_vout->p->p_picture_displayed->date = 1;
vlc_cond_signal( &p_vout->p->picture_wait );
}
while( !p_vout->p->b_picture_displayed && !p_vout->p->b_picture_empty ) while (vout->p->step.is_requested && !vout->p->b_picture_empty)
vlc_cond_wait( &p_vout->p->picture_wait, &p_vout->p->picture_lock ); vlc_cond_wait(&vout->p->picture_wait, &vout->p->picture_lock);
*pi_duration = __MAX( p_vout->p->i_picture_displayed_date - i_displayed_date, 0 ); if (vout->p->step.last > VLC_TS_INVALID &&
vout->p->step.timestamp > vout->p->step.last) {
*duration = vout->p->step.timestamp - vout->p->step.last;
vout->p->step.last = vout->p->step.timestamp;
} else {
*duration = 0;
}
/* TODO advance subpicture by the duration ... */ /* TODO advance subpicture by the duration ... */
vlc_mutex_unlock(&vout->p->picture_lock);
vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title ) void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title )
...@@ -738,25 +699,7 @@ static int InitThread( vout_thread_t *p_vout ) ...@@ -738,25 +699,7 @@ static int InitThread( vout_thread_t *p_vout )
if( vout_InitWrapper( p_vout ) ) if( vout_InitWrapper( p_vout ) )
return VLC_EGENERIC; return VLC_EGENERIC;
p_vout->p->p_picture_displayed = NULL; p_vout->p->displayed.decoded = NULL;
if( !I_OUTPUTPICTURES )
{
msg_Err( p_vout, "plugin was unable to allocate at least "
"one direct buffer" );
vout_EndWrapper( p_vout );
return VLC_EGENERIC;
}
if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
{
msg_Err( p_vout, "plugin allocated too many direct buffers, "
"our internal buffers must have overflown." );
vout_EndWrapper( p_vout );
return VLC_EGENERIC;
}
msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
assert( p_vout->fmt_out.i_width > 0 && p_vout->fmt_out.i_height > 0 ); assert( p_vout->fmt_out.i_width > 0 && p_vout->fmt_out.i_height > 0 );
if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num ) if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num )
...@@ -806,454 +749,369 @@ static int InitThread( vout_thread_t *p_vout ) ...@@ -806,454 +749,369 @@ static int InitThread( vout_thread_t *p_vout )
assert( p_vout->fmt_out.i_width == p_vout->fmt_render.i_width && assert( p_vout->fmt_out.i_width == p_vout->fmt_render.i_width &&
p_vout->fmt_out.i_height == p_vout->fmt_render.i_height && p_vout->fmt_out.i_height == p_vout->fmt_render.i_height &&
p_vout->fmt_out.i_chroma == p_vout->fmt_render.i_chroma ); p_vout->fmt_out.i_chroma == p_vout->fmt_render.i_chroma );
/* Check whether we managed to create direct buffers similar to
* the render buffers, ie same size and chroma */
/* Cool ! We have direct buffers, we can ask the decoder to
* directly decode into them ! Map the first render buffers to
* the first direct buffers, but keep the first direct buffer
* for memcpy operations */
for( i = 1; i < VOUT_MAX_PICTURES; i++ )
{
if( p_vout->p->p_picture[ i ].i_type != DIRECT_PICTURE &&
I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 &&
p_vout->p->p_picture[ i - 1 ].i_type == DIRECT_PICTURE )
{
/* We have enough direct buffers so there's no need to
* try to use system memory buffers. */
break;
}
PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p->p_picture[ i ];
I_RENDERPICTURES++;
}
msg_Dbg( p_vout, "direct render, mapping " assert( p_vout->p->decoder_pool );
"render pictures 0-%i to system pictures 1-%i",
VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/***************************************************************************** static int ThreadDisplayPicture(vout_thread_t *vout,
* RunThread: video output thread bool now, mtime_t *deadline)
*****************************************************************************
* Video output thread. This function does only returns when the thread is
* terminated. It handles the pictures arriving in the video heap and the
* display device events.
*****************************************************************************/
static void* RunThread( void *p_this )
{ {
vout_thread_t *p_vout = p_this; int displayed_count = 0;
bool b_has_wrapper; int lost_count = 0;
int i_idle_loops = 0; /* loops without displaying a picture */
int i_picture_qtype_last = QTYPE_NONE; for (;;) {
bool b_picture_interlaced_last = false; const mtime_t date = mdate();
mtime_t i_picture_interlaced_last_date; const bool is_paused = vout->p->b_paused;
bool redisplay = is_paused && !now;
/* bool is_forced;
* Initialize thread
*/ /* FIXME/XXX we must redisplay the last decoded picture (because
b_has_wrapper = !vout_OpenWrapper( p_vout, p_vout->p->psz_module_name ); * of potential vout updated, or filters update or SPU update)
* For now a high update period is needed but it coulmd be removed
vlc_mutex_lock( &p_vout->p->change_lock ); * if and only if:
* - vout module emits events from theselves.
if( b_has_wrapper ) * - *and* SPU is modified to emit an event or a deadline when needed.
p_vout->p->b_error = InitThread( p_vout ); *
else * So it will be done latter.
p_vout->p->b_error = true;
/* signal the creation of the vout */
p_vout->p->b_ready = true;
vlc_cond_signal( &p_vout->p->change_wait );
if( p_vout->p->b_error )
goto exit_thread;
/* */
const bool b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" );
i_picture_interlaced_last_date = mdate();
/*
* Main loop - it is not executed if an error occurred during
* initialization
*/ */
while( !p_vout->p->b_done && !p_vout->p->b_error ) if (!redisplay) {
{ picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo);
/* Initialize loop variables */ if (peek) {
const mtime_t current_date = mdate(); is_forced = peek->b_force || is_paused || now;
picture_t *p_picture; *deadline = (is_forced ? date : peek->date) - vout_chrono_GetHigh(&vout->p->render);
picture_t *p_filtered_picture; picture_Release(peek);
mtime_t display_date; } else {
picture_t *p_directbuffer; redisplay = true;
int i_index; }
}
if( p_vout->p->b_title_show && p_vout->p->psz_title ) if (redisplay) {
DisplayTitleOnOSD( p_vout ); /* FIXME a better way for this delay is needed */
const mtime_t paused_display_period = 80000;
vlc_mutex_lock( &p_vout->p->picture_lock ); const mtime_t date_update = vout->p->displayed.clock + paused_display_period;
if (date_update > date || !vout->p->displayed.decoded) {
/* Look for the earliest picture but after the last displayed one */ *deadline = vout->p->displayed.decoded ? date_update : VLC_TS_INVALID;
picture_t *p_last = p_vout->p->p_picture_displayed;; break;
p_picture = NULL;
for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
picture_t *p_pic = PP_RENDERPICTURE[i_index];
if( p_pic->i_status != READY_PICTURE )
continue;
if( p_vout->p->b_paused && p_last && p_last->date > 1 )
continue;
if( p_last && p_pic != p_last && p_pic->date <= p_last->date )
{
/* Drop old picture */
vout_UsePictureLocked( p_vout, p_pic );
}
else if( !p_vout->p->b_paused && !p_pic->b_force && p_pic != p_last &&
p_pic->date < current_date + p_vout->p->render_time &&
b_drop_late )
{
/* Picture is late: it will be destroyed and the thread
* will directly choose the next picture */
vout_UsePictureLocked( p_vout, p_pic );
vout_statistic_Update( &p_vout->p->statistic, 0, 1 );
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_picture = p_pic;
}
}
if( !p_picture )
{
p_picture = p_last;
if( !p_vout->p->b_picture_empty )
{
p_vout->p->b_picture_empty = true;
vlc_cond_signal( &p_vout->p->picture_wait );
}
} }
/* */
display_date = 0; is_forced = true;
if( p_picture ) *deadline = date - vout_chrono_GetHigh(&vout->p->render);
{
display_date = p_picture->date;
/* If we found better than the last picture, destroy it */
if( p_last && p_picture != p_last )
{
vout_UsePictureLocked( p_vout, p_last );
p_vout->p->p_picture_displayed = p_last = NULL;
} }
/* Compute FPS rate */ /* If we are too early and can wait, do it */
p_vout->p->p_fps_sample[ p_vout->p->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; if (date < *deadline && !now)
break;
if( !p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY ) picture_t *decoded;
{ if (redisplay) {
/* A picture is ready to be rendered, but its rendering date decoded = vout->p->displayed.decoded;
* is far from the current one so the thread will perform an vout->p->displayed.decoded = NULL;
* empty loop as if no picture were found. The picture state } else {
* is unchanged */ decoded = picture_fifo_Pop(vout->p->decoder_fifo);
p_picture = NULL; assert(decoded);
display_date = 0; if (!is_forced && !vout->p->is_late_dropped) {
} const mtime_t predicted = date + vout_chrono_GetLow(&vout->p->render);
else if( p_picture == p_last ) const mtime_t late = predicted - decoded->date;
{ if (late > 0) {
/* We are asked to repeat the previous picture, but we first const mtime_t late_threshold = 20000; /* 20ms */
* wait for a couple of idle loops */ msg_Dbg(vout, "picture might be displayed late (missing %d ms)", (int)(late/1000));
if( i_idle_loops < 4 ) if (late > late_threshold) {
{ msg_Warn(vout, "rejected picture because of render time");
p_picture = NULL; /* TODO */
display_date = 0; picture_Release(decoded);
} lost_count++;
else break;
{
/* We set the display date to something high, otherwise
* we'll have lots of problems with late pictures */
display_date = current_date + p_vout->p->render_time;
} }
} }
else if( p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY )
{
display_date = current_date + VOUT_DISPLAY_DELAY;
} }
if( p_picture ) vout->p->displayed.is_interlaced = !decoded->b_progressive;
{ vout->p->displayed.qtype = decoded->i_qtype;
if( p_picture->date > 1 )
{
p_vout->p->i_picture_displayed_date = p_picture->date;
if( p_picture != p_last && !p_vout->p->b_picture_displayed )
{
p_vout->p->b_picture_displayed = true;
vlc_cond_signal( &p_vout->p->picture_wait );
}
}
p_vout->p->p_picture_displayed = p_picture;
}
} }
vout->p->displayed.timestampX = decoded->date;
/* */ /* */
const int i_postproc_type = p_vout->p->i_picture_qtype; if (vout->p->displayed.decoded)
const int i_postproc_state = (p_vout->p->i_picture_qtype != QTYPE_NONE) - (i_picture_qtype_last != QTYPE_NONE); picture_Release(vout->p->displayed.decoded);
picture_Hold(decoded);
vout->p->displayed.decoded = decoded;
const bool b_picture_interlaced = p_vout->p->b_picture_interlaced; /* */
const int i_picture_interlaced_state = (!!p_vout->p->b_picture_interlaced) - (!!b_picture_interlaced_last); #warning "TODO interlace+postproc"
#if 0
const int postproc_type = vout->p->i_picture_qtype;
const int postproc_state = (vout->p->i_picture_qtype != QTYPE_NONE) - (picture_qtype_last != QTYPE_NONE);
vlc_mutex_unlock( &p_vout->p->picture_lock ); const bool is_picture_interlaced = p_vout->p->b_picture_interlaced;
const int picture_interlaced_state = (!!p_vout->p->b_picture_interlaced) - (!!b_picture_interlaced_last);
#endif
if( p_picture == NULL ) vout_chrono_Start(&vout->p->render);
i_idle_loops++;
p_filtered_picture = NULL; picture_t *filtered = NULL;
if( p_picture ) if (decoded) {
{ vlc_mutex_lock(&vout->p->vfilter_lock);
vlc_mutex_lock( &p_vout->p->vfilter_lock ); filtered = filter_chain_VideoFilter(vout->p->p_vf2_chain, decoded);
p_filtered_picture = filter_chain_VideoFilter( p_vout->p->p_vf2_chain, //assert(filtered == decoded); // TODO implement
p_picture ); vlc_mutex_unlock(&vout->p->vfilter_lock);
vlc_mutex_unlock( &p_vout->p->vfilter_lock ); if (!filtered)
continue;
} }
const bool b_snapshot = vout_snapshot_IsRequested( &p_vout->p->snapshot );
/* /*
* Check for subpictures to display * Check for subpictures to display
*/ */
mtime_t spu_render_time; const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
if( p_vout->p->b_paused ) mtime_t spu_render_time = is_forced ? mdate() : filtered->date;
spu_render_time = p_vout->p->i_pause_date; if (vout->p->b_paused)
else if( p_picture ) spu_render_time = vout->p->i_pause_date;
spu_render_time = p_picture->date > 1 ? p_picture->date : mdate();
else else
spu_render_time = 0; spu_render_time = filtered->date > 1 ? filtered->date : mdate();
subpicture_t *p_subpic = spu_SortSubpictures( p_vout->p->p_spu, subpicture_t *subpic = spu_SortSubpictures(vout->p->p_spu,
spu_render_time, spu_render_time,
b_snapshot ); do_snapshot);
/* /*
* Perform rendering * Perform rendering
*
* We have to:
* - be sure to end up with a direct buffer.
* - blend subtitles, and in a fast access buffer
*/ */
vout_statistic_Update( &p_vout->p->statistic, 1, 0 ); picture_t *direct = NULL;
p_directbuffer = vout_RenderPicture( p_vout, if (filtered &&
p_filtered_picture, p_subpic, (vout->p->decoder_pool != vout->p->display_pool || subpic)) {
spu_render_time ); picture_t *render;
if (vout->p->is_decoder_pool_slow)
render = picture_NewFromFormat(&vout->fmt_out);
else if (vout->p->decoder_pool != vout->p->display_pool)
render = picture_pool_Get(vout->p->display_pool);
else
render = picture_pool_Get(vout->p->private_pool);
/* if (render) {
* Take a snapshot if requested picture_Copy(render, filtered);
*/
if( p_directbuffer && b_snapshot )
vout_snapshot_Set( &p_vout->p->snapshot,
&p_vout->fmt_out, p_directbuffer );
/* spu_RenderSubpictures(vout->p->p_spu,
* Call the plugin-specific rendering method if there is one render, &vout->fmt_out,
*/ subpic, &vout->fmt_in, spu_render_time);
if( p_filtered_picture != NULL && p_directbuffer != NULL )
{
/* Render the direct buffer returned by vout_RenderPicture */
vout_RenderWrapper( p_vout, p_directbuffer );
} }
if (vout->p->is_decoder_pool_slow) {
direct = picture_pool_Get(vout->p->display_pool);
if (direct)
picture_Copy(direct, render);
picture_Release(render);
/* } else {
* Sleep, wake up direct = render;
*/
if( display_date != 0 && p_directbuffer != NULL )
{
mtime_t current_render_time = mdate() - current_date;
/* if render time is very large we don't include it in the mean */
if( current_render_time < p_vout->p->render_time +
VOUT_DISPLAY_DELAY )
{
/* Store render time using a sliding mean weighting to
* current value in a 3 to 1 ratio*/
p_vout->p->render_time *= 3;
p_vout->p->render_time += current_render_time;
p_vout->p->render_time >>= 2;
} }
else picture_Release(filtered);
msg_Dbg( p_vout, "skipped big render time %d > %d", (int) current_render_time, filtered = NULL;
(int) (p_vout->p->render_time +VOUT_DISPLAY_DELAY ) ) ; } else {
direct = filtered;
} }
/* Give back change lock */ /*
vlc_mutex_unlock( &p_vout->p->change_lock ); * Take a snapshot if requested
*/
if (direct && do_snapshot)
vout_snapshot_Set(&vout->p->snapshot, &vout->fmt_out, direct);
/* Sleep a while or until a given date */ /* Render the direct buffer returned by vout_RenderPicture */
if( display_date != 0 ) if (direct) {
{ vout_RenderWrapper(vout, direct);
/* If there are *vout* filters in the chain, better give them the picture
* in advance */ vout_chrono_Stop(&vout->p->render);
if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain ) #if 0
{ {
mwait( display_date - VOUT_MWAIT_TOLERANCE ); static int i = 0;
if (((i++)%10) == 0)
msg_Info(vout, "render: avg %d ms var %d ms",
(int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000));
} }
} #endif
else
{
/* Wait until a frame is being sent or a spurious wakeup (not a problem here) */
vlc_mutex_lock( &p_vout->p->picture_lock );
vlc_cond_timedwait( &p_vout->p->picture_wait, &p_vout->p->picture_lock, current_date + VOUT_IDLE_SLEEP );
vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
/* On awakening, take back lock and send immediately picture /* Wait the real date (for rendering jitter) */
* to display. */ if (!is_forced)
/* Note: p_vout->p->b_done could be true here and now */ mwait(decoded->date);
vlc_mutex_lock( &p_vout->p->change_lock );
/*
* Display the previously rendered picture
*/
if( p_filtered_picture != NULL && p_directbuffer != NULL )
{
/* Display the direct buffer returned by vout_RenderPicture */ /* Display the direct buffer returned by vout_RenderPicture */
vout_DisplayWrapper( p_vout, p_directbuffer ); vout->p->displayed.clock = mdate();
if (direct)
vout_DisplayWrapper(vout, direct);
/* Tell the vout this was the last picture and that it does not displayed_count++;
* need to be forced anymore. */ break;
p_picture->b_force = false;
} }
/* Drop the filtered picture if created by video filters */ vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count);
if( p_filtered_picture != NULL && p_filtered_picture != p_picture ) if (displayed_count <= 0)
{ return VLC_EGENERIC;
vlc_mutex_lock( &p_vout->p->picture_lock ); return VLC_SUCCESS;
vout_UsePictureLocked( p_vout, p_filtered_picture ); }
vlc_mutex_unlock( &p_vout->p->picture_lock );
}
if( p_picture != NULL ) /*****************************************************************************
{ * RunThread: video output thread
/* Reinitialize idle loop count */ *****************************************************************************
i_idle_loops = 0; * Video output thread. This function does only returns when the thread is
} * terminated. It handles the pictures arriving in the video heap and the
* display device events.
*****************************************************************************/
static void *RunThread(void *object)
{
vout_thread_t *vout = object;
bool has_wrapper;
/* /*
* Check events and manage thread * Initialize thread
*/ */
if( vout_ManageWrapper( p_vout ) ) has_wrapper = !vout_OpenWrapper(vout, vout->p->psz_module_name);
{
/* A fatal error occurred, and the thread must terminate
* immediately, without displaying anything - setting b_error to 1
* causes the immediate end of the main while() loop. */
// FIXME pf_end
p_vout->p->b_error = 1;
break;
}
if( p_vout->p->i_changes & VOUT_ON_TOP_CHANGE ) vlc_mutex_lock(&vout->p->change_lock);
p_vout->p->i_changes &= ~VOUT_ON_TOP_CHANGE;
if( p_vout->p->i_changes & VOUT_PICTURE_BUFFERS_CHANGE ) if (has_wrapper)
{ vout->p->b_error = InitThread(vout);
/* This happens when the picture buffers need to be recreated. else
* This is useful on multimonitor displays for instance. vout->p->b_error = true;
*
* Warning: This only works when the vout creates only 1 picture
* buffer!! */
p_vout->p->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE;
vlc_mutex_lock( &p_vout->p->picture_lock ); /* signal the creation of the vout */
vout->p->b_ready = true;
vlc_cond_signal(&vout->p->change_wait);
vout_EndWrapper( p_vout ); if (vout->p->b_error)
goto exit_thread;
I_OUTPUTPICTURES = I_RENDERPICTURES = 0; /* */
bool last_picture_interlaced = false;
int last_picture_qtype = QTYPE_NONE;
mtime_t last_picture_interlaced_date = mdate();
p_vout->p->b_error = InitThread( p_vout ); /*
if( p_vout->p->b_error ) * Main loop - it is not executed if an error occurred during
msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed" ); * initialization
*/
while (!vout->p->b_done && !vout->p->b_error) {
/* */
if(vout->p->b_title_show && vout->p->psz_title)
DisplayTitleOnOSD(vout);
vlc_cond_signal( &p_vout->p->picture_wait ); vlc_mutex_lock(&vout->p->picture_lock);
vlc_mutex_unlock( &p_vout->p->picture_lock );
if( p_vout->p->b_error ) mtime_t deadline = VLC_TS_INVALID;
bool has_displayed = !ThreadDisplayPicture(vout, vout->p->step.is_requested, &deadline);
if (has_displayed) {
vout->p->step.timestamp = vout->p->displayed.timestampX;
if (vout->p->step.last <= VLC_TS_INVALID)
vout->p->step.last = vout->p->step.timestamp;
}
if (vout->p->step.is_requested) {
if (!has_displayed && !vout->p->b_picture_empty) {
picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo);
if (peek)
picture_Release(peek);
if (!peek) {
vout->p->b_picture_empty = true;
vlc_cond_signal(&vout->p->picture_wait);
}
}
if (has_displayed) {
vout->p->step.is_requested = false;
vlc_cond_signal(&vout->p->picture_wait);
}
}
const int picture_qtype = vout->p->displayed.qtype;
const bool picture_interlaced = vout->p->displayed.is_interlaced;
vlc_mutex_unlock(&vout->p->picture_lock);
if (vout_ManageWrapper(vout)) {
/* A fatal error occurred, and the thread must terminate
* immediately, without displaying anything - setting b_error to 1
* causes the immediate end of the main while() loop. */
// FIXME pf_end
vout->p->b_error = true;
break; break;
} }
/* Post processing */ /* Post processing */
if( i_postproc_state == 1 ) const int postproc_change = (picture_qtype != QTYPE_NONE) - (last_picture_qtype != QTYPE_NONE);
PostProcessEnable( p_vout ); if (postproc_change == 1)
else if( i_postproc_state == -1 ) PostProcessEnable(vout);
PostProcessDisable( p_vout ); else if (postproc_change == -1)
if( i_postproc_state != 0 ) PostProcessDisable(vout);
i_picture_qtype_last = i_postproc_type; if (postproc_change)
last_picture_qtype = picture_qtype;
/* Deinterlacing /* Deinterlacing
* Wait 30s before quiting interlacing mode */ * Wait 30s before quiting interlacing mode */
if( ( i_picture_interlaced_state == 1 ) || const int interlacing_change = (!!picture_interlaced) - (!!last_picture_interlaced);
( i_picture_interlaced_state == -1 && i_picture_interlaced_last_date + 30000000 < current_date ) ) if ((interlacing_change == 1) ||
{ (interlacing_change == -1 && last_picture_interlaced_date + 30000000 < mdate())) {
DeinterlaceNeeded( p_vout, b_picture_interlaced ); DeinterlaceNeeded(vout, picture_interlaced);
b_picture_interlaced_last = b_picture_interlaced; last_picture_interlaced = picture_interlaced;
} }
if( b_picture_interlaced ) if (picture_interlaced)
i_picture_interlaced_last_date = current_date; last_picture_interlaced_date = mdate();
/* Check for "video filter2" changes */ /* Check for "video filter2" changes */
vlc_mutex_lock( &p_vout->p->vfilter_lock ); vlc_mutex_lock(&vout->p->vfilter_lock);
if( p_vout->p->psz_vf2 ) if (vout->p->psz_vf2) {
{
es_format_t fmt; es_format_t fmt;
es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma ); es_format_Init(&fmt, VIDEO_ES, vout->fmt_render.i_chroma);
fmt.video = p_vout->fmt_render; fmt.video = vout->fmt_render;
filter_chain_Reset( p_vout->p->p_vf2_chain, &fmt, &fmt ); filter_chain_Reset(vout->p->p_vf2_chain, &fmt, &fmt);
if( filter_chain_AppendFromString( p_vout->p->p_vf2_chain, if (filter_chain_AppendFromString(vout->p->p_vf2_chain,
p_vout->p->psz_vf2 ) < 0 ) vout->p->psz_vf2) < 0)
msg_Err( p_vout, "Video filter chain creation failed" ); msg_Err(vout, "Video filter chain creation failed");
free( p_vout->p->psz_vf2 ); free(vout->p->psz_vf2);
p_vout->p->psz_vf2 = NULL; vout->p->psz_vf2 = NULL;
if( i_picture_qtype_last != QTYPE_NONE ) if (last_picture_qtype != QTYPE_NONE)
PostProcessSetFilterQuality( p_vout ); PostProcessSetFilterQuality(vout);
} }
vlc_mutex_unlock( &p_vout->p->vfilter_lock ); vlc_mutex_unlock(&vout->p->vfilter_lock);
vlc_mutex_unlock(&vout->p->change_lock);
if (deadline > VLC_TS_INVALID) {
vlc_mutex_lock(&vout->p->picture_lock);
vlc_cond_timedwait(&vout->p->picture_wait, &vout->p->picture_lock, deadline);
vlc_mutex_unlock(&vout->p->picture_lock);
}
vlc_mutex_lock(&vout->p->change_lock);
} }
/* /*
* Error loop - wait until the thread destruction is requested * Error loop - wait until the thread destruction is requested
*
* XXX I wonder if we should periodically clean the decoder_fifo
* or have a way to prevent it filling up.
*/ */
if( p_vout->p->b_error ) while (vout->p->b_error && !vout->p->b_done)
ErrorThread( p_vout ); vlc_cond_wait(&vout->p->change_wait, &vout->p->change_lock);
/* Clean thread */ /* Clean thread */
CleanThread( p_vout ); CleanThread(vout);
exit_thread: exit_thread:
/* End of thread */ /* End of thread */
EndThread( p_vout ); EndThread(vout);
vlc_mutex_unlock( &p_vout->p->change_lock ); vlc_mutex_unlock(&vout->p->change_lock);
if( b_has_wrapper ) if (has_wrapper)
vout_CloseWrapper( p_vout ); vout_CloseWrapper(vout);
return NULL; return NULL;
} }
/*****************************************************************************
* ErrorThread: RunThread() error loop
*****************************************************************************
* This function is called when an error occurred during thread main's loop.
* The thread can still receive feed, but must be ready to terminate as soon
* as possible.
*****************************************************************************/
static void ErrorThread( vout_thread_t *p_vout )
{
/* Wait until a `close' order */
while( !p_vout->p->b_done )
vlc_cond_wait( &p_vout->p->change_wait, &p_vout->p->change_lock );
}
/***************************************************************************** /*****************************************************************************
* CleanThread: clean up after InitThread * CleanThread: clean up after InitThread
***************************************************************************** *****************************************************************************
...@@ -1263,20 +1121,12 @@ static void ErrorThread( vout_thread_t *p_vout ) ...@@ -1263,20 +1121,12 @@ static void ErrorThread( vout_thread_t *p_vout )
*****************************************************************************/ *****************************************************************************/
static void CleanThread( vout_thread_t *p_vout ) static void CleanThread( vout_thread_t *p_vout )
{ {
int i_index; /* index in heap */
/* Destroy all remaining pictures */
for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ )
{
if ( p_vout->p->p_picture[i_index].i_type == MEMORY_PICTURE )
{
free( p_vout->p->p_picture[i_index].p_data_orig );
}
}
/* Destroy translation tables */ /* Destroy translation tables */
if( !p_vout->p->b_error ) if( !p_vout->p->b_error )
{
picture_fifo_Flush( p_vout->p->decoder_fifo, INT64_MAX, false );
vout_EndWrapper( p_vout ); vout_EndWrapper( p_vout );
}
} }
/***************************************************************************** /*****************************************************************************
...@@ -1753,16 +1603,16 @@ static void DeinterlaceEnable( vout_thread_t *p_vout ) ...@@ -1753,16 +1603,16 @@ static void DeinterlaceEnable( vout_thread_t *p_vout )
/* */ /* */
if( i_deinterlace == -2 ) if( i_deinterlace == -2 )
p_vout->p->b_picture_interlaced = true; p_vout->p->displayed.is_interlaced = true;
else if( i_deinterlace == -3 ) else if( i_deinterlace == -3 )
p_vout->p->b_picture_interlaced = false; p_vout->p->displayed.is_interlaced = false;
if( i_deinterlace < 0 ) if( i_deinterlace < 0 )
i_deinterlace = -1; i_deinterlace = -1;
/* */ /* */
val.psz_string = psz_deinterlace ? psz_deinterlace : p_optm->orig.psz; val.psz_string = psz_deinterlace ? psz_deinterlace : p_optm->orig.psz;
var_Change( p_vout, "deinterlace-mode", VLC_VAR_SETVALUE, &val, NULL ); var_Change( p_vout, "deinterlace-mode", VLC_VAR_SETVALUE, &val, NULL );
val.b_bool = p_vout->p->b_picture_interlaced; val.b_bool = p_vout->p->displayed.is_interlaced;
var_Change( p_vout, "deinterlace-needed", VLC_VAR_SETVALUE, &val, NULL ); var_Change( p_vout, "deinterlace-needed", VLC_VAR_SETVALUE, &val, NULL );
var_SetInteger( p_vout, "deinterlace", i_deinterlace ); var_SetInteger( p_vout, "deinterlace", i_deinterlace );
......
src/video_output/vout_internal.h
View file @ 958ae35d
...@@ -30,9 +30,12 @@ ...@@ -30,9 +30,12 @@
#ifndef _VOUT_INTERNAL_H #ifndef _VOUT_INTERNAL_H
#define _VOUT_INTERNAL_H 1 #define _VOUT_INTERNAL_H 1
#include <vlc_picture_fifo.h>
#include <vlc_picture_pool.h>
#include "vout_control.h" #include "vout_control.h"
#include "snapshot.h" #include "snapshot.h"
#include "statistic.h" #include "statistic.h"
#include "chrono.h"
/* Number of pictures required to computes the FPS rate */ /* Number of pictures required to computes the FPS rate */
#define VOUT_FPS_SAMPLES 20 #define VOUT_FPS_SAMPLES 20
...@@ -40,19 +43,6 @@ ...@@ -40,19 +43,6 @@
/* */ /* */
typedef struct vout_sys_t vout_sys_t; typedef struct vout_sys_t vout_sys_t;
/**
* Video picture heap, either render (to store pictures used
* by the decoder) or output (to store pictures displayed by the vout plugin)
*/
typedef struct
{
int i_pictures; /**< current heap size */
/* Real pictures */
picture_t* pp_picture[VOUT_MAX_PICTURES]; /**< pictures */
int i_last_used_pic; /**< last used pic in heap */
} picture_heap_t;
/* */ /* */
struct vout_thread_sys_t struct vout_thread_sys_t
{ {
...@@ -73,27 +63,28 @@ struct vout_thread_sys_t ...@@ -73,27 +63,28 @@ struct vout_thread_sys_t
bool b_error; bool b_error;
/* */ /* */
bool b_picture_displayed;
bool b_picture_empty; bool b_picture_empty;
mtime_t i_picture_displayed_date;
picture_t *p_picture_displayed;
int i_picture_qtype;
bool b_picture_interlaced;
vlc_cond_t picture_wait; vlc_cond_t picture_wait;
struct {
mtime_t clock;
mtime_t timestampX;
int qtype;
bool is_interlaced;
picture_t *decoded;
} displayed;
struct {
bool is_requested;
mtime_t last;
mtime_t timestamp;
} step;
/* */ /* */
vlc_mutex_t vfilter_lock; /**< video filter2 lock */ vlc_mutex_t vfilter_lock; /**< video filter2 lock */
/* */ /* */
uint32_t render_time; /**< last picture render time */
unsigned int i_par_num; /**< monitor pixel aspect-ratio */ unsigned int i_par_num; /**< monitor pixel aspect-ratio */
unsigned int i_par_den; /**< monitor pixel aspect-ratio */ unsigned int i_par_den; /**< monitor pixel aspect-ratio */
bool is_late_dropped;
/**
* These numbers are not supposed to be accurate, but are a
* good indication of the thread status */
count_t c_fps_samples; /**< picture counts */
mtime_t p_fps_sample[VOUT_FPS_SAMPLES]; /**< FPS samples dates */
/* Statistics */ /* Statistics */
vout_statistic_t statistic; vout_statistic_t statistic;
...@@ -129,24 +120,21 @@ struct vout_thread_sys_t ...@@ -129,24 +120,21 @@ struct vout_thread_sys_t
/* */ /* */
vlc_mutex_t picture_lock; /**< picture heap lock */ vlc_mutex_t picture_lock; /**< picture heap lock */
picture_pool_t *private_pool;
picture_pool_t *display_pool;
picture_pool_t *decoder_pool;
picture_fifo_t *decoder_fifo;
bool is_decoder_pool_slow;
vout_chrono_t render; /**< picture render time estimator */
vlc_mutex_t change_lock; /**< thread change lock */ vlc_mutex_t change_lock; /**< thread change lock */
uint16_t i_changes; /**< changes made to the thread. uint16_t i_changes; /**< changes made to the thread.
\see \ref vout_changes */ \see \ref vout_changes */
unsigned b_fullscreen:1; /**< toogle fullscreen display */ unsigned b_fullscreen:1; /**< toogle fullscreen display */
unsigned b_on_top:1; /**< stay always on top of other windows */ unsigned b_on_top:1; /**< stay always on top of other windows */
picture_heap_t render; /**< rendered pictures */
picture_heap_t output; /**< direct buffers */
picture_t p_picture[2*VOUT_MAX_PICTURES+1]; /**< pictures */
}; };
#define I_OUTPUTPICTURES p_vout->p->output.i_pictures
#define PP_OUTPUTPICTURE p_vout->p->output.pp_picture
#define I_RENDERPICTURES p_vout->p->render.i_pictures
#define PP_RENDERPICTURE p_vout->p->render.pp_picture
/** \defgroup vout_changes Flags for changes /** \defgroup vout_changes Flags for changes
* These flags are set in the vout_thread_t::i_changes field when another * These flags are set in the vout_thread_t::i_changes field when another
* thread changed a variable * thread changed a variable
...@@ -164,20 +152,10 @@ struct vout_thread_sys_t ...@@ -164,20 +152,10 @@ struct vout_thread_sys_t
#define VOUT_CROP_CHANGE 0x1000 #define VOUT_CROP_CHANGE 0x1000
/** aspect ratio changed */ /** aspect ratio changed */
#define VOUT_ASPECT_CHANGE 0x2000 #define VOUT_ASPECT_CHANGE 0x2000
/** change/recreate picture buffers */
#define VOUT_PICTURE_BUFFERS_CHANGE 0x4000
/**@}*/ /**@}*/
/* */ /* */
int vout_AllocatePicture( vlc_object_t *, picture_t *, uint32_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den );
#define vout_AllocatePicture(a,b,c,d,e,f,g) \
vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
/* DO NOT use vout_RenderPicture/vout_IntfInit unless you are in src/video_ouput */
picture_t *vout_RenderPicture( vout_thread_t *, picture_t *,
subpicture_t *,
mtime_t render_date );
void vout_IntfInit( vout_thread_t * ); void vout_IntfInit( vout_thread_t * );
/* DO NOT use vout_UsePictureLocked unless you are in src/video_ouput /* DO NOT use vout_UsePictureLocked unless you are in src/video_ouput
......
src/video_output/vout_pictures.c
View file @ 958ae35d
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
#include "vout_pictures.h" #include "vout_pictures.h"
#include "vout_internal.h" #include "vout_internal.h"
static void tracep(const char *msg, picture_t *picture)
{
//fprintf(stderr, "########## %s === picture=%p::%d\n", msg,
// picture, picture ? picture->i_refcount : -1);
}
/** /**
* Display a picture * Display a picture
* *
...@@ -54,19 +60,12 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -54,19 +60,12 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
if( p_pic->i_status == RESERVED_PICTURE ) tracep("vout_DisplayPicture", p_pic);
{
p_pic->i_status = READY_PICTURE; p_pic->p_next = NULL;
vlc_cond_signal( &p_vout->p->picture_wait ); picture_fifo_Push(p_vout->p->decoder_fifo, p_pic);
}
else
{
msg_Err( p_vout, "picture to display %p has invalid status %d",
p_pic, p_pic->i_status );
}
p_vout->p->i_picture_qtype = p_pic->i_qtype;
p_vout->p->b_picture_interlaced = !p_pic->b_progressive;
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
...@@ -81,31 +80,8 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -81,31 +80,8 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
*/ */
int vout_CountPictureAvailable( vout_thread_t *p_vout ) int vout_CountPictureAvailable( vout_thread_t *p_vout )
{ {
int i_free = 0; #warning "TODO remove vout_CountPictureAvailable"
int i_pic; return VOUT_MAX_PICTURES;
vlc_mutex_lock( &p_vout->p->picture_lock );
for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ )
{
picture_t *p_pic = PP_RENDERPICTURE[(p_vout->p->render.i_last_used_pic + i_pic + 1) % I_RENDERPICTURES];
switch( p_pic->i_status )
{
case DESTROYED_PICTURE:
i_free++;
break;
case FREE_PICTURE:
i_free++;
break;
default:
break;
}
}
vlc_mutex_unlock( &p_vout->p->picture_lock );
return i_free;
} }
picture_t *vout_CreatePicture( vout_thread_t *p_vout, picture_t *vout_CreatePicture( vout_thread_t *p_vout,
...@@ -113,171 +89,38 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, ...@@ -113,171 +89,38 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout,
bool b_top_field_first, bool b_top_field_first,
unsigned int i_nb_fields ) unsigned int i_nb_fields )
{ {
int i_pic; /* picture index */ #warning "TODO remove unused vout_CreatePicture parameters"
picture_t * p_pic;
picture_t * p_freepic = NULL; /* first free picture */
/* Get lock */ /* Get lock */
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
picture_t *p_pic = picture_pool_Get(p_vout->p->decoder_pool);
/* if (p_pic) {
* Look for an empty place in the picture heap. picture_Reset(p_pic);
*/ p_pic->p_next = NULL; // FIXME put it in picture_Reset ?
for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ )
{
p_pic = PP_RENDERPICTURE[(p_vout->p->render.i_last_used_pic + i_pic + 1)
% I_RENDERPICTURES];
switch( p_pic->i_status )
{
case DESTROYED_PICTURE:
/* 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_pic->i_status = RESERVED_PICTURE;
p_pic->i_refcount = 0;
p_pic->b_force = 0;
p_pic->b_progressive = b_progressive;
p_pic->i_nb_fields = i_nb_fields;
p_pic->b_top_field_first = b_top_field_first;
p_vout->p->render.i_last_used_pic =
( p_vout->p->render.i_last_used_pic + i_pic + 1 )
% I_RENDERPICTURES;
vlc_mutex_unlock( &p_vout->p->picture_lock );
return( p_pic );
case FREE_PICTURE:
/* Picture is empty and ready for allocation */
p_vout->p->render.i_last_used_pic =
( p_vout->p->render.i_last_used_pic + i_pic + 1 )
% I_RENDERPICTURES;
p_freepic = p_pic;
break;
default:
break;
} }
} tracep("vout_CreatePicture", p_pic);
/*
* Prepare picture
*/
if( p_freepic != NULL )
{
vout_AllocatePicture( VLC_OBJECT(p_vout),
p_freepic, p_vout->fmt_render.i_chroma,
p_vout->fmt_render.i_width, p_vout->fmt_render.i_height,
p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den ); /* The right AR is in fmt_in and not fmt_render */
if( p_freepic->i_planes )
{
/* Copy picture information, set some default values */
p_freepic->i_status = RESERVED_PICTURE;
p_freepic->i_type = MEMORY_PICTURE;
p_freepic->b_slow = 0;
p_freepic->i_refcount = 0;
p_freepic->b_force = 0;
p_freepic->b_progressive = b_progressive;
p_freepic->i_nb_fields = i_nb_fields;
p_freepic->b_top_field_first = b_top_field_first;
}
else
{
/* Memory allocation failed : set picture as empty */
p_freepic->i_status = FREE_PICTURE;
p_freepic = NULL;
msg_Err( p_vout, "picture allocation failed" );
}
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
return( p_freepic ); return p_pic;
}
/* No free or destroyed picture could be found, but the decoder
* will try again in a while. */
vlc_mutex_unlock( &p_vout->p->picture_lock );
return( NULL );
} }
/* */ /* */
static void DestroyPicture( vout_thread_t *p_vout, picture_t *p_picture ) void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
vlc_assert_locked( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
p_picture->i_status = DESTROYED_PICTURE; tracep("vout_DropPicture", p_pic);
picture_CleanupQuant( p_picture ); picture_Release( p_pic );
vlc_cond_signal( &p_vout->p->picture_wait ); vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
/**
* Remove a permanent or reserved picture from the heap
*
* This function frees a previously reserved picture or a permanent
* picture. It is meant to be used when the construction of a picture aborted.
* Note that the picture will be destroyed even if it is linked !
*
* TODO remove it, vout_DropPicture should be used instead
*/
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic ) void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
#ifndef NDEBUG tracep("vout_DestroyPicture", p_pic);
/* Check if picture status is valid */
vlc_mutex_lock( &p_vout->p->picture_lock );
if( p_pic->i_status != RESERVED_PICTURE )
{
msg_Err( p_vout, "picture to destroy %p has invalid status %d",
p_pic, p_pic->i_status );
}
vlc_mutex_unlock( &p_vout->p->picture_lock );
#endif
vout_DropPicture( p_vout, p_pic ); vout_DropPicture( p_vout, p_pic );
} }
/* */
void vout_UsePictureLocked( vout_thread_t *p_vout, picture_t *p_picture )
{
vlc_assert_locked( &p_vout->p->picture_lock );
if( p_picture->i_refcount > 0 )
{
/* Pretend we displayed the picture, but don't destroy
* it since the decoder might still need it. */
p_picture->i_status = DISPLAYED_PICTURE;
}
else
{
/* Destroy the picture without displaying it */
DestroyPicture( p_vout, p_picture );
}
}
/* */
void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
vlc_mutex_lock( &p_vout->p->picture_lock );
if( p_pic->i_status == READY_PICTURE )
{
/* Grr cannot destroy ready picture by myself so be sure vout won't like it */
p_pic->date = 1;
vlc_cond_signal( &p_vout->p->picture_wait );
}
else
{
vout_UsePictureLocked( p_vout, p_pic );
}
vlc_mutex_unlock( &p_vout->p->picture_lock );
}
/** /**
* Increment reference counter of a picture * Increment reference counter of a picture
...@@ -288,7 +131,8 @@ void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -288,7 +131,8 @@ void vout_DropPicture( vout_thread_t *p_vout, picture_t *p_pic )
void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
p_pic->i_refcount++; tracep("vout_LinkPicture", p_pic);
picture_Hold( p_pic );
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
...@@ -300,87 +144,13 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -300,87 +144,13 @@ void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic ) void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{ {
vlc_mutex_lock( &p_vout->p->picture_lock ); vlc_mutex_lock( &p_vout->p->picture_lock );
tracep("vout_UnlinkPicture", p_pic);
picture_Release( p_pic );
if( p_pic->i_refcount > 0 ) vlc_cond_signal( &p_vout->p->picture_wait );
p_pic->i_refcount--;
else
msg_Err( p_vout, "Invalid picture reference count (%p, %d)",
p_pic, p_pic->i_refcount );
if( p_pic->i_refcount == 0 &&
( p_pic->i_status == DISPLAYED_PICTURE || p_pic->i_status == RESERVED_PICTURE ) )
DestroyPicture( p_vout, p_pic );
vlc_mutex_unlock( &p_vout->p->picture_lock ); vlc_mutex_unlock( &p_vout->p->picture_lock );
} }
/**
* Render a picture
*
* This function chooses whether the current picture needs to be copied
* before rendering, does the subpicture magic, and tells the video output
* thread which direct buffer needs to be displayed.
*/
picture_t *vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
subpicture_t *p_subpic, mtime_t render_date )
{
if( p_pic == NULL )
return NULL;
if( p_pic->i_type == DIRECT_PICTURE && !p_subpic )
{
/* No subtitles, picture is in a directbuffer so
* we can display it directly (even if it is still
* in use or not). */
return p_pic;
}
/* It is either because:
* - the picture is not a direct buffer
* - we have to render subtitles (we can never do it on the given
* picture even if not referenced).
*/
picture_t *p_render;
if( p_subpic != NULL && PP_OUTPUTPICTURE[0]->b_slow )
{
/* The picture buffer is in slow memory. We'll use
* the "2 * VOUT_MAX_PICTURES + 1" picture as a temporary
* one for subpictures rendering. */
p_render = &p_vout->p->p_picture[2 * VOUT_MAX_PICTURES];
if( p_render->i_status == FREE_PICTURE )
{
vout_AllocatePicture( VLC_OBJECT(p_vout),
p_render, p_vout->fmt_out.i_chroma,
p_vout->fmt_out.i_width,
p_vout->fmt_out.i_height,
p_vout->fmt_out.i_sar_num,
p_vout->fmt_out.i_sar_den );
p_render->i_type = MEMORY_PICTURE;
p_render->i_status = RESERVED_PICTURE;
}
}
else
{
/* We can directly render into a direct buffer */
p_render = PP_OUTPUTPICTURE[0];
}
/* Copy */
picture_Copy( p_render, p_pic );
/* Render the subtitles if present */
if( p_subpic )
spu_RenderSubpictures( p_vout->p->p_spu,
p_render, &p_vout->fmt_out,
p_subpic, &p_vout->fmt_in, render_date );
/* Copy in case we used a temporary fast buffer */
if( p_render != PP_OUTPUTPICTURE[0] )
picture_Copy( PP_OUTPUTPICTURE[0], p_render );
return PP_OUTPUTPICTURE[0];
}
#undef vout_AllocatePicture
/** /**
* Allocate a new picture in the heap. * Allocate a new picture in the heap.
* *
...@@ -388,13 +158,11 @@ picture_t *vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -388,13 +158,11 @@ picture_t *vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
* used exactly like a video buffer. The video output thread then manages * used exactly like a video buffer. The video output thread then manages
* how it gets displayed. * how it gets displayed.
*/ */
int vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, static int vout_AllocatePicture( picture_t *p_pic,
vlc_fourcc_t i_chroma, vlc_fourcc_t i_chroma,
int i_width, int i_height, int i_width, int i_height,
int i_sar_num, int i_sar_den ) int i_sar_num, int i_sar_den )
{ {
VLC_UNUSED(p_this);
/* Make sure the real dimensions are a multiple of 16 */ /* Make sure the real dimensions are a multiple of 16 */
if( picture_Setup( p_pic, i_chroma, i_width, i_height, if( picture_Setup( p_pic, i_chroma, i_width, i_height,
i_sar_num, i_sar_den ) != VLC_SUCCESS ) i_sar_num, i_sar_den ) != VLC_SUCCESS )
...@@ -632,7 +400,7 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r ...@@ -632,7 +400,7 @@ picture_t *picture_NewFromResource( const video_format_t *p_fmt, const picture_r
} }
else else
{ {
if( vout_AllocatePicture( (vlc_object_t *)NULL, p_picture, if( vout_AllocatePicture( p_picture,
fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_chroma, fmt.i_width, fmt.i_height,
fmt.i_sar_num, fmt.i_sar_den ) ) fmt.i_sar_num, fmt.i_sar_den ) )
{ {
......
src/video_output/vout_subpictures.c
View file @ 958ae35d
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
# include "config.h" # include "config.h"
#endif #endif
#include <assert.h>
#include <limits.h>
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_vout.h> #include <vlc_vout.h>
#include <vlc_block.h> #include <vlc_block.h>
...@@ -39,9 +42,6 @@ ...@@ -39,9 +42,6 @@
#include "vout_internal.h" #include "vout_internal.h"
#include <vlc_image.h> #include <vlc_image.h>
#include <assert.h>
#include <limits.h>
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
......
src/video_output/vout_wrapper.c
View file @ 958ae35d
...@@ -44,12 +44,18 @@ struct vout_sys_t { ...@@ -44,12 +44,18 @@ struct vout_sys_t {
char *title; char *title;
vout_display_t *vd; vout_display_t *vd;
bool use_dr; bool use_dr;
};
struct picture_sys_t { picture_t *filtered;
picture_t *direct;
}; };
/* Minimum number of direct pictures the video output will accept without
* creating additional pictures in system memory */
#ifdef OPTIMIZE_MEMORY
# define VOUT_MIN_DIRECT_PICTURES (VOUT_MAX_PICTURES/2)
#else
# define VOUT_MIN_DIRECT_PICTURES (3*VOUT_MAX_PICTURES/4)
#endif
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
...@@ -115,6 +121,7 @@ int vout_OpenWrapper(vout_thread_t *vout, const char *name) ...@@ -115,6 +121,7 @@ int vout_OpenWrapper(vout_thread_t *vout, const char *name)
/* */ /* */
vout->p->p_sys = sys; vout->p->p_sys = sys;
vout->p->decoder_pool = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -130,6 +137,8 @@ void vout_CloseWrapper(vout_thread_t *vout) ...@@ -130,6 +137,8 @@ void vout_CloseWrapper(vout_thread_t *vout)
var_DelCallback(vout, "direct3d-desktop", Forward, NULL); var_DelCallback(vout, "direct3d-desktop", Forward, NULL);
var_DelCallback(vout, "video-wallpaper", Forward, NULL); var_DelCallback(vout, "video-wallpaper", Forward, NULL);
#endif #endif
vout->p->decoder_pool = NULL; /* FIXME remove */
vout_DeleteDisplay(sys->vd, NULL); vout_DeleteDisplay(sys->vd, NULL);
free(sys->title); free(sys->title);
free(sys ); free(sys );
...@@ -165,6 +174,7 @@ int vout_InitWrapper(vout_thread_t *vout) ...@@ -165,6 +174,7 @@ int vout_InitWrapper(vout_thread_t *vout)
vout->fmt_in.i_y_offset != source.i_y_offset ) vout->fmt_in.i_y_offset != source.i_y_offset )
vout->p->i_changes |= VOUT_CROP_CHANGE; vout->p->i_changes |= VOUT_CROP_CHANGE;
#warning "vout_InitWrapper: vout_SetWindowState should NOT be called there"
if (vout->p->b_on_top) if (vout->p->b_on_top)
vout_SetWindowState(vd, VOUT_WINDOW_STATE_ABOVE); vout_SetWindowState(vd, VOUT_WINDOW_STATE_ABOVE);
...@@ -174,52 +184,22 @@ int vout_InitWrapper(vout_thread_t *vout) ...@@ -174,52 +184,22 @@ int vout_InitWrapper(vout_thread_t *vout)
*/ */
sys->use_dr = !vout_IsDisplayFiltered(vd); sys->use_dr = !vout_IsDisplayFiltered(vd);
const bool allow_dr = !vd->info.has_pictures_invalid && sys->use_dr; const bool allow_dr = !vd->info.has_pictures_invalid && sys->use_dr;
const int picture_max = allow_dr ? VOUT_MAX_PICTURES : 1;
for (vout->p->output.i_pictures = 0;
vout->p->output.i_pictures < picture_max;
vout->p->output.i_pictures++) {
/* Find an empty picture slot */
picture_t *picture = NULL;
for (int index = 0; index < VOUT_MAX_PICTURES; index++) {
if (vout->p->p_picture[index].i_status == FREE_PICTURE) {
picture = &vout->p->p_picture[index];
break;
}
}
if (!picture)
break;
memset(picture, 0, sizeof(*picture));
picture->p_sys = malloc(sizeof(*picture->p_sys));
if (sys->use_dr) { picture_pool_t *display_pool = vout_display_Pool(vd, allow_dr ? VOUT_MAX_PICTURES : 3);
picture_pool_t *pool = vout_display_Pool(vd, picture_max); if (allow_dr && picture_pool_GetSize(display_pool) >= VOUT_MIN_DIRECT_PICTURES) {
if (!pool) vout->p->decoder_pool = display_pool;
break; vout->p->display_pool = display_pool;
picture_t *direct = picture_pool_Get(pool); vout->p->is_decoder_pool_slow = vd->info.is_slow;
if (!direct) } else if (!vout->p->decoder_pool) {
break; vout->p->decoder_pool = picture_pool_NewFromFormat(&source, VOUT_MAX_PICTURES);
picture->format = direct->format; if (sys->use_dr)
picture->i_planes = direct->i_planes; vout->p->display_pool = display_pool;
for (int i = 0; i < direct->i_planes; i++) else
picture->p[i] = direct->p[i]; vout->p->display_pool = picture_pool_Reserve(vout->p->decoder_pool, 1);;
picture->b_slow = vd->info.is_slow; vout->p->is_decoder_pool_slow = false;
picture->p_sys->direct = direct;
} else {
vout_AllocatePicture(VLC_OBJECT(vd), picture,
vd->source.i_chroma,
vd->source.i_width, vd->source.i_height,
vd->source.i_sar_num, vd->source.i_sar_den);
if (!picture->i_planes)
break;
picture->p_sys->direct = NULL;
}
picture->i_status = DESTROYED_PICTURE;
picture->i_type = DIRECT_PICTURE;
vout->p->output.pp_picture[vout->p->output.i_pictures] = picture;
} }
vout->p->private_pool = picture_pool_Reserve(vout->p->decoder_pool, 3); /* XXX 2 for filter, 1 for SPU */
sys->filtered = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -230,22 +210,15 @@ void vout_EndWrapper(vout_thread_t *vout) ...@@ -230,22 +210,15 @@ void vout_EndWrapper(vout_thread_t *vout)
{ {
vout_sys_t *sys = vout->p->p_sys; vout_sys_t *sys = vout->p->p_sys;
for (int i = 0; i < VOUT_MAX_PICTURES; i++) { assert(!sys->filtered);
picture_t *picture = &vout->p->p_picture[i]; if (vout->p->private_pool)
picture_pool_Delete(vout->p->private_pool);
if (picture->i_type != DIRECT_PICTURE)
continue;
if (picture->p_sys->direct) if (vout->p->decoder_pool != vout->p->display_pool) {
picture_Release(picture->p_sys->direct);
if (!sys->use_dr) if (!sys->use_dr)
free(picture->p_data_orig); picture_pool_Delete(vout->p->display_pool);
free(picture->p_sys); picture_pool_Delete(vout->p->decoder_pool);
picture->i_status = FREE_PICTURE;
} }
if (sys->use_dr && vout_AreDisplayPicturesInvalid(sys->vd))
vout_ManageDisplay(sys->vd, true);
} }
/***************************************************************************** /*****************************************************************************
...@@ -333,10 +306,12 @@ int vout_ManageWrapper(vout_thread_t *vout) ...@@ -333,10 +306,12 @@ int vout_ManageWrapper(vout_thread_t *vout)
} }
if (sys->use_dr && vout_AreDisplayPicturesInvalid(vd)) { bool reset_display_pool = sys->use_dr && vout_AreDisplayPicturesInvalid(vd);
vout->p->i_changes |= VOUT_PICTURE_BUFFERS_CHANGE; vout_ManageDisplay(vd, !sys->use_dr || reset_display_pool);
}
vout_ManageDisplay(vd, !sys->use_dr); if (reset_display_pool)
vout->p->display_pool = vout_display_Pool(vd, 3);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -348,17 +323,14 @@ void vout_RenderWrapper(vout_thread_t *vout, picture_t *picture) ...@@ -348,17 +323,14 @@ void vout_RenderWrapper(vout_thread_t *vout, picture_t *picture)
vout_sys_t *sys = vout->p->p_sys; vout_sys_t *sys = vout->p->p_sys;
vout_display_t *vd = sys->vd; vout_display_t *vd = sys->vd;
assert(sys->use_dr || !picture->p_sys->direct);
assert(vout_IsDisplayFiltered(vd) == !sys->use_dr); assert(vout_IsDisplayFiltered(vd) == !sys->use_dr);
if (sys->use_dr) { if (sys->use_dr) {
assert(picture->p_sys->direct); vout_display_Prepare(vd, picture);
vout_display_Prepare(vd, picture->p_sys->direct);
} else { } else {
picture_t *direct = picture->p_sys->direct = vout_FilterDisplay(vd, picture); sys->filtered = vout_FilterDisplay(vd, picture);
if (direct) { if (sys->filtered)
vout_display_Prepare(vd, direct); vout_display_Prepare(vd, sys->filtered);
}
} }
} }
...@@ -370,25 +342,8 @@ void vout_DisplayWrapper(vout_thread_t *vout, picture_t *picture) ...@@ -370,25 +342,8 @@ void vout_DisplayWrapper(vout_thread_t *vout, picture_t *picture)
vout_sys_t *sys = vout->p->p_sys; vout_sys_t *sys = vout->p->p_sys;
vout_display_t *vd = sys->vd; vout_display_t *vd = sys->vd;
picture_t *direct = picture->p_sys->direct; vout_display_Display(vd, sys->filtered ? sys->filtered : picture);
if (!direct) sys->filtered = NULL;
return;
/* XXX This is a hack that will work with current vout_display_t modules */
if (sys->use_dr)
picture_Hold(direct);
vout_display_Display(vd, direct);
if (sys->use_dr) {
for (int i = 0; i < picture->i_planes; i++) {
picture->p[i].p_pixels = direct->p[i].p_pixels;
picture->p[i].i_pitch = direct->p[i].i_pitch;
picture->p[i].i_lines = direct->p[i].i_lines;
}
} else {
picture->p_sys->direct = NULL;
}
} }
static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title) static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment