Changeset ae42e9e71b81130e97ec3875cae5166907e9a062

Timestamp:

07/03/05 20:28:52 (4 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1110223732 +0000

git-parent:

[60dca0985408e07119c7a55a011fb2d024fbb8d6]

git-author:

Christophe Massiot <massiot@videolan.org> 1110223732 +0000

Message:

* src/video_output/vout_subpictures.c: New function spu_MakeRegion which

reuses a given picture_t without allocating a new one.

* modules/video_output/picture.c: New --picture-height and width options

to do the scaling in the vout thread. Misc bug corrections.

* modules/video_filter/mosaic.c: Less overhead.
* modules/codec/ffmpeg/video_filter.c: Do the scaling before the conversion

in case the original size is bigger than the destination.

Files:

• include/vlc_filter.h (modified) (1 diff)
• include/vlc_spu.h (modified) (1 diff)
• include/vlc_video.h (modified) (1 diff)
• modules/codec/ffmpeg/video_filter.c (modified) (3 diffs)
• modules/video_filter/mosaic.c (modified) (19 diffs)
• modules/video_output/picture.c (modified) (10 diffs)
• modules/video_output/picture.h (modified) (1 diff)
• src/video_output/vout_subpictures.c (modified) (3 diffs)

include/vlc_filter.h

@@ -1 +1 @@
-/*****************************************************************************
-codec.h: codec
+filter.h: filter
- *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN

include/vlc_spu.h

@@ -100 +100 @@
-#define spu_CreateRegion(a,b) __spu_CreateRegion(VLC_OBJECT(a),b)
-VLC_EXPORT( subpicture_region_t *,__spu_CreateRegion, ( vlc_object_t *, video_format_t * ) );
+#define spu_MakeRegion(a,b,c) __spu_MakeRegion(VLC_OBJECT(a),b,c)
+VLC_EXPORT( subpicture_region_t *,__spu_MakeRegion, ( vlc_object_t *, video_format_t *, picture_t * ) );
-#define spu_DestroyRegion(a,b) __spu_DestroyRegion(VLC_OBJECT(a),b)
-VLC_EXPORT( void, __spu_DestroyRegion, ( vlc_object_t *, subpicture_region_t * ) );

include/vlc_video.h

@@ -274 +274 @@
-    subpicture_region_t * ( *pf_create_region ) ( vlc_object_t *,
-                                                  video_format_t * );
+    subpicture_region_t * ( *pf_make_region ) ( vlc_object_t *,
+                                                video_format_t *, picture_t * );
-    void ( *pf_destroy_region ) ( vlc_object_t *, subpicture_region_t * );
-

modules/codec/ffmpeg/video_filter.c

@@ -114 +114 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    msg_Dbg( p_filter, "input: %ix%i %4.4s -> %ix%i %4.4s",
@@ -192 +207 @@
-    filter_sys_t *p_sys = p_filter->p_sys;
-    AVPicture src_pic, dest_pic, inter_pic;
+    AVPicture *p_src, *p_dst;
-    picture_t *p_pic_dst;
-    vlc_bool_t b_resize = p_sys->b_resize;
@@ -239 +255 @@
-            p_sys->i_src_ffmpeg_chroma = PIX_FMT_BGR24;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if( p_sys->b_convert )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

modules/video_filter/mosaic.c

@@ -1 +1 @@
-/*****************************************************************************
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-*****************************************************************************/
-
-/*****************************************************************************
-
-
+ 
+ 
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
@@ -33 +34 @@
-
-#include "vlc_filter.h"
-#include "vlc_input.h"
-
-#include "vlc_image.h"
-
-
-
-
-
+
+
+
+
+
-static int  CreateFilter    ( vlc_object_t * );
-static void DestroyFilter   ( vlc_object_t * );
@@ -47 +47 @@
-
-static int MosaicCallback( vlc_object_t *, char const *, vlc_value_t,
-
-
-
-
-
-
-
-
+
+
+
+
+
-struct filter_sys_t
-{
-
-    image_handler_t *p_image;
+#ifdef IMAGE_2PASSES
-    image_handler_t *p_image2;
+#endif
-    picture_t *p_pic;
-
-
-
+
+
+
-    int i_width, i_height; /* mosaic height and width */
-    int i_cols, i_rows; /* mosaic rows and cols */
@@ -73 +72 @@
-    int i_order_length;
-
+    mtime_t i_delay;
-};
-
-/*****************************************************************************
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define AR_TEXT N_("Keep aspect ratio when resizing")
+#define KEEP_TEXT N_("Keep original size")
-
-#define ORDER_TEXT N_("Order as a comma separated list of picture-id(s)")
+
+#define DELAY_TEXT N_("Delay")
+#define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \
+        "will be delayed accordingly (in milliseconds, >= 100 ms). For high " \
+        "values you will need to raise file-caching and others.")
-
-static int pi_pos_values[] = { 0, 1 };
@@ -103 +110 @@
-
-vlc_module_begin();
-
+N
-    set_shortname( N_("Mosaic") );
-    set_capability( "sub filter", 0 );
@@ -121 +128 @@
-    add_integer( "mosaic-cols", 2, NULL, COLS_TEXT, COLS_TEXT, VLC_FALSE );
-    add_bool( "mosaic-keep-aspect-ratio", 0, NULL, AR_TEXT, AR_TEXT, VLC_FALSE );
+    add_bool( "mosaic-keep-picture", 0, NULL, KEEP_TEXT, KEEP_TEXT, VLC_FALSE );
-    add_string( "mosaic-order", "", NULL, ORDER_TEXT, ORDER_TEXT, VLC_FALSE );
+
+    add_integer( "mosaic-delay", 100, NULL, DELAY_TEXT, DELAY_LONGTEXT,
+                 VLC_FALSE );
-vlc_module_end();
-
-
-/*****************************************************************************
-
-
-
+
+
-static int CreateFilter( vlc_object_t *p_this )
-{
-    filter_t *p_filter = (filter_t *)p_this;
-    filter_sys_t *p_sys;
+    libvlc_t *p_libvlc = p_filter->p_libvlc;
-    char *psz_order;
-    int i_index;
@@ -143 +154 @@
-        return VLC_ENOMEM;
-    }
-    p_sys->p_image = image_HandlerCreate( p_filter );
-    p_sys->p_image2 = image_HandlerCreate( p_filter );
-
-    p_filter->pf_sub_filter = Filter;
-    p_sys->p_pic = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    p_sys->i_order_length = 0;
-    p_sys->ppsz_order = NULL;
-->p_libvlc
+
-
-    if( psz_order[0] != 0 )
-    {
-* psz_end=
+ *psz_end = 
-        i_index = 0;
-        do
@@ -190 +216 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    return VLC_SUCCESS;
@@ -217 +222 @@
-
-/*****************************************************************************
-
-
-
+
+
-static void DestroyFilter( vlc_object_t *p_this )
-{
-    filter_t *p_filter = (filter_t*)p_this;
-    filter_sys_t *p_sys = p_filter->p_sys;
+    libvlc_t *p_libvlc = p_filter->p_libvlc;
-    int i_index;
-
-
-
+
+
+
+
+
+
+
-
-    if( p_sys->i_order_length )
@@ -238 +248 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    if( p_sys->p_pic ) p_sys->p_pic->pf_release( p_sys->p_pic );
-    free( p_sys );
@@ -254 +265 @@
-
-/*****************************************************************************
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
-{
-
-    filter_sys_t *p_sys = p_filter->p_sys;
+    libvlc_t *p_libvlc = p_filter->p_libvlc;
+
-    subpicture_t *p_spu;
-
-    libvlc_t *p_libvlc = p_filter->p_libvlc;
-    vlc_value_t val;
-    int i_index, i_real_index, i_row, i_col;
-    int i_greatest_real_index_used = p_sys->i_order_length - 1;
@@ -271 +290 @@
-    subpicture_region_t *p_region_prev = NULL;
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    if( var_Get( p_libvlc, "p_picture_vout", &val ) )
-    {
+        vlc_mutex_unlock( lockval.p_address );
-        return NULL;
-    }
@@ -294 +324 @@
-    p_spu->i_alpha = p_sys->i_alpha;
-
-
-
-
+
-    {
-        int i_numpics = p_sys->i_order_length; /* keep slots and all */
- 
- 
- 
+
+
+
-        {
-            if( p_picture_vout->p_pic[i_index].i_status
-
+
+
-                i_numpics ++;
-                if( p_sys->i_order_length
-
-
-
+
+
+
+
-                    int i;
-                    for( i = 0; i < p_sys->i_order_length ; i++ )
-                    {
- 
-
+
+ 
-                        {
- 
+
-                            break;
-                        }
@@ -325 +355 @@
-        }
-        p_sys->i_rows = ((int)ceil(sqrt( (float)i_numpics )));
-%
-/
-/
+ % 
+ / 
+ / 
-    }
-
-    i_real_index = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( p_sys->i_order_length == 0 )
-
+
+
+
-        else
-        {
-            int i;
-
+ 
-            {
-                if( i == p_sys->i_order_length ) break;
-
-
+
-                {
-                    i_real_index = i;
@@ -368 +397 @@
-                i_real_index = ++i_greatest_real_index_used;
-        }
- 
+
-        i_col = i_real_index % p_sys->i_cols ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( !p_region )
-        {
-            msg_Err( p_filter, "cannot allocate SPU region" );
-            p_filter->pf_sub_buffer_del( p_filter, p_spu );
-&p_picture_vout->lock
+lockval.p_address
-            return NULL;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            /* center the video in the dedicated rectangle */
-            p_region->i_x = p_sys->i_xoffset
-    
-    
-fmt_in.i_width *
-( ( p_sys->i_width
-/ p_sys->i_cols ) / fmt_in.i_width
+
+
+( ( p_sys->i_width
+                    
+              / p_sys->i_cols )
-            p_region->i_y = p_sys->i_yoffset
-                        + i_row * ( p_sys->i_height / p_sys->i_rows )
-                        + ( i_row * p_sys->i_hborder ) / p_sys->i_rows
-
-
-
-
+
+
+
+
+
+
-            /* we don't have to center the video since it takes the
-            whole rectangle area */
@@ -468 +521 @@
-        }
-
-
+
+
-            p_spu->p_region = p_region;
-
+
+
+
-            p_region_prev->p_next = p_region;
-        }
-
-        p_region_prev = p_region;
-
-
-
-
-
-
-
-
+
+
+
-
-    return p_spu;
@@ -490 +541 @@
-* Callback to update params on the fly
-*****************************************************************************/
-
-static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
-                            vlc_value_t oldval, vlc_value_t newval,
@@ -547 +597 @@
-        {
-            msg_Dbg( p_this, "Changing position method from %d (%s) to %d (%s)",
-, ppsz_pos_descriptions[p_sys->i_pos
+ition, ppsz_pos_descriptions[p_sys->i_position
-                             newval.i_int, ppsz_pos_descriptions[newval.i_int]);
-
+ition
-        }
-    }
@@ -569 +619 @@
-        {
-            msg_Dbg( p_this, "Keep aspect ratio" );
-i
+b
-        }
-        else
-        {
-            msg_Dbg( p_this, "Don't keep aspect ratio" );
-i
+b
-        }
-    }

modules/video_output/picture.c

@@ -6 +6 @@
- *
- * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Christophe Massiot <massiot@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -30 +31 @@
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-
-
-
-
-
-
-
-
-
-
+
+