X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_internal.h;h=1f7184590c557d57d187dfe6767ab5f846d62017;hb=a5e3a954b54587db0a7b47320f94ed7284122763;hp=c5e6d965f6bce8fd32e72b71adc701164f2bed53;hpb=37a27cc6447a51b5780adf0917ab7b22a4456a5b;p=vlc diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index c5e6d965f6..1f7184590c 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -1,34 +1,29 @@ /***************************************************************************** * vout_internal.h : Internal vout definitions ***************************************************************************** - * Copyright (C) 2008 the VideoLAN team + * Copyright (C) 2008 VLC authors and VideoLAN * Copyright (C) 2008 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 + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser 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. + * You should have received a copy of the GNU Lesser 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_INTERNAL_H -#define _VOUT_INTERNAL_H 1 +#ifndef LIBVLC_VOUT_INTERNAL_H +#define LIBVLC_VOUT_INTERNAL_H 1 #include #include @@ -40,14 +35,26 @@ #include "statistic.h" #include "chrono.h" +/* It should be high enough to absorbe jitter due to difficult picture(s) + * to decode but not too high as memory is not that cheap. + * + * It can be made lower at compilation time if needed, but performance + * may be degraded. + */ +#define VOUT_MAX_PICTURES (20) + /* */ struct vout_thread_sys_t { /* Splitter module if used */ char *splitter_name; + /* Input thread for dvd menu interactions */ + vlc_object_t *input; + /* */ - video_format_t original; /* Original format ie coming from the decoder */ + video_format_t original; /* Original format ie coming from the decoder */ + unsigned dpb_size; /* Snapshot interface */ vout_snapshot_t snapshot; @@ -56,11 +63,10 @@ struct vout_thread_sys_t vout_statistic_t statistic; /* Subpicture unit */ - spu_t *p_spu; - - /* Monitor Pixel Aspect Ratio */ - unsigned int i_par_num; - unsigned int i_par_den; + vlc_mutex_t spu_lock; + spu_t *spu; + vlc_fourcc_t spu_blend_chroma; + filter_t *spu_blend; /* Video output window */ struct { @@ -88,6 +94,8 @@ struct vout_thread_sys_t int qtype; bool is_interlaced; picture_t *decoded; + picture_t *current; + picture_t *next; } displayed; struct { @@ -111,8 +119,13 @@ struct vout_thread_sys_t bool is_late_dropped; /* Video filter2 chain */ - vlc_mutex_t vfilter_lock; - filter_chain_t *vfilter_chain; + struct { + vlc_mutex_t lock; + char *configuration; + video_format_t format; + filter_chain_t *chain_static; + filter_chain_t *chain_interactive; + } filter; /* */ vlc_mouse_t mouse; @@ -123,7 +136,6 @@ struct vout_thread_sys_t 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 */ }; @@ -137,7 +149,9 @@ void vout_ControlChangeCropRatio(vout_thread_t *, unsigned num, unsigned den); void vout_ControlChangeCropWindow(vout_thread_t *, int x, int y, int width, int height); void vout_ControlChangeCropBorder(vout_thread_t *, int left, int top, int right, int bottom); void vout_ControlChangeFilters(vout_thread_t *, const char *); +void vout_ControlChangeSubSources(vout_thread_t *, const char *); void vout_ControlChangeSubFilters(vout_thread_t *, const char *); +void vout_ControlChangeSubMargin(vout_thread_t *, int); /* */ void vout_IntfInit( vout_thread_t * ); @@ -148,12 +162,10 @@ void vout_CloseWrapper(vout_thread_t *, vout_display_state_t *); int vout_InitWrapper(vout_thread_t *); void vout_EndWrapper(vout_thread_t *); void vout_ManageWrapper(vout_thread_t *); -void vout_RenderWrapper(vout_thread_t *, picture_t *); -void vout_DisplayWrapper(vout_thread_t *, picture_t *); /* */ int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *); -void spu_Attach( spu_t *, vlc_object_t *, bool ); +void spu_Attach( spu_t *, vlc_object_t *input, bool ); +void spu_ChangeMargin(spu_t *, int); #endif -