Changeset ae0b191df59c3f49e58d0bb3e9b3b020920f31b6

Timestamp:

14/07/06 23:32:43 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[d9474d275af974e3f3d52bb020d24fe8664edd03]

git-author:

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

Message:

Adjust is now a "video filter2"

Files:

• modules/video_filter/adjust.c (modified) (17 diffs)

modules/video_filter/adjust.c

@@ -2 +2 @@
- * adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
- *****************************************************************************
-, 2001, 2002, 2003
+-2006
- * $Id$
- *
- * Authors: Simon Latapie <garf@via.ecp.fr>
+ *          Antoine Cellerier <dionoea -at- videolan d0t org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -31 +32 @@
-
-#include <vlc/vlc.h>
-
-
-
+
+
+
+
-
-#ifndef M_PI
@@ -47 +49 @@
-static void Destroy   ( vlc_object_t * );
-
-
-
-
-
-
-
+
-
-/*****************************************************************************
@@ -73 +70 @@
-#define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
-
-
-vlc_module_begin();
-    set_description( _("Image properties filter") );
-    set_shortname( N_("Image adjust" ));
-    set_category( CAT_VIDEO );
-
-
+2
+2
-
-    add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
@@ -99 +95 @@
-vlc_module_end();
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-{
-    vout_thread_t *p_vout;
-};
-
@@ -116 +113 @@
-
-/*****************************************************************************
- * Control: control facility for the vout (forwards to child vout)
- *****************************************************************************/
-static int Control( vout_thread_t *p_vout, int i_query, va_list args )
-{
-    return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
-}
-
-/*****************************************************************************
- * Create: allocates adjust video thread output method
- *****************************************************************************
@@ -130 +119 @@
-static int Create( vlc_object_t *p_this )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Allocate structure */
-vout->p_sys = malloc( sizeof( vout
-vout
-
-vout
+filter->p_sys = malloc( sizeof( filter
+filter
+
+filter
-        return VLC_ENOMEM;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Init: initialize adjust video thread output method
- *****************************************************************************/
-static int Init( vout_thread_t *p_vout )
-{
-    int i_index;
-    picture_t *p_pic;
-    video_format_t fmt = {0};
-
-    I_OUTPUTPICTURES = 0;
-
-    /* Initialize the output structure */
-    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;
-
-    fmt.i_width = fmt.i_visible_width = p_vout->render.i_width;
-    fmt.i_height = fmt.i_visible_height = p_vout->render.i_height;
-    fmt.i_x_offset = fmt.i_y_offset = 0;
-    fmt.i_chroma = p_vout->render.i_chroma;
-    fmt.i_aspect = p_vout->render.i_aspect;
-    fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width;
-    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
-
-    /* Try to open the real video output */
-    msg_Dbg( p_vout, "spawning the real video output" );
-
-    p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
-
-    /* Everything failed */
-    if( p_vout->p_sys->p_vout == NULL )
-    {
-        msg_Err( p_vout, "can't open vout, aborting" );
-        return VLC_EGENERIC;
-    }
-
-    ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
-
-    ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
-
-    ADD_PARENT_CALLBACKS( SendEventsToChild );
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * End: terminate adjust 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 );
-    }
-}
-
@@ -226 +194 @@
-static void Destroy( vlc_object_t *p_this )
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -247 +205 @@
- * next frame.
- *****************************************************************************/
-void Render( vout_thread_t *p_vout
+picture_t *Filter( filter_t *p_filter
-{
-    int pi_luma[256];
@@ -264 +222 @@
-    vlc_value_t val;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    /* Getvariables */
-vout
+filter
-    i_cont = (int) ( val.f_float * 255 );
-vout
+filter
-    i_lum = (int) (( val.f_float - 1.0 ) * 255 );
-vout
+filter
-    f_hue = (float) ( val.i_int * M_PI / 180 );
-vout
+filter
-    i_sat = (int) (val.f_float * 256 );
-vout
+filter
-    f_gamma = 1.0 / val.f_float;
-vout
+filter
-    b_thres = (vlc_bool_t) ( val.b_bool );
-
@@ -335 +290 @@
-     */
-
-
-
-
-
+
+
+
+
+
-
-    for( ; p_in < p_in_end ; )
-    {
-0
+Y_PLANE
-
-        for( ; p_in < p_line_end ; )
@@ -360 +316 @@
-        }
-
-
-
+
+
+
+
-    }
-
@@ -368 +326 @@
-     */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    i_sin = sin(f_hue) * 256;
@@ -394 +353 @@
-        for( ; p_in < p_in_end ; )
-        {
-1
+U_PLANE
-
-            for( ; p_in < p_line_end ; )
@@ -412 +371 @@
-            }
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }
@@ -431 +394 @@
-        for( ; p_in < p_in_end ; )
-        {
-1
+U_PLANE
-
-            for( ; p_in < p_line_end ; )
@@ -447 +410 @@
-            }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-/*****************************************************************************
- * SendEvents: forward mouse and keyboard events to the parent p_vout
- *****************************************************************************/
-static int SendEvents( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    var_Set( (vlc_object_t *)p_data, psz_var, newval );
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * SendEventsToChild: forward events to the child/children vout
- *****************************************************************************/
-static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    var_Set( p_vout->p_sys->p_vout, psz_var, newval );
-    return VLC_SUCCESS;
-}