Commit 0596bf59 authored by Clément Stenac's avatar Clément Stenac

* src/audio_output/input.c

  src/libvlc.h :
       First try to implement "user audio filters"
       You can provide a list of audio filters that you want to add to
       the pipeline (only the "headphone", at that time).
	(use --audio-filter filter1,filter2,...)

   ***Warning***
   It seems to work, but no guarantee at all. Perhaps all is bad
   and the commit should be reverted, as it could break audio output

* modules/codec/libmpeg2.c :
	Fixed a segfault when vout creation fails
parent 236aa932
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libmpeg2.c: mpeg2 video decoder module making use of libmpeg2. * libmpeg2.c: mpeg2 video decoder module making use of libmpeg2.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: libmpeg2.c,v 1.24 2003/08/08 17:08:32 gbazin Exp $ * $Id: libmpeg2.c,v 1.25 2003/08/18 13:16:43 zorglub Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -299,7 +299,13 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) ...@@ -299,7 +299,13 @@ static int RunDecoder( decoder_fifo_t *p_fifo )
p_dec->p_info->sequence->width, p_dec->p_info->sequence->width,
p_dec->p_info->sequence->height, p_dec->p_info->sequence->height,
VLC_FOURCC('Y','V','1','2'), i_aspect ); VLC_FOURCC('Y','V','1','2'), i_aspect );
if(p_dec->p_vout == NULL )
{
msg_Err( p_dec->p_fifo , "cannot create vout" );
return -1;
}
msg_Dbg( p_dec->p_fifo, "%dx%d, aspect %d, %u.%03u fps", msg_Dbg( p_dec->p_fifo, "%dx%d, aspect %d, %u.%03u fps",
p_dec->p_info->sequence->width, p_dec->p_info->sequence->width,
p_dec->p_info->sequence->height, i_aspect, p_dec->p_info->sequence->height, i_aspect,
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header * libvlc.h: main libvlc header
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.79 2003/08/17 20:58:45 alexis Exp $ * $Id: libvlc.h,v 1.80 2003/08/18 13:16:43 zorglub Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -139,6 +139,11 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", ...@@ -139,6 +139,11 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it",
"This option allows you to use the S/PDIF audio output by default when " \ "This option allows you to use the S/PDIF audio output by default when " \
"your hardware supports it as well as the audio stream being played.") "your hardware supports it as well as the audio stream being played.")
#define AUDIO_FILTER_TEXT N_("Audio filters")
#define AUDIO_FILTER_LONGTEXT N_( \
"This allows you to add audio postprocessing filters, to modify" \
"the sound.")
#define HEADPHONE_TEXT N_("Headphone virtual spatialization effect") #define HEADPHONE_TEXT N_("Headphone virtual spatialization effect")
#define HEADPHONE_LONGTEXT N_( \ #define HEADPHONE_LONGTEXT N_( \
"This effect gives you the feeling that you are standing in a room " \ "This effect gives you the feeling that you are standing in a room " \
...@@ -148,6 +153,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it", ...@@ -148,6 +153,7 @@ static char *ppsz_language[] = { "auto", "en", "en_GB", "de", "fr", "it",
"long periods of time.\nIt works with any source format from mono " \ "long periods of time.\nIt works with any source format from mono " \
"to 5.1.") "to 5.1.")
#define VOUT_TEXT N_("Video output module") #define VOUT_TEXT N_("Video output module")
#define VOUT_LONGTEXT N_( \ #define VOUT_LONGTEXT N_( \
"This option allows you to select the video output method used by VLC. " \ "This option allows you to select the video output method used by VLC. " \
...@@ -524,7 +530,9 @@ vlc_module_begin(); ...@@ -524,7 +530,9 @@ vlc_module_begin();
add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE );
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE ); add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
add_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE ); add_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE );
add_string("audio-filter",0,NULL,AUDIO_FILTER_TEXT,
AUDIO_FILTER_LONGTEXT,VLC_FALSE);
/* Video options */ /* Video options */
add_category_hint( N_("Video"), NULL, VLC_FALSE ); add_category_hint( N_("Video"), NULL, VLC_FALSE );
add_module_with_short( "vout", 'V', "video output", NULL, NULL, add_module_with_short( "vout", 'V', "video output", NULL, NULL,
......
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