/*****************************************************************************
* visual.c : Visualisation system
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#define ELIST_TEXT N_( "Effects list" )
#define ELIST_LONGTEXT N_( \
"A list of visual effect, separated by commas.\n" \
- "Current effects include: dummy, random, scope, spectrum" )
+ "Current effects include: dummy, scope, spectrum" )
#define WIDTH_TEXT N_( "Video width" )
#define WIDTH_LONGTEXT N_( \
#define NBBANDS_TEXT N_( "Number of bands" )
#define NBBANDS_LONGTEXT N_( \
"Number of bands used by spectrum analyzer, should be 20 or 80." )
+#define SPNBBANDS_LONGTEXT N_( \
+ "Number of bands used by the spectrometer, from 20 to 80." )
#define SEPAR_TEXT N_( "Band separator" )
#define SEPAR_LONGTEXT N_( \
#define PEAKS_LONGTEXT N_( \
"Defines whether to draw peaks." )
+#define ORIG_TEXT N_( "Enable original graphic spectrum" )
+#define ORIG_LONGTEXT N_( \
+ "Defines whether to draw the original spectrum graphic routine." )
+
+#define BANDS_TEXT N_( "Enable bands" )
+#define BANDS_LONGTEXT N_( \
+ "Defines whether to draw the bands." )
+
+#define BASE_TEXT N_( "Enable base" )
+#define BASE_LONGTEXT N_( \
+ "Defines whether to draw the base of the bands." )
+
+#define RADIUS_TEXT N_( "Base pixel radius" )
+#define RADIUS_LONGTEXT N_( \
+ "Defines radius size in pixels, of base of bands(beginning)." )
+
+#define SECT_TEXT N_( "Spectral sections" )
+#define SECT_LONGTEXT N_( \
+ "Determines how many sections of spectrum will exist." )
+
+#define PEAK_HEIGHT_TEXT N_( "Peak height" )
+#define PEAK_HEIGHT_LONGTEXT N_( \
+ "This is the total pixel height of the peak items." )
+
+#define PEAK_WIDTH_TEXT N_( "Peak extra width" )
+#define PEAK_WIDTH_LONGTEXT N_( \
+ "Additions or subtractions of pixels on the peak width." )
+
+#define COLOR1_TEXT N_( "V-plane color" )
+#define COLOR1_LONGTEXT N_( \
+ "YUV-Color cube shifting across the V-plane ( 0 - 127 )." )
+
#define STARS_TEXT N_( "Number of stars" )
#define STARS_LONGTEXT N_( \
"Defines the number of stars to draw with random effect." )
HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE );
set_section( N_("Spectrum analyser") , NULL );
add_integer("visual-nbbands", 80, NULL,
- NBBANDS_TEXT, NBBANDS_LONGTEXT, VLC_FALSE );
+ NBBANDS_TEXT, NBBANDS_LONGTEXT, VLC_TRUE );
add_integer("visual-separ", 1, NULL,
- SEPAR_TEXT, SEPAR_LONGTEXT, VLC_FALSE );
+ SEPAR_TEXT, SEPAR_LONGTEXT, VLC_TRUE );
add_integer("visual-amp", 3, NULL,
- AMP_TEXT, AMP_LONGTEXT, VLC_FALSE );
+ AMP_TEXT, AMP_LONGTEXT, VLC_TRUE );
add_bool("visual-peaks", VLC_TRUE, NULL,
- PEAKS_TEXT, PEAKS_LONGTEXT, VLC_FALSE );
- set_section( N_( "Random effect") , NULL );
- add_integer("visual-stars", 200, NULL,
- STARS_TEXT, STARS_LONGTEXT, VLC_FALSE );
+ PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
+ set_section( N_("Spectrometer") , NULL );
+ add_bool("spect-show-original", VLC_FALSE, NULL,
+ ORIG_TEXT, ORIG_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-base", VLC_TRUE, NULL,
+ BASE_TEXT, BASE_LONGTEXT, VLC_TRUE );
+ add_integer("spect-radius", 42, NULL,
+ RADIUS_TEXT, RADIUS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-sections", 3, NULL,
+ SECT_TEXT, SECT_LONGTEXT, VLC_TRUE );
+ add_integer("spect-color", 80, NULL,
+ COLOR1_TEXT, COLOR1_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-bands", VLC_TRUE, NULL,
+ BANDS_TEXT, BANDS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-nbbands", 32, NULL,
+ NBBANDS_TEXT, SPNBBANDS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-separ", 1, NULL,
+ SEPAR_TEXT, SEPAR_LONGTEXT, VLC_TRUE );
+ add_integer("spect-amp", 8, NULL,
+ AMP_TEXT, AMP_LONGTEXT, VLC_TRUE );
+ add_bool("spect-show-peaks", VLC_TRUE, NULL,
+ PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
+ add_integer("spect-peak-width", 61, NULL,
+ PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, VLC_TRUE );
+ add_integer("spect-peak-height", 1, NULL,
+ PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, VLC_TRUE );
set_capability( "visualization", 0 );
set_callbacks( Open, Close );
add_shortcut( "visualizer");
{
{ "scope", scope_Run },
{ "spectrum", spectrum_Run },
- { "random", random_Run},
+ { "spectrometer", spectrometer_Run },
{ "dummy", dummy_Run},
{ NULL, dummy_Run}
};
vlc_value_t val;
char *psz_effects, *psz_parser;
+ video_format_t fmt = {0};
if( ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2') &&
p_filter->input.i_format != VLC_FOURCC('f','i','3','2') ) )
var_Get( p_filter, "effect-list", &val);
psz_parser = psz_effects = strdup( val.psz_string );
free( val.psz_string );
- msg_Dbg( p_filter , "Building list of effects" );
-
+
var_AddCallback( p_filter, "effect-list", FilterCallback, NULL );
while( psz_parser && *psz_parser != '\0' )
}
/* Open the video output */
- p_sys->p_vout =
- vout_Request( p_filter, NULL,
- p_sys->i_width, p_sys->i_height,
- VLC_FOURCC('I','4','2','0'),
- VOUT_ASPECT_FACTOR * p_sys->i_width/p_sys->i_height );
+ fmt.i_width = fmt.i_visible_width = p_sys->i_width;
+ fmt.i_height = fmt.i_visible_height = p_sys->i_height;
+ fmt.i_chroma = VLC_FOURCC('I','4','2','0');
+ fmt.i_aspect = VOUT_ASPECT_FACTOR * p_sys->i_width/p_sys->i_height;
+ fmt.i_sar_num = fmt.i_sar_den = 1;
+ p_sys->p_vout = vout_Request( p_filter, NULL, &fmt );
if( p_sys->p_vout == NULL )
{
msg_Err( p_filter, "no suitable vout module" );
if( p_filter->p_sys->p_vout )
{
- vout_Request( p_filter, p_filter->p_sys->p_vout, 0, 0, 0, 0 );
+ vout_Request( p_filter, p_filter->p_sys->p_vout, 0 );
}
/* Free the list */
projects / vlc / blobdiff