Changeset eba02c65a872331ab2fd64d30d3ee04b4aaf6338

Timestamp:

29/08/03 18:56:43 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1062176203 +0000

git-parent:

[e5fe2b341fad70233788ceb83533c8d1a5a91d87]

git-author:

Clément Stenac <zorglub@videolan.org> 1062176203 +0000

Message:

* effects.c :

• added a spectrum analyser
  options are:
  

-nb : number of bands , 20 or 80 (80 is default)
-separ : how many blank pixels between bands (1 default)
-amp : vertical amplification ( 3 default)
-peaks: draw peaks ? (default 1)

• improved options parsing
  

* fft.c, fft.h :

FFT code mainly taken from XMMS (adapted coding style)

* visual.c:

Sanity checks (users aren't stupid, are they ? )

* LIST: updated the list

Files:

• modules/LIST (modified) (6 diffs)
• modules/visualization/visual/Modules.am (modified) (1 diff)
• modules/visualization/visual/effects.c (modified) (7 diffs)
• modules/visualization/visual/fft.c (added)
• modules/visualization/visual/fft.h (added)
• modules/visualization/visual/visual.c (modified) (9 diffs)
• modules/visualization/visual/visual.h (modified) (3 diffs)

modules/LIST

@@ -1 +1 @@
-List of vlc plugins (221)
-0 2003/08/10 12:45:52
+1 2003/08/29 16:56:43
-
- * a52: A/52 basic parser
@@ -92 +92 @@
- * downmixsse: SSE accelerated version of downmix.
-
+ * dshow: DirectShow access plugin for encoding cards under Windows
+
- * dts: DTS basic parser
-
@@ -157 +159 @@
- 
- * gnome_main: Gtk+ wrapper for gtk_main
+
+ * goom: visualisation plugin based on goom
-
- * gtk2: interface using the Gtk2 widget set.
@@ -291 +295 @@
- * ncurses: interface module using the ncurses library.
-
+ * ntservice: run VLC as a NT service
+
- * ogg: input module for OGG decapsulation.
-
@@ -414 +420 @@
- * vcd: input module for accessing Video CDs.
-
+ * visual: visualisation system
+
- * vorbis: a vorbis audio decoder using the libvorbis library.
-
@@ -434 +442 @@
- * x11: video output module using the X11 API.
-
- * xmga: X11 MGA video_output plugin
- 
- * xosd: X On Screen Display interface
-

modules/visualization/visual/Modules.am

@@ -1 +1 @@
-SOURCES_visual = visual.c \
-
+
+

modules/visualization/visual/effects.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/08/19 21:20:00
+2 2003/08/29 16:56:43
- *
- * Authors: Cl�nt Stenac <zorglub@via.ecp.fr>
@@ -28 +28 @@
-#include <math.h>
-
-
+
+
+
-/*****************************************************************************
- * Argument list parsers                                                     *
@@ -38 +40 @@
-    if( psz_parse != NULL )
-    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-_value = atoi(++psz_parse);
-psz_parse= psz_eof
-psz_parse++;
-return i_value
-
+f( *psz_parse )
+    psz_parse ++
+else
+    break
+ 
-    }
-    return defaut;
@@ -64 +73 @@
-    if( psz_parse != NULL )
-    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-psz_value = strdup(++psz_parse);
-psz_parse= psz_eof
-psz_parse++;
-return psz_value
-
-
-    
+if( *psz_parse )
+    psz_parse ++
+else
+    break
+
+
+
-}
-
@@ -99 +115 @@
-                 aout_buffer_t * p_buffer , picture_t * p_picture)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -173 +469 @@
-    {
-        psz_parse = strdup( p_effect->psz_args );
-
-
-
-
-
-
-
-
-
+
-    }
-    else
@@ -195 +483 @@
-        i_v = rand() % 256;
-        *(p_picture->p[0].p_pixels + i_position )= i_u;
+        *(p_picture->p[1].p_pixels + i_position/4) = i_v;
+        *(p_picture->p[2].p_pixels + i_position/4) = i_y;
-    }
-    return 0;
-}
+
+/*****************************************************************************
+ * blur_Run:  blur effect
+ *****************************************************************************/
+#if 0 
+  /* This code is totally crappy */
+int blur_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
+              aout_buffer_t * p_buffer , picture_t * p_picture)
+{
+    uint8_t * p_pictures;
+    int i,j; 
+    int i_size;   /* Total size of one image */
+    
+    i_size = (p_picture->p[0].i_pitch * p_picture->p[0].i_lines +
+              p_picture->p[1].i_pitch * p_picture->p[1].i_lines +
+              p_picture->p[2].i_pitch * p_picture->p[2].i_lines );
+    
+    if( !p_effect->p_data )
+    {
+        p_effect->p_data=(void *)malloc( 5 * i_size *sizeof(uint8_t));
+        
+        if( !p_effect->p_data)
+        {
+            msg_Err(p_aout,"Out of memory");
+            return -1;
+        }
+        p_pictures = (uint8_t *)p_effect->p_data;
+    }
+    else
+    {
+        p_pictures =(uint8_t *)p_effect->p_data;
+    }
+
+    for( i = 0 ; i < 5 ; i++)
+    {
+        for ( j = 0 ; j< p_picture->p[0].i_pitch * p_picture->p[0].i_lines; i++)
+            p_picture->p[0].p_pixels[j] = 
+                    p_pictures[i * i_size + j] * (100 - 20 * i) /100 ;
+        for ( j = 0 ; j< p_picture->p[1].i_pitch * p_picture->p[1].i_lines; i++)
+            p_picture->p[1].p_pixels[j] = 
+                    p_pictures[i * i_size +
+                    p_picture->p[0].i_pitch * p_picture->p[0].i_lines + j ];
+        for ( j = 0 ; j< p_picture->p[2].i_pitch * p_picture->p[2].i_lines; i++)
+            p_picture->p[2].p_pixels[j] = 
+                    p_pictures[i * i_size +
+                    p_picture->p[0].i_pitch * p_picture->p[0].i_lines +
+                    p_picture->p[1].i_pitch * p_picture->p[1].i_lines 
+                    + j ];
+    }
+
+    memcpy ( &p_pictures[ i_size ] , &p_pictures[0] , 4 * i_size * sizeof(uint8_t) );
+}
+#endif

modules/visualization/visual/visual.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/08/19 21:20:00
+2 2003/08/29 16:56:43
- *
- * Authors: Cl�nt Stenac <zorglub@via.ecp.fr>
@@ -98 +98 @@
-
-    p_filter->p_sys->i_height = config_GetInt( p_filter , "effect-height");
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    /* Parse the effect list */
@@ -114 +125 @@
-    p_current_effect = p_filter->p_sys->p_first_effect;
-    p_current_effect->p_next = NULL;
-    
-#define SEARCH(name , function )                                              \
-    if(!strncmp( psz_effects , name, strlen(name) ) )                         \
-    {                                                                         \
-        p_current_effect->p_next =                                            \
-                (visual_effect_t *)malloc( sizeof( visual_effect_t ) );       \
-        if( !p_current_effect )                                               \
-        {                                                                     \
-            msg_Err( p_filter, "Out of memory" );                             \
-        }                                                                     \
-        p_current_effect = p_current_effect -> p_next;                        \
-        p_current_effect->pf_run = NULL;                                      \
-        p_current_effect->p_next = NULL;                                      \
-        p_current_effect->i_width = p_filter->p_sys->i_width;                 \
-        p_current_effect->i_height = p_filter->p_sys->i_height;               \
-        p_current_effect->pf_run = function ;                                 \
-        p_current_effect->psz_args  = NULL;                                   \
-        psz_boa = strchr( psz_effects, '{' );                                 \
-        if( psz_boa )                                                         \
-        {                                                                     \
-            psz_eoa = strchr( psz_effects, '}');                              \
-            if( ! psz_eoa )                                                   \
-            {                                                                 \
-               msg_Err( p_filter, "Unable to parse effect list. Aborting");   \
-               return -1;                                                     \
-            }                                                                 \
-            *psz_eoa = '\0';                                                  \
-            p_current_effect->psz_args = strdup(++psz_boa);                   \
-            psz_effects = psz_eoa;                                            \
-        }                                                                     \
-        msg_Dbg(p_filter, "Adding filter: %s ( %s )",name,                    \
-                        p_current_effect->psz_args);                          \
-    }
-    
-    while(1)
-    {
@@ -160 +137 @@
-            *psz_eof = '\0';
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        psz_effects =  psz_eof;
-        psz_effects ++;
-
-!* psz_effects || 
+
-            break;
-    }
-                
-    p_filter->pf_do_work = DoWork;
-0
+1
-
-    /* Open the video output */
-    p_filter->p_sys->p_vout =
-
+
+
-                         p_filter->p_sys->i_height,
-                  VLC_FOURCC('I','4','2','0'), 
@@ -316 +329 @@
-    while( p_current_effect )  
-    {
+
+#if 1
-        /* FIXME: Find why it segfaults when we directly call
-         * p_current_effect->pf_run(....)
@@ -335 +350 @@
-            spectrum_Run(p_current_effect, p_aout, p_out_buf , p_outpic );
-        }
-
+
+
+
+
+
+
+
+
+
-        p_current_effect = p_current_effect->p_next;
-    }
@@ -344 +367 @@
-    vout_DisplayPicture ( p_filter->p_sys->p_vout, p_outpic );
-
-    
-}
-
@@ -354 +376 @@
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
+    visual_effect_t *p_old;
+    visual_effect_t *p_cur = p_filter->p_sys->p_first_effect;
+    
-    if( p_filter->p_sys->p_vout ) 
-    {
@@ -359 +384 @@
-        vout_Destroy( p_filter->p_sys->p_vout );
-    }
-
+
+
+
+
+
+
+
+
+
-    if( p_filter->p_sys != NULL )
-        free( p_filter->p_sys);

modules/visualization/visual/visual.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/08/19 21:20:00
+2 2003/08/29 16:56:43
- *
- * Authors: Cl�nt Stenac <zorglub@via.ecp.fr>
@@ -52 +52 @@
-    int        i_height;
-    char *     psz_args; 
+    int        i_nb_chans;
-} visual_effect_t ;
-
@@ -72 +73 @@
-int spectrum_Run
-        (visual_effect_t * , aout_instance_t *, aout_buffer_t *, picture_t *);
-
+
+
+
+
-
-/* Default vout size */