Changeset ce0e4fb0ab2f1d847f4b17ae9a895e01a1ae7224

Timestamp:

04/15/07 23:00:09 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1176670809 +0000

git-parent:

[4cdb486b976a23ca9f24242ab98ea4258e9558de]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1176670809 +0000

Message:

• mosaic_bridge.c: - Add "vfilters" option to apply video filters on the
  

image before sending it to the mosaic.

• Add option ("chroma") to force the image chroma
  
• Remove alpha mask code
  

• mosaic.c: - Remove bluescreen code
  
  • Misc cosmetics changes
    
• bluescreen.c: New bluescreen filter (mostly cut & paste from mosaic.c)
  
• alphamask.c: New alpha mask filter (mostly cut & paste from mosaic_bridge.c)
  
• invert.c: don't invert the alpha plane for YUVA images (We also need to
  

prevent that for RGBA images ... but that's not really used
currently)

• configure.ac, video_filter/Modules.am: add alphamask and bluescreen
  

Files:

• configure.ac (modified) (1 diff)
• modules/stream_out/mosaic_bridge.c (modified) (27 diffs)
• modules/video_filter/Modules.am (modified) (1 diff)
• modules/video_filter/alphamask.c (added)
• modules/video_filter/bluescreen.c (added)
• modules/video_filter/invert.c (modified) (2 diffs)
• modules/video_filter/mosaic.c (modified) (26 diffs)

configure.ac

@@ -1188 +1188 @@
-  VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump])
-  VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder])
-
+ bluescreen alphamask
-  VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
-  VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])

modules/stream_out/mosaic_bridge.c

@@ -2 +2 @@
- * mosaic_bridge.c:
- *****************************************************************************
-5
+7
- * $Id$
- *
@@ -35 +35 @@
-#include <vlc_codec.h>
-
-
+
+
-
-#include "../video_filter/mosaic.h"
@@ -54 +55 @@
-    vlc_bool_t b_inited;
-
-
-
+
+
+
+
-};
-
@@ -86 +89 @@
-        }
-    }
-}
-
-/* copied from video_filters/erase.c . Gruik ? */
-static void LoadMask( sout_stream_t *p_stream, const char *psz_filename )
-{
-    image_handler_t *p_image;
-    video_format_t fmt_in, fmt_out;
-    memset( &fmt_in, 0, sizeof( video_format_t ) );
-    memset( &fmt_out, 0, sizeof( video_format_t ) );
-    fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
-    if( p_stream->p_sys->p_mask )
-        p_stream->p_sys->p_mask->pf_release( p_stream->p_sys->p_mask );
-    p_image = image_HandlerCreate( p_stream );
-    p_stream->p_sys->p_mask =
-        image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
-    image_HandlerDelete( p_image );
-}
-
@@ -113 +100 @@
-static int               Send( sout_stream_t *, sout_stream_id_t *, block_t * );
-
-
-
+
+
+
+
+
+
+
+
+
-static void video_link_picture_decoder( decoder_t *, picture_t * );
-static void video_unlink_picture_decoder( decoder_t *, picture_t * );
@@ -136 +130 @@
-#define RATIO_LONGTEXT N_( \
-    "Sample aspect ratio of the destination (1:1, 3:4, 2:3)." )
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-vlc_module_begin();
@@ -148 +148 @@
-    add_shortcut( "mosaic-bridge" );
-
-SOUT_
+
-                VLC_FALSE );
-SOUT_
+
-                 WIDTH_LONGTEXT, VLC_TRUE );
-SOUT_
+
-                 HEIGHT_LONGTEXT, VLC_TRUE );
-SOUT_
+
-                RATIO_LONGTEXT, VLC_FALSE );
-
-
+
+
+
+
+
-
-    set_callbacks( Open, Close );
@@ -165 +168 @@
-
-static const char *ppsz_sout_options[] = {
-mask
+vfilter", "chroma
-};
-
@@ -178 +181 @@
-    vlc_value_t           val;
-
-SOUT_
+
-                       p_stream->p_cfg );
-
@@ -193 +196 @@
-    p_sys->p_lock = val.p_address;
-
-SOUT_
+
-    p_sys->psz_id = val.psz_string;
-
-    p_sys->i_height =
-SOUT_
-SOUT_
+
+
-                     p_stream );
-
-    p_sys->i_width =
-SOUT_
-SOUT_
+
+
-                     p_stream );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    if ( val.psz_string )
-    {
@@ -249 +235 @@
-    }
-
+    p_sys->i_chroma = 0;
+    val.psz_string = var_GetNonEmptyString( p_stream, CFG_PREFIX "chroma" );
+    if( val.psz_string && strlen( val.psz_string ) >= 4 )
+    {
+        memcpy( &p_sys->i_chroma, val.psz_string, 4 );
+        msg_Dbg( p_stream, "Forcing image chroma to 0x%.8x (%4.4s)", p_sys->i_chroma, (char*)&p_sys->i_chroma );
+    }
+
-    p_stream->pf_add    = Add;
-    p_stream->pf_del    = Del;
@@ -271 +265 @@
-        free( p_sys->psz_id );
-
-    vlc_mutex_destroy( &p_sys->mask_lock );
-    if( p_stream->p_sys->p_mask )
-        p_stream->p_sys->p_mask->pf_release( p_stream->p_sys->p_mask );
-
-    free( p_sys );
-}
@@ -283 +273 @@
-    bridge_t *p_bridge;
-    bridged_es_t *p_es;
+    char *psz_chain, *psz_parser;
-    int i;
-
@@ -300 +291 @@
-    p_sys->p_decoder->fmt_out.p_extra = 0;
-    p_sys->p_decoder->pf_decode_video = 0;
-
-
+_decoder
+_decoder
-    p_sys->p_decoder->pf_picture_link    = video_link_picture_decoder;
-    p_sys->p_decoder->pf_picture_unlink  = video_unlink_picture_decoder;
@@ -376 +367 @@
-    msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
-
+    /* Create user specified video filters */
+    psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" );
+    printf("psz_chain: %s\n", psz_chain );
+    {
+        config_chain_t *p_cfg;
+        for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
+        {
+            printf(" - %s\n", p_cfg->psz_value );
+        }
+    }
+    p_sys->i_vfilters = 0;
+    p_sys->pp_vfilters = NULL;
+    psz_parser = psz_chain;
+    while( psz_parser && *psz_parser )
+    {
+        config_chain_t *p_cfg;
+        char *psz_name;
+        filter_t **pp_vfilter;
+        psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
+        p_sys->i_vfilters++;
+        p_sys->pp_vfilters =
+            (filter_t **)realloc( p_sys->pp_vfilters,
+                                  p_sys->i_vfilters * sizeof(filter_t *) );
+        pp_vfilter = p_sys->pp_vfilters+(p_sys->i_vfilters - 1);
+        *pp_vfilter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
+        vlc_object_attach( *pp_vfilter, p_stream );
+        (*pp_vfilter)->pf_vout_buffer_new = video_new_buffer_filter;
+        (*pp_vfilter)->pf_vout_buffer_del = video_del_buffer_filter;
+        (*pp_vfilter)->fmt_in = p_sys->p_decoder->fmt_out;
+        if( p_sys->i_chroma )
+            (*pp_vfilter)->fmt_in.video.i_chroma = p_sys->i_chroma;
+        (*pp_vfilter)->fmt_out = (*pp_vfilter)->fmt_in;
+        (*pp_vfilter)->p_cfg = p_cfg;
+        (*pp_vfilter)->p_module =
+            module_Need( *pp_vfilter, "video filter2", psz_name, VLC_TRUE );
+        if( (*pp_vfilter)->p_module )
+        {
+            /* It worked! */
+            (*pp_vfilter)->p_owner = (filter_owner_sys_t *)
+                p_sys->p_decoder->p_owner;
+            msg_Err( p_stream, "Added video filter %s to the chain",
+                     psz_name );
+        }
+        else
+        {
+            /* Crap ... we didn't find a filter */
+            msg_Warn( p_stream,
+                      "no video filter matching name \"%s\" found",
+                      psz_name );
+            vlc_object_detach( *pp_vfilter );
+            vlc_object_destroy( *pp_vfilter );
+            p_sys->i_vfilters--;
+        }
+        //if( psz_parser && *psz_parser ) psz_parser++;
+        printf("\n\npsz_parser: %s\n\n", psz_parser );
+    }
+    free( psz_chain );
+
-    return (sout_stream_id_t *)p_sys;
-}
@@ -385 +434 @@
-    bridged_es_t *p_es;
-    vlc_bool_t b_last_es = VLC_TRUE;
+    filter_t **pp_vfilter, **pp_end;
-    int i;
-
@@ -413 +463 @@
-    }
-
+    /* Destroy user specified video filters */
+    pp_vfilter = p_sys->pp_vfilters;
+    pp_end = pp_vfilter + p_sys->i_vfilters;
+    for( ; pp_vfilter < pp_end; pp_vfilter++ )
+    {
+        vlc_object_detach( *pp_vfilter );
+        if( (*pp_vfilter)->p_module )
+            module_Unneed( *pp_vfilter, (*pp_vfilter)->p_module );
+        vlc_object_destroy( *pp_vfilter );
+    }
+    free( p_sys->pp_vfilters );
+
-    vlc_mutex_lock( p_sys->p_lock );
-
@@ -499 +561 @@
-            fmt_in = p_sys->p_decoder->fmt_out.video;
-
-
-
-
-
-
+
+
+
-            else
-                fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
@@ -536 +596 @@
-                continue;
-            }
-
-            if( p_sys->p_mask )
-            {
-                plane_t *p_mask = p_sys->p_mask->p+A_PLANE;
-                plane_t *p_apic = p_new_pic->p+A_PLANE;
-                if(    p_mask->i_visible_pitch
-                    != p_apic->i_visible_pitch
-                    || p_mask->i_visible_lines
-                    != p_apic->i_visible_lines )
-                {
-                    msg_Warn( p_stream,
-                              "Mask size (%d x %d) and image size (%d x %d) "
-                              "don't match. The mask will not be applied.",
-                              p_mask->i_visible_pitch,
-                              p_mask->i_visible_lines,
-                              p_apic->i_visible_pitch,
-                              p_apic->i_visible_lines );
-                }
-                else
-                {
-                    if( p_mask->i_pitch != p_apic->i_pitch
-                    ||  p_mask->i_lines != p_apic->i_lines )
-                    {
-                        /* visible plane sizes match ... but not the undelying
-                         * buffer. I'm not sure that this can happen,
-                         * but better safe than sorry. */
-                        int i_line;
-                        int i_lines = p_mask->i_visible_lines;
-                        uint8_t *p_src = p_mask->p_pixels;
-                        uint8_t *p_dst = p_apic->p_pixels;
-                        int i_src_pitch = p_mask->i_pitch;
-                        int i_dst_pitch = p_apic->i_pitch;
-                        int i_visible_pitch = p_mask->i_visible_pitch;
-                        for( i_line = 0; i_line < i_lines; i_line++,
-                             p_src += i_src_pitch, p_dst += i_dst_pitch )
-                        {
-                            p_stream->p_libvlc->pf_memcpy(
-                                p_dst, p_src, i_visible_pitch );
-                        }
-                    }
-                    else
-                    {
-                        /* plane sizes match */
-                        p_stream->p_libvlc->pf_memcpy(
-                            p_apic->p_pixels, p_mask->p_pixels,
-                            p_mask->i_pitch * p_mask->i_lines );
-                    }
-                }
-                vlc_mutex_unlock( &p_sys->mask_lock );
-            }
-        }
-        else
-        {
-            p_new_pic = (picture_t*)malloc( sizeof(picture_t) );
+            /* TODO: chroma conversion if needed */
-            vout_AllocatePicture( p_stream, p_new_pic, p_pic->format.i_chroma,
-                                  p_pic->format.i_width, p_pic->format.i_height,
@@ -603 +614 @@
-        p_new_pic->pf_release = ReleasePicture;
-        p_new_pic->date = p_pic->date;
-
-        p_pic->pf_release( p_pic );
+
+        if( p_sys->pp_vfilters )
+        {
+            /* Apply user specified video filters */
+            filter_t **pp_vfilter = p_sys->pp_vfilters;
+            filter_t **pp_end = pp_vfilter + p_sys->i_vfilters;
+            for( ; pp_vfilter < pp_end; pp_vfilter++ )
+            {
+                (*pp_vfilter)->fmt_in.i_codec = p_new_pic->format.i_chroma;
+                (*pp_vfilter)->fmt_out.i_codec = p_new_pic->format.i_chroma;
+                (*pp_vfilter)->fmt_in.video = p_new_pic->format;
+                (*pp_vfilter)->fmt_out.video = p_new_pic->format;
+                p_new_pic = (*pp_vfilter)->pf_video_filter( *pp_vfilter,
+                                                             p_new_pic );
+                if( !p_new_pic )
+                {
+                    msg_Err( p_stream, "video filter failed" );
+                    break;
+                }
+            }
+            if( !p_new_pic ) continue;
+        }
+
-        PushPicture( p_stream, p_new_pic );
-    }
@@ -617 +650 @@
-};
-
-
+_decoder
-{
-    if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
-    {
-
+_decoder
-    }
-    else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    picture_t *p_pic;
-    int i;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        for( i = 0; i < PICTURE_RING_SIZE; i++ )
@@ -701 +759 @@
-    if( i == PICTURE_RING_SIZE )
-    {
-dec
+this
-                 "resetting its ring buffer" );
-
@@ -713 +771 @@
-
-    p_pic = malloc( sizeof(picture_t) );
-p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.
-VLC_OBJECT(p_dec)
-p_dec->fmt_out.
-p_dec->fmt_out.
-p_dec->fmt_out.
-p_dec->fmt_out.
+fmt_out->video.i_chroma = fmt_out->
+p_this
+fmt_out->
+fmt_out->
+fmt_out->
+fmt_out->
-
-    if( !p_pic->i_planes )
@@ -726 +784 @@
-    }
-
-video_release_buffer
+pf_release
-    p_pic->p_sys = malloc( sizeof(picture_sys_t) );
-VLC_OBJECT(p_dec)
+p_this
-    p_pic->p_sys->b_dead = VLC_FALSE;
-    p_pic->i_status = RESERVED_PICTURE;
@@ -737 +795 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    p_pic->i_refcount = 0;
@@ -757 +827 @@
-static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
-{
-
+_decoder
-}
-
@@ -772 +842 @@
-    int i_ret = VLC_SUCCESS;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    {
-        /* We create the handler before updating the value in p_sys

modules/video_filter/Modules.am

@@ -31 +31 @@
-SOURCES_sharpen = sharpen.c
-SOURCES_erase = erase.c
+SOURCES_bluescreen = bluescreen.c
+SOURCES_alphamask = alphamask.c
-noinst_HEADERS = filter_common.h

modules/video_filter/invert.c

@@ -109 +109 @@
-    picture_t *p_outpic;
-    int i_index;
+    int i_planes;
-
-    if( !p_pic ) return NULL;
@@ -121 +122 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        uint8_t *p_in, *p_in_end, *p_line_end, *p_out;

modules/video_filter/mosaic.c

@@ -2 +2 @@
- * mosaic.c : Mosaic video plugin for vlc
- *****************************************************************************
-5
+7
- * $Id$
- *
@@ -50 +50 @@
-static int  CreateFilter    ( vlc_object_t * );
-static void DestroyFilter   ( vlc_object_t * );
-
-
-
-
-
+
+
+
+
-
-/*****************************************************************************
@@ -61 +60 @@
-struct filter_sys_t
-{
-
-
+         /* Internal filter lock */
+      /* Pointer to mosaic bridge lock */
-
-    image_handler_t *p_image;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    int i_order_length;
-
-/* l
-/* l
+       /* L
+       /* L
-    int i_offsets_length;
-
@@ -166 +161 @@
-        "values you will need to raise caching at input.")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-static int pi_pos_values[] = { 0, 1, 2 };
- 
-
+
+    
-
-static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
@@ -257 +230 @@
-                 VLC_FALSE );
-
-    set_section( N_("Bluescreen effect"), NULL );
-    add_bool( CFG_PREFIX "bs", 0, NULL, BLUESCREEN_TEXT,
-              BLUESCREEN_LONGTEXT, VLC_FALSE );
-    add_integer_with_range( CFG_PREFIX "bsu", 120, 0, 255, NULL,
-                            BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, VLC_FALSE );
-    add_integer_with_range( CFG_PREFIX "bsv", 90, 0, 255, NULL,
-                            BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, VLC_FALSE );
-    add_integer_with_range( CFG_PREFIX "bsut", 17, 0, 255, NULL,
-                            BLUESCREENUTOL_TEXT, BLUESCREENUTOL_LONGTEXT,
-                            VLC_FALSE );
-    add_integer_with_range( CFG_PREFIX "bsvt", 17, 0, 255, NULL,
-                            BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT,
-                            VLC_FALSE );
-
-    var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
-vlc_module_end();
@@ -278 +237 @@
-    "borderw", "borderh", "position", "rows", "cols",
-    "keep-aspect-ratio", "keep-picture", "order", "offsets",
-"bs", "bsu", "bsv", "bsut", "bsvt", 
+
-};
-
@@ -286 +245 @@
- * and set the corresponding struct filter_sys_t entries.
- *****************************************************************************/
-
+
+
+
+
+
-{
-psz_offsets[0] != 0
+*psz_offsets
-    {
-        char *psz_end = NULL;
@@ -296 +259 @@
-            i_index++;
-
-
+
+
-            p_sys->pi_x_offsets[i_index - 1] = atoi( psz_offsets );
-            psz_end = strchr( psz_offsets, ',' );
-            psz_offsets = psz_end + 1;
-
-
+
+
-            p_sys->pi_y_offsets[i_index - 1] = atoi( psz_offsets );
-            psz_end = strchr( psz_offsets, ',' );
-            psz_offsets = psz_end + 1;
-
-
-
-
+
+
+
+
+
-        p_sys->i_offsets_length = i_index;
-    }
@@ -338 +305 @@
-
-    p_filter->pf_sub_filter = Filter;
-    p_sys->p_pic = NULL;
-
-    vlc_mutex_init( p_filter, &p_sys->lock );
@@ -377 +343 @@
-                     p_sys );
-
-
+
+
-    if ( !p_sys->b_keep )
-    {
@@ -388 +355 @@
-    var_AddCallback( p_filter, CFG_PREFIX "order", MosaicCallback, p_sys );
-
-psz_order[0] != 0
+*psz_order
-    {
-        char *psz_end = NULL;
@@ -401 +368 @@
-                                           psz_end - psz_order );
-            psz_order = psz_end+1;
-NULL !=  
+
-        p_sys->i_order_length = i_index;
-    }
@@ -410 +377 @@
-    p_sys->pi_x_offsets = NULL;
-    p_sys->pi_y_offsets = NULL;
-(vlc_object_t *) 
+
-    var_AddCallback( p_filter, CFG_PREFIX "offsets", MosaicCallback, p_sys );
-
-    /* Bluescreen specific stuff */
-    GET_VAR( bsu, 0x00, 0xff );
-    GET_VAR( bsv, 0x00, 0xff );
-    GET_VAR( bsut, 0x00, 0xff );
-    GET_VAR( bsvt, 0x00, 0xff );
-    p_sys->b_bs = var_CreateGetBoolCommand( p_filter, CFG_PREFIX "bs" );
-    var_AddCallback( p_filter, CFG_PREFIX "bs", MosaicCallback, p_sys );
-    if( p_sys->b_bs && p_sys->b_keep )
-    {
-        msg_Warn( p_filter, CFG_PREFIX "keep-picture needs to be disabled for"
-                            " bluescreen to work" );
-    }
-
-    vlc_mutex_unlock( &p_sys->lock );
@@ -462 +416 @@
-        p_sys->i_offsets_length = 0;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    vlc_mutex_unlock( &p_sys->lock );
-    vlc_mutex_destroy( &p_sys->lock );
@@ -543 +477 @@
-    }