X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=7e77af015a728f6d9b181509108b013ef56d5813;hb=c4fef7e0c05f6e406186630b1b3566e951b805ce;hp=7ad7d4b39c54f2f91ab575fccf98c699613ede81;hpb=e9548f4d05861a383a445d8769407244313d3218;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 7ad7d4b39c..7e77af015a 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -43,7 +43,7 @@ #include /* for input_thread_t and i_pts_delay */ #include "vlc_playlist.h" -#if defined( SYS_DARWIN ) +#if defined( __APPLE__ ) #include "darwin_specific.h" #endif @@ -59,7 +59,6 @@ static void DestroyThread ( vout_thread_t * ); static void AspectRatio ( int, int *, int * ); static int BinaryLog ( uint32_t ); static void MaskToShift ( int *, int *, uint32_t ); -static void InitWindowSize ( vout_thread_t *, unsigned *, unsigned * ); /* Object variables callbacks */ static int DeinterlaceCallback( vlc_object_t *, char const *, @@ -174,8 +173,7 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, if( ( p_vout->fmt_render.i_width != p_fmt->i_width ) || ( p_vout->fmt_render.i_height != p_fmt->i_height ) || ( p_vout->fmt_render.i_chroma != p_fmt->i_chroma ) || - ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect - && !p_vout->b_override_aspect ) || + ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect ) || p_vout->b_filter_change ) { /* We are not interested in this format, close this vout */ @@ -231,6 +229,10 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) return NULL; } + stats_Create( p_vout, "displayed_pictures", VLC_VAR_INTEGER, + STATS_COUNTER ); + stats_Create( p_vout, "lost_pictures", VLC_VAR_INTEGER, STATS_COUNTER ); + /* 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++) @@ -247,8 +249,12 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) /* Initialize the rendering heap */ I_RENDERPICTURES = 0; + + vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den, + p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 ); p_vout->fmt_render = *p_fmt; /* FIXME palette */ p_vout->fmt_in = *p_fmt; /* FIXME palette */ + p_vout->render.i_width = i_width; p_vout->render.i_height = i_height; p_vout->render.i_chroma = i_chroma; @@ -311,8 +317,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) /* Take care of some "interface/control" related initialisations */ vout_IntfInit( p_vout ); - p_vout->b_override_aspect = VLC_FALSE; - /* 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 ) @@ -353,10 +357,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) else psz_plugin = strdup( p_vout->psz_filter_chain ); } - /* Initialize the dimensions of the video window */ - InitWindowSize( p_vout, &p_vout->i_window_width, - &p_vout->i_window_height ); - /* Create the vout thread */ p_vout->p_module = module_Need( p_vout, ( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ? @@ -790,9 +790,12 @@ static void RunThread( vout_thread_t *p_vout) p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; + /* XXX: config_GetInt is slow, but this kind of frame dropping + * should not happen that often. */ if( !p_picture->b_force && p_picture != p_last_picture && - display_date < current_date + p_vout->render_time ) + display_date < current_date + p_vout->render_time && + config_GetInt( p_vout, "skip-frames" ) ) { /* Picture is late: it will be destroyed and the thread * will directly choose the next picture */ @@ -811,6 +814,7 @@ static void RunThread( vout_thread_t *p_vout) } msg_Warn( p_vout, "late picture skipped ("I64Fd")", current_date - display_date ); + stats_UpdateInteger( p_vout, "lost_pictures", 1 ); vlc_mutex_unlock( &p_vout->picture_lock ); continue; @@ -833,6 +837,7 @@ static void RunThread( vout_thread_t *p_vout) p_picture->i_status = DESTROYED_PICTURE; p_vout->i_heap_size--; } + stats_UpdateInteger( p_vout, "lost_pictures", 1 ); msg_Warn( p_vout, "vout warning: early picture skipped " "("I64Fd")", display_date - current_date - p_vout->i_pts_delay ); @@ -890,6 +895,7 @@ static void RunThread( vout_thread_t *p_vout) /* * Perform rendering */ + stats_UpdateInteger( p_vout, "displayed_pictures", 1 ); p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic ); /* @@ -1221,69 +1227,6 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) *pi_right = (8 - i_high + i_low); } -/***************************************************************************** - * InitWindowSize: find the initial dimensions the video window should have. - ***************************************************************************** - * This function will check the "width", "height" and "zoom" config options and - * will calculate the size that the video window should have. - *****************************************************************************/ -static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, - unsigned *pi_height ) -{ - vlc_value_t val; - int i_width, i_height; - uint64_t ll_zoom; - -#define FP_FACTOR 1000 /* our fixed point factor */ - - var_Get( p_vout, "align", &val ); - p_vout->i_alignment = val.i_int; - - var_Get( p_vout, "width", &val ); - i_width = val.i_int; - var_Get( p_vout, "height", &val ); - i_height = val.i_int; - var_Get( p_vout, "zoom", &val ); - ll_zoom = (uint64_t)( FP_FACTOR * val.f_float ); - - if( i_width > 0 && i_height > 0) - { - *pi_width = (int)( i_width * ll_zoom / FP_FACTOR ); - *pi_height = (int)( i_height * ll_zoom / FP_FACTOR ); - return; - } - else if( i_width > 0 ) - { - *pi_width = (int)( i_width * ll_zoom / FP_FACTOR ); - *pi_height = (int)( i_width * ll_zoom * VOUT_ASPECT_FACTOR / - p_vout->render.i_aspect / FP_FACTOR ); - return; - } - else if( i_height > 0 ) - { - *pi_height = (int)( i_height * ll_zoom / FP_FACTOR ); - *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect / - VOUT_ASPECT_FACTOR / FP_FACTOR ); - return; - } - - if( p_vout->render.i_height * p_vout->render.i_aspect - >= p_vout->render.i_width * VOUT_ASPECT_FACTOR ) - { - *pi_width = (int)( p_vout->render.i_height * ll_zoom - * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR ); - *pi_height = (int)( p_vout->render.i_height * ll_zoom / FP_FACTOR ); - } - else - { - *pi_width = (int)( p_vout->render.i_width * ll_zoom / FP_FACTOR ); - *pi_height = (int)( p_vout->render.i_width * ll_zoom - * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR ); - } - -#undef FP_FACTOR -} - /***************************************************************************** * vout_VarCallback: generic callback for intf variables *****************************************************************************/