/*****************************************************************************
* motion_blur.c : motion blur filter for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: motionblur.c,v 1.4 2002/11/28 17:35:00 sam Exp $
+ * Copyright (C) 2000, 2001, 2002, 2003 the VideoLAN team
+ * $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ * Antoine Cellerier <dionoea &t videolan d.t org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "filter_common.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_filter.h>
+#include "filter_picture.h"
/*****************************************************************************
* Local protypes
*****************************************************************************/
-static int Create ( vlc_object_t * );
-static void Destroy ( vlc_object_t * );
-
-static int Init ( vout_thread_t * );
-static void End ( vout_thread_t * );
-static void Render ( vout_thread_t *, picture_t * );
-
-static void RenderBlur ( vout_thread_t *, picture_t *, picture_t *, picture_t * );
-static void CopyPicture ( vout_thread_t*, picture_t *, picture_t * );
+static int Create ( vlc_object_t * );
+static void Destroy ( vlc_object_t * );
+static picture_t *Filter ( filter_t *, picture_t * );
+static void RenderBlur ( filter_sys_t *, picture_t *, picture_t * );
+static int MotionBlurCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MODE_TEXT N_("Blur factor")
-#define MODE_LONGTEXT N_("The degree of blurring from 1 to 127")
+#define FACTOR_TEXT N_("Blur factor (1-127)")
+#define FACTOR_LONGTEXT N_("The degree of blurring from 1 to 127.")
-vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_integer( "blur-factor", 80, NULL, MODE_TEXT, MODE_LONGTEXT );
- set_description( _("Motion blur filter") );
- set_capability( "video filter", 0 );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+#define FILTER_PREFIX "blur-"
-/*****************************************************************************
- * vout_sys_t: Deinterlace video output method descriptor
- *****************************************************************************
- * This structure is part of the video output thread descriptor.
- * It describes the Deinterlace specific properties of an output thread.
- *****************************************************************************/
-struct vout_sys_t
-{
- int i_factor; /* Deinterlace mode */
- vlc_bool_t b_double_rate; /* Shall we double the framerate? */
+vlc_module_begin ()
+ set_shortname( N_("Motion blur") )
+ set_description( N_("Motion blur filter") )
+ set_capability( "video filter2", 0 )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
+
+ add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL,
+ FACTOR_TEXT, FACTOR_LONGTEXT, false )
+
+ add_shortcut( "blur" )
- mtime_t last_date;
- mtime_t next_date;
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
- vout_thread_t *p_vout;
- picture_t *p_lastpic;
+static const char *const ppsz_filter_options[] = {
+ "factor", NULL
};
/*****************************************************************************
- * Create: allocates Deinterlace video thread output method
- *****************************************************************************
- * This function allocates and initializes a Deinterlace vout method.
+ * filter_sys_t
*****************************************************************************/
-static int Create( vlc_object_t *p_this )
-{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
- /* Allocate structure */
- p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
- return 1;
- }
-
- p_vout->pf_init = Init;
- p_vout->pf_end = End;
- p_vout->pf_manage = NULL;
- p_vout->pf_render = Render;
- p_vout->pf_display = NULL;
-
- p_vout->p_sys->i_factor = config_GetInt( p_vout, "blur-factor" );
- p_vout->p_sys->b_double_rate = 0;
- p_vout->p_sys->last_date = 0;
- p_vout->p_sys->p_lastpic = NULL;
+struct filter_sys_t
+{
+ picture_t *p_tmp;
+ bool b_first;
- return 0;
-}
+ vlc_spinlock_t lock;
+ int i_factor;
+};
/*****************************************************************************
- * Init: initialize Deinterlace video thread output method
+ * Create
*****************************************************************************/
-static int Init( vout_thread_t *p_vout )
+static int Create( vlc_object_t *p_this )
{
- int i_index;
- picture_t *p_pic;
-
- I_OUTPUTPICTURES = 0;
-
- /* Initialize the output structure, full of directbuffers since we want
- * the decoder to output directly to our structures. */
- switch( p_vout->render.i_chroma )
- {
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('Y','V','1','2'):
- case VLC_FOURCC('I','4','2','2'):
- p_vout->output.i_chroma = p_vout->render.i_chroma;
- p_vout->output.i_width = p_vout->render.i_width;
- p_vout->output.i_height = p_vout->render.i_height;
- p_vout->output.i_aspect = p_vout->render.i_aspect;
- break;
-
- default:
- return 0; /* unknown chroma */
- break;
- }
+ filter_t *p_filter = (filter_t *)p_this;
- msg_Dbg( p_vout, "spawning the real video output" );
+ /* Allocate structure */
+ p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
+ if( p_filter->p_sys == NULL )
+ return VLC_ENOMEM;
- switch( p_vout->render.i_chroma )
+ p_filter->p_sys->p_tmp = picture_NewFromFormat( &p_filter->fmt_in.video );
+ if( !p_filter->p_sys->p_tmp )
{
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('Y','V','1','2'):
- p_vout->p_sys->p_vout = vout_Create( p_vout,
- p_vout->output.i_width, p_vout->output.i_height,
- p_vout->output.i_chroma, p_vout->output.i_aspect );
- break;
- default:
- break;
+ free( p_filter->p_sys );
+ return VLC_ENOMEM;
}
+ p_filter->p_sys->b_first = true;
- /* Everything failed */
- if( p_vout->p_sys->p_vout == NULL )
- {
- msg_Err( p_vout, "cannot open vout, aborting" );
+ p_filter->pf_video_filter = Filter;
- return 0;
- }
-
- ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
+ config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
+ p_filter->p_cfg );
- return 0;
-}
+ p_filter->p_sys->i_factor =
+ var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "factor" );
+ vlc_spin_init( &p_filter->p_sys->lock );
+ var_AddCallback( p_filter, FILTER_PREFIX "factor",
+ MotionBlurCallback, p_filter->p_sys );
-/*****************************************************************************
- * End: terminate Deinterlace video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
-{
- int i_index;
- /* Free the fake output buffers we allocated */
- for( i_index = I_OUTPUTPICTURES ; i_index ; )
- {
- i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
- }
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * Destroy: destroy Deinterlace video thread output method
- *****************************************************************************
- * Terminate an output method created by DeinterlaceCreateOutputMethod
+ * Destroy
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ filter_t *p_filter = (filter_t *)p_this;
- vout_Destroy( p_vout->p_sys->p_vout );
+ var_DelCallback( p_filter, FILTER_PREFIX "factor",
+ MotionBlurCallback, p_filter->p_sys );
+ vlc_spin_destroy( &p_filter->p_sys->lock );
- free( p_vout->p_sys );
+ picture_Release( p_filter->p_sys->p_tmp );
+ free( p_filter->p_sys );
}
/*****************************************************************************
- * Render: displays previously rendered output
- *****************************************************************************
- * This function send the currently rendered image to Deinterlace image,
- * waits until it is displayed and switch the two rendering buffers, preparing
- * next frame.
+ * Filter
*****************************************************************************/
-static void Render ( vout_thread_t *p_vout, picture_t *p_pic )
+static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
picture_t * p_outpic;
- while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
- == NULL )
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ if( !p_pic ) return NULL;
+
+ p_outpic = filter_NewPicture( p_filter );
+ if( !p_outpic )
{
- if( p_vout->b_die || p_vout->b_error )
- {
- return;
- }
- msleep( VOUT_OUTMEM_SLEEP );
+ picture_Release( p_pic );
+ return NULL;
}
- vout_DatePicture( p_vout, p_outpic, p_pic->date );
-
- if ( p_vout->p_sys->p_lastpic == NULL )
+
+ if( p_sys->b_first )
{
- /* Get a new picture */
- while( ( p_vout->p_sys->p_lastpic =
- vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
- == NULL )
- {
- if( p_vout->b_die || p_vout->b_error )
- {
- return;
- }
- msleep( VOUT_OUTMEM_SLEEP );
- }
- CopyPicture( p_vout, p_vout->p_sys->p_lastpic, p_pic );
- CopyPicture( p_vout, p_outpic, p_pic );
- vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
- return;
+ picture_CopyPixels( p_sys->p_tmp, p_pic );
+ p_sys->b_first = false;
}
/* Get a new picture */
- RenderBlur( p_vout, p_vout->p_sys->p_lastpic, p_pic, p_outpic );
- vout_DestroyPicture( p_vout, p_vout->p_sys->p_lastpic );
+ RenderBlur( p_sys, p_pic, p_outpic );
+ picture_CopyPixels( p_sys->p_tmp, p_outpic );
- /* Get a new picture */
- while( ( p_vout->p_sys->p_lastpic =
- vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
- == NULL )
- {
- if( p_vout->b_die || p_vout->b_error )
- {
- return;
- }
- msleep( VOUT_OUTMEM_SLEEP );
- }
- CopyPicture( p_vout, p_vout->p_sys->p_lastpic, p_outpic );
- vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
-
+ return CopyInfoAndRelease( p_outpic, p_pic );
}
-static void CopyPicture( vout_thread_t *p_vout,
- picture_t *p_dest, picture_t *p_source)
-{
- int i_plane;
-
- for( i_plane = 0 ; i_plane < p_dest->i_planes ; i_plane++ )
- {
- u8 *p_in, *p_out;
-
- p_in = p_source->p[i_plane].p_pixels;
-
- p_out = p_dest->p[i_plane].p_pixels;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
- p_dest->p[i_plane].i_pitch *
- p_dest->p[i_plane].i_lines);
- }
-}
/*****************************************************************************
- * RenderBob: renders a bob picture
+ * RenderBlur: renders a blurred picture
*****************************************************************************/
-static void RenderBlur( vout_thread_t *p_vout, picture_t *p_oldpic,
- picture_t *p_newpic, picture_t *p_outpic )
+static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic,
+ picture_t *p_outpic )
{
int i_plane;
- int i_oldfactor = p_vout->p_sys->i_factor;
- int i_newfactor = 128 - p_vout->p_sys->i_factor;
+ vlc_spin_lock( &p_sys->lock );
+ const int i_oldfactor = p_sys->i_factor;
+ vlc_spin_unlock( &p_sys->lock );
+ int i_newfactor = 128 - i_oldfactor;
+
for( i_plane = 0; i_plane < p_outpic->i_planes; i_plane++ )
{
- u8 *p_old, *p_new, *p_out, *p_out_end;
+ uint8_t *p_old, *p_new, *p_out, *p_out_end, *p_out_line_end;
+ const int i_visible_pitch = p_outpic->p[i_plane].i_visible_pitch;
+ const int i_visible_lines = p_outpic->p[i_plane].i_visible_lines;
+
p_out = p_outpic->p[i_plane].p_pixels;
p_new = p_newpic->p[i_plane].p_pixels;
- p_old = p_oldpic->p[i_plane].p_pixels;
- p_out_end = p_out + p_outpic->p[i_plane].i_pitch *
- p_outpic->p[i_plane].i_lines;
+ p_old = p_sys->p_tmp->p[i_plane].p_pixels;
+ p_out_end = p_out + p_outpic->p[i_plane].i_pitch * i_visible_lines;
while ( p_out < p_out_end )
{
- *p_out++ = (((*p_old++) * i_oldfactor) +
- ((*p_new++) * i_newfactor)) >> 7;
-
-// *p_out++ = (*p_old++ >> 1) + (*p_new++ >> 1);
-
+ p_out_line_end = p_out + i_visible_pitch;
+
+ while ( p_out < p_out_line_end )
+ {
+ *p_out++ = (((*p_old++) * i_oldfactor) +
+ ((*p_new++) * i_newfactor)) >> 7;
+ }
+
+ p_old += p_sys->p_tmp->p[i_plane].i_pitch - i_visible_pitch;
+ p_new += p_newpic->p[i_plane].i_pitch - i_visible_pitch;
+ p_out += p_outpic->p[i_plane].i_pitch - i_visible_pitch;
}
}
}
+
+static int MotionBlurCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+
+ if( !strcmp( psz_var, FILTER_PREFIX "factor" ) )
+ {
+ vlc_spin_lock( &p_sys->lock );
+ p_sys->i_factor = __MIN( 127, __MAX( 1, newval.i_int ) );
+ vlc_spin_unlock( &p_sys->lock );
+ }
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff