Changeset 524254f836416fba567be30b2b168d63811fb3a5

Timestamp:

21/10/05 00:37:14 (3 years ago)

Author:

Scott Caudle <zcot@videolan.org>

git-committer:

Scott Caudle <zcot@videolan.org> 1129847834 +0000

git-parent:

[46d8d47a755832d9153d40825eefdfd5cd4737f5]

git-author:

Scott Caudle <zcot@videolan.org> 1129847834 +0000

Message:

updates spectrometer visualization. some optimization tweaks and additional features.

Files:

• modules/visualization/visual/effects.c (modified) (14 diffs)
• modules/visualization/visual/visual.c (modified) (2 diffs)

modules/visualization/visual/effects.c

@@ -397 +397 @@
-
-    p_buffs = p_s16_buff;
-    //i_nb_bands = config_GetInt ( p_aout, "visual-nbbands" );
-    //i_separ    = config_GetInt( p_aout, "visual-separ" );
-    //i_amp     = config_GetInt ( p_aout, "visual-amp" );
-    //i_peak     = config_GetInt ( p_aout, "visual-peaks" );
-    /* previous 4 vars changed.. using them as `spect' variables */
-    i_original     = config_GetInt ( p_aout, "spect-show-original" );
-    i_nb_bands     = config_GetInt ( p_aout, "spect-nbbands" );
@@ -421 +416 @@
-    else
-    {
-
+
+
-        xscale = xscale2;
-    }
-    i_nb_bands *= i_sections;
-    /* whoops, dont malloc the following memory for all the duplicated bands..
-        -only the original 20 or 80 will be fine */
-
-    if( !p_effect->p_data )
@@ -447 +440 @@
-    }
-
-
-    height = (int *)malloc( i_nb_bands * sizeof(int) );
-    if( !height)
@@ -454 +446 @@
-        return -1;
-    }
+
-    /* Convert the buffer to int16_t  */
-    /* Pasted from float32tos16.c */
@@ -482 +475 @@
-    for(i= 0; i< FFT_BUFFER_SIZE ; i++ )
-        p_dest[i] = ( (int) sqrt( p_output [ i + 1 ] ) ) >> 8;
+
+    i_nb_bands *= i_sections;
-
-    for ( i = 0 ; i< i_nb_bands/i_sections ;i++)
@@ -661 +656 @@
-
-                    *(p_picture->p[1].p_pixels + x + y * p_picture->p[1].i_pitch
-                    - p_picture->p[1].i_pitch
-                    ) = 0;/* U(R,G,B); */
-
@@ -668 +662 @@
-                        if ( 0x04 * (i_line + k ) -0x0f < 0xff)
-                            *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                            - p_picture->p[2].i_pitch
-                            ) = ( 0x04 * ( i_line + k ) ) -(color1-1);/* -V(R,G,B); */
-                        else
-                            *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                            - p_picture->p[2].i_pitch
-                            ) = 255;/* V(R,G,B); */
-                    }
@@ -678 +670 @@
-                    {
-                        *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                        - p_picture->p[2].i_pitch
-                        ) = color1;/* V(R,G,B); */
-                    }
@@ -706 +697 @@
-
-            *(p_picture->p[1].p_pixels + x + y * p_picture->p[1].i_pitch
-            - p_picture->p[1].i_pitch
-            ) = 0;/* U(R,G,B); */
-
@@ -713 +703 @@
-                if( 0x04 * i_line -0x0f < 0xff)
-                    *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                    - p_picture->p[2].i_pitch
-                    ) = ( 0x04 * i_line) -(color1-1);/* -V(R,G,B); */
-                else
-                    *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                    - p_picture->p[2].i_pitch
-                    ) = 255;/* V(R,G,B); */
-            }
@@ -723 +711 @@
-            {
-                *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                - p_picture->p[2].i_pitch
-                ) = color1;/* V(R,G,B); */
-            }
@@ -756 +743 @@
-
-                *(p_picture->p[1].p_pixels + x + y * p_picture->p[1].i_pitch
-                - p_picture->p[1].i_pitch
-                ) = 0;
-
@@ -763 +749 @@
-                    if ( 0x04 * i_line -0x0f < 0xff)
-                        *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                        - p_picture->p[2].i_pitch
-                        ) = ( 0x04 * i_line) -(color1-1);
-                    else
-                        *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                        - p_picture->p[2].i_pitch
-                        ) = 255;
-                }
@@ -773 +757 @@
-                {
-                    *(p_picture->p[2].p_pixels + x + y * p_picture->p[2].i_pitch
-                    - p_picture->p[2].i_pitch
-                    ) = color1;
-                }

modules/visualization/visual/visual.c

@@ -52 +52 @@
-#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" )
@@ -126 +128 @@
-             PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
-    set_section( N_("Spectrometer") , NULL );
-TRU
+FALS
-             ORIG_TEXT, ORIG_LONGTEXT, VLC_TRUE );
-    add_bool("spect-show-base", VLC_TRUE, NULL,
-             BASE_TEXT, BASE_LONGTEXT, VLC_TRUE );
-2
+4
-             RADIUS_TEXT, RADIUS_LONGTEXT, VLC_TRUE );
-2
+3
-             SECT_TEXT, SECT_LONGTEXT, VLC_TRUE );
-16
+80
-             COLOR1_TEXT, COLOR1_LONGTEXT, VLC_TRUE );
-    add_bool("spect-show-bands", VLC_TRUE, NULL,
-             BANDS_TEXT, BANDS_LONGTEXT, VLC_TRUE );
-80
-
+32
+SP
-    add_integer("spect-separ", 1, NULL,
-             SEPAR_TEXT, SEPAR_LONGTEXT, VLC_TRUE );
-3
+8
-             AMP_TEXT, AMP_LONGTEXT, VLC_TRUE );
-    add_bool("spect-show-peaks", VLC_TRUE, NULL,
-             PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE );
-
+6
-             PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, VLC_TRUE );
-    add_integer("spect-peak-height", 1, NULL,