[vlc-commits] commit: Cosmetic ( Rémi Denis-Co urmont )
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sun Jul 11
13:59:03 2010 +0300| [f8d899e7630c48354af0d3d3f77efb58e39b1cd6] | committer:
Rémi Denis-Courmont
Cosmetic
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f8d899e7630c48354af0d3d3f77efb58e39b1cd6
---
modules/video_output/xcb/glx.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 23c46c0..6aa8976 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -458,7 +458,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned
requested_count)
static void PictureRender (vout_display_t *vd, picture_t *pic)
{
- vout_display_sys_t *sys = vd-sys;
+vout_display_sys_t *sys = vd-sys;
vout_display_opengl_Prepare (sys-vgl, pic);
}
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Use 64-bits for integers in plu gin descriptors ( Rémi Denis-Courmont )
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sun Jul 11
14:43:01 2010 +0300| [cafd2e02288005f71157bc74cf13b7d1d68fb808] | committer:
Rémi Denis-Courmont
Use 64-bits for integers in plugin descriptors
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cafd2e02288005f71157bc74cf13b7d1d68fb808
---
include/vlc_plugin.h | 15 ---
src/config/core.c|7 ++-
src/modules/entry.c | 12 +---
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 3f51b6e..2788e4a 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -120,8 +120,8 @@ enum vlc_module_properties
/**
* Current plugin ABI version
*/
-# define MODULE_SYMBOL 1_2_0c
-# define MODULE_SUFFIX __1_2_0c
+# define MODULE_SYMBOL 1_2_0d
+# define MODULE_SUFFIX __1_2_0d
/*
* Add a few defines. You do not want to read this section. Really.
@@ -273,16 +273,16 @@ enum vlc_module_properties
#define add_int_inner( type, name, text, longtext, advc, cb, v ) \
add_typename_inner( type, name, text, longtext, advc, cb ) \
-vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(v));
+vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(v));
#define set_category( i_id ) \
add_type_inner( CONFIG_CATEGORY ) \
-vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(i_id));
+vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(i_id));
#define set_subcategory( i_id ) \
add_type_inner( CONFIG_SUBCATEGORY ) \
-vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)(i_id));
+vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)(i_id));
#define set_section( text, longtext ) \
add_typedesc_inner( CONFIG_SECTION, text, longtext )
@@ -366,7 +366,7 @@ enum vlc_module_properties
#define add_bool( name, v, p_callback, text, longtext, advc ) \
add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, \
p_callback ) \
-if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int)true);
+if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)true);
/* For removed option */
#define add_obsolete_inner( name, type ) \
@@ -410,7 +410,8 @@ enum vlc_module_properties
(vlc_callback_t)(list_update_func));
#define change_integer_range( minv, maxv ) \
-vlc_config_set (p_config, VLC_CONFIG_RANGE, (int)(minv), (int)(maxv));
+vlc_config_set (p_config, VLC_CONFIG_RANGE, \
+(int64_t)(minv), (int64_t)(maxv));
#define change_float_range( minv, maxv ) \
vlc_config_set (p_config, VLC_CONFIG_RANGE, \
diff --git a/src/config/core.c b/src/config/core.c
index b6e3f17..75907dd 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -327,12 +327,9 @@ void config_PutInt( vlc_object_t *p_this, const char
*psz_name,
return;
}
-/* if i_min == i_max == 0, then do not use them */
-if ((p_config-min.i == 0) (p_config-max.i == 0))
-;
-else if (i_value p_config-min.i)
+if (i_value p_config-min.i)
i_value = p_config-min.i;
-else if (i_value p_config-max.i)
+if (i_value p_config-max.i)
i_value = p_config-max.i;
vlc_rwlock_wrlock (config_lock);
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 80f2802..df7277b 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -28,6 +28,7 @@
#include vlc_memory.h
#include assert.h
#include stdarg.h
+#include limits.h
#include modules/modules.h
#include config/configuration.h
@@ -136,6 +137,11 @@ static module_config_t *vlc_config_create (module_t
*module, int type)
}
memset (tab + confsize, 0, sizeof (tab[confsize]));
+if (IsConfigIntegerType (type))
+{
+tab[confsize].max.i = INT_MAX;
+tab[confsize].min.i = INT_MIN;
+}
tab[confsize].i_type = type;
if (type CONFIG_ITEM)
@@ -263,7 +269,7 @@ int vlc_plugin_set (module_t *module, module_config_t
*item, int propid, ...)
if (IsConfigIntegerType (item-i_type))
{
item-orig.i = item-saved.i =
-item-value.i = va_arg (ap, int);
+item-value.i = va_arg (ap, int64_t);
}
else
if (IsConfigFloatType (item-i_type))
@@ -288,8 +294,8 @@ int vlc_plugin_set (module_t *module, module_config_t
*item, int propid, ...)
|| item-i_type == CONFIG_ITEM_MODULE_LIST_CAT
|| item-i_type == CONFIG_ITEM_MODULE_CAT)
{
-item-min.i = va_arg (ap, int);
-item-max.i = va_arg (ap, int);
+item-min.i = va_arg (ap, int64_t);
+item-max.i = va_arg (ap, int64_t);
}
else
if (IsConfigFloatType (item-i_type))
___
vlc-commits mailing list
vlc-commits@videolan.org
[vlc-commits] commit: Qt4: user system font in preferences labels (Ilkka Ollakka )
vlc | branch: master | Ilkka Ollakka il...@videolan.org | Sun Jul 11 16:15:23 2010 +0300| [8273b8bb7a28a17bf6307d233483261f1d2a40cf] | committer: Ilkka Ollakka Qt4: user system font in preferences labels http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8273b8bb7a28a17bf6307d233483261f1d2a40cf --- .../gui/qt4/components/complete_preferences.cpp|1 - modules/gui/qt4/components/simple_preferences.cpp |1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp index f8dd3d8..dd14716 100644 --- a/modules/gui/qt4/components/complete_preferences.cpp +++ b/modules/gui/qt4/components/complete_preferences.cpp @@ -406,7 +406,6 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, QLabel *titleLabel = new QLabel( head ); QFont titleFont = QApplication::font( static_castQWidget*(0) ); titleFont.setPointSize( titleFont.pointSize() + 6 ); -titleFont.setFamily( Verdana ); titleLabel-setFont( titleFont ); // Title hr diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index f56468a..6aaa64f 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -193,7 +193,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, QLabel *panel_label = new QLabel; QFont labelFont = QApplication::font( static_castQWidget*(0) ); labelFont.setPointSize( labelFont.pointSize() + 6 ); -labelFont.setFamily( Verdana ); panel_label-setFont( labelFont ); // Title hr ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Enabled back yadif mode in the deinterlace video filter module. ( Laurent Aimar )
vlc | branch: master | Laurent Aimar fen...@videolan.org | Sun Jul 11
18:59:11 2010 +0200| [4e57bfa7f0ad081f216f4f99b7a3f84d40c493ca] | committer:
Laurent Aimar
Enabled back yadif mode in the deinterlace video filter module.
Becareful that it adds a delay of one frame, so it needs to be
flushed on discontinuity and it will return NULL one time.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e57bfa7f0ad081f216f4f99b7a3f84d40c493ca
---
modules/video_filter/deinterlace.c | 45 +++
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/modules/video_filter/deinterlace.c
b/modules/video_filter/deinterlace.c
index 6ea9917..11a0c49 100644
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -98,7 +98,7 @@ static void RenderMean ( filter_t *, picture_t *, picture_t
* );
static void RenderBlend ( filter_t *, picture_t *, picture_t * );
static void RenderLinear ( filter_t *, picture_t *, picture_t *, int );
static void RenderX ( picture_t *, picture_t * );
-static void RenderYadif ( filter_t *, picture_t *, picture_t *, int, int );
+static int RenderYadif ( filter_t *, picture_t *, picture_t *, int, int );
static void MergeGeneric ( void *, const void *, const void *, size_t );
#if defined(CAN_COMPILE_C_ALTIVEC)
@@ -1434,7 +1434,7 @@ typedef intptr_t x86_reg;
/* yadif.h comes from vf_yadif.c of mplayer project */
#include yadif.h
-static void RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t
*p_src, int i_order, int i_field )
+static int RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t
*p_src, int i_order, int i_field )
{
filter_sys_t *p_sys = p_filter-p_sys;
@@ -1517,12 +1517,16 @@ static void RenderYadif( filter_t *p_filter, picture_t
*p_dst, picture_t *p_src,
/* */
p_dst-date = (p_next-date - p_cur-date) * i_order / 2 + p_cur-date;
+return VLC_SUCCESS;
+}
+else if( !p_prev !p_cur p_next )
+{
+RenderX( p_dst, p_next );
+return VLC_SUCCESS;
}
else
{
-/* Fallback to something simple
- * XXX it is wrong when we have 2 pictures, we should not output a
picture */
-RenderX( p_dst, p_src );
+return VLC_EGENERIC;
}
}
@@ -1542,6 +1546,8 @@ static picture_t *Deinterlace( filter_t *p_filter,
picture_t *p_pic )
return NULL;
}
+picture_CopyProperties( p_pic_dst, p_pic );
+
switch( p_sys-i_mode )
{
case DEINTERLACE_DISCARD:
@@ -1578,11 +1584,13 @@ static picture_t *Deinterlace( filter_t *p_filter,
picture_t *p_pic )
break;
case DEINTERLACE_YADIF:
-msg_Err( p_filter, delaying frames is not supported yet );
-//RenderYadif( p_vout, pp_outpic[0], p_pic, 0, 0 );
-picture_Release( p_pic_dst );
-picture_Release( p_pic );
-return NULL;
+if( RenderYadif( p_filter, p_pic_dst, p_pic, 0, 0 ) )
+{
+picture_Release( p_pic_dst );
+picture_Release( p_pic );
+return NULL;
+}
+break;
case DEINTERLACE_YADIF2X:
msg_Err( p_filter, doubling the frame rate is not supported yet
);
@@ -1593,13 +1601,24 @@ static picture_t *Deinterlace( filter_t *p_filter,
picture_t *p_pic )
return NULL;
}
-picture_CopyProperties( p_pic_dst, p_pic );
p_pic_dst-b_progressive = true;
picture_Release( p_pic );
return p_pic_dst;
}
+static void Flush( filter_t *p_filter )
+{
+filter_sys_t *p_sys = p_filter-p_sys;
+
+for( int i = 0; i HISTORY_SIZE; i++ )
+{
+if( p_sys-pp_history[i] )
+picture_Release( p_sys-pp_history[i] );
+p_sys-pp_history[i] = NULL;
+}
+}
+
static int Mouse( filter_t *p_filter,
vlc_mouse_t *p_mouse, const vlc_mouse_t *p_old, const
vlc_mouse_t *p_new )
{
@@ -1629,6 +1648,8 @@ static int Open( vlc_object_t *p_this )
p_sys-i_mode = DEINTERLACE_BLEND;
p_sys-b_double_rate = false;
p_sys-b_half_height = true;
+for( int i = 0; i HISTORY_SIZE; i++ )
+p_sys-pp_history[i] = NULL;
#if defined(CAN_COMPILE_C_ALTIVEC)
if( vlc_CPU() CPU_CAPABILITY_ALTIVEC )
@@ -1696,6 +1717,7 @@ static int Open( vlc_object_t *p_this )
p_filter-fmt_out.video = fmt;
p_filter-fmt_out.i_codec = fmt.i_chroma;
p_filter-pf_video_filter = Deinterlace;
+p_filter-pf_video_flush = Flush;
p_filter-pf_video_mouse = Mouse;
msg_Dbg( p_filter, deinterlacing );
@@ -1710,6 +1732,7 @@ static void Close( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t*)p_this;
+Flush( p_filter );
free( p_filter-p_sys );
}
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Fixed fourcc selection used for video extraction from vaapi. ( Laurent Aimar )
vlc | branch: master | Laurent Aimar fen...@videolan.org | Sun Jul 11
18:42:07 2010 +0200| [84f1839b2318ac0963bc37d43b078d5992e9e8db] | committer:
Laurent Aimar
Fixed fourcc selection used for video extraction from vaapi.
We now test that the selected fourcc actually works by calling vaGetImage.
Initial patch from Gwenole Beauchesne.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84f1839b2318ac0963bc37d43b078d5992e9e8db
---
modules/codec/avcodec/vaapi.c | 23 ---
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 0cda561..08264cb 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -239,7 +239,7 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void
**pp_hw_ctx, vlc_fourcc_t
goto error;
}
-/* Find a supported image chroma */
+/* Find and create a supported image chroma */
int i_fmt_count = vaMaxNumImageFormats( p_va-p_display );
VAImageFormat *p_fmt = calloc( i_fmt_count, sizeof(*p_fmt) );
if( !p_fmt )
@@ -259,6 +259,21 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void
**pp_hw_ctx, vlc_fourcc_t
p_fmt[i].fourcc == VA_FOURCC( 'I', '4', '2', '0' ) ||
p_fmt[i].fourcc == VA_FOURCC( 'N', 'V', '1', '2' ) )
{
+if( vaCreateImage( p_va-p_display, p_fmt[i], i_width, i_height,
p_va-image ) )
+{
+p_va-image.image_id = 0;
+continue;
+}
+/* Validate that vaGetImage works with this format */
+if( vaGetImage( p_va-p_display, pi_surface_id[0],
+0, 0, i_width, i_height,
+p_va-image.image_id) )
+{
+vaDestroyImage( p_va-p_display, p_va-image.image_id );
+p_va-image.image_id = 0;
+continue;
+}
+
i_chroma = VLC_CODEC_YV12;
fmt = p_fmt[i];
break;
@@ -269,12 +284,6 @@ static int CreateSurfaces( vlc_va_vaapi_t *p_va, void
**pp_hw_ctx, vlc_fourcc_t
goto error;
*pi_chroma = i_chroma;
-/* Create an image for surface extraction */
-if( vaCreateImage( p_va-p_display, fmt, i_width, i_height, p_va-image
) )
-{
-p_va-image.image_id = 0;
-goto error;
-}
CopyInitCache( p_va-image_cache, i_width );
/* Setup the ffmpeg hardware context */
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: transcode: use var_Get(Int|Bool|String) (Ilkka Ollakka )
vlc | branch: master | Ilkka Ollakka il...@videolan.org | Sun Jul 11 20:59:08 2010 +0300| [59144ef3ce8728013c8d9ccef985cead4b7cf700] | committer: Ilkka Ollakka transcode: use var_Get(Int|Bool|String) http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59144ef3ce8728013c8d9ccef985cead4b7cf700 --- modules/stream_out/transcode/transcode.c | 139 +- 1 files changed, 59 insertions(+), 80 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=59144ef3ce8728013c8d9ccef985cead4b7cf700 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
