/*****************************************************************************
* extract.c : Extract RGB components
*****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2006 VLC authors and VideoLAN
* $Id$
*
* Authors: 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include "vlc_filter.h"
+#include <vlc_filter.h>
#include "filter_picture.h"
#include "math.h"
#define COMPONENT_LONGTEXT N_("RGB component to extract. 0 for Red, 1 for Green and 2 for Blue.")
#define FILTER_PREFIX "extract-"
-static int pi_component_values[] = { 0xFF0000, 0x00FF00, 0x0000FF };
-static const char *ppsz_component_descriptions[] = { "Red", "Green", "Blue" };
+static const int pi_component_values[] = { 0xFF0000, 0x00FF00, 0x0000FF };
+static const char *const ppsz_component_descriptions[] = {
+ "Red", "Green", "Blue" };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Extract RGB component video filter") );
- set_shortname( _("Extract" ));
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VFILTER );
- set_capability( "video filter2", 0 );
- add_shortcut( "extract" );
+vlc_module_begin ()
+ set_description( N_("Extract RGB component video filter") )
+ set_shortname( N_("Extract" ))
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
+ set_capability( "video filter2", 0 )
+ add_shortcut( "extract" )
add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF,
- NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, VLC_FALSE );
- change_integer_list( pi_component_values, ppsz_component_descriptions, 0 );
+ COMPONENT_TEXT, COMPONENT_LONGTEXT, false )
+ change_integer_list( pi_component_values, ppsz_component_descriptions )
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"component", NULL
};
enum { RED=0xFF0000, GREEN=0x00FF00, BLUE=0x0000FF };
struct filter_sys_t
{
- int i_color;
+ vlc_mutex_t lock;
int *projection_matrix;
+ uint32_t i_color;
};
/*****************************************************************************
switch( p_filter->fmt_in.video.i_chroma )
{
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('J','4','2','0'):
- case VLC_FOURCC('Y','V','1','2'):
+ case VLC_CODEC_I420:
+ case VLC_CODEC_J420:
+ case VLC_CODEC_YV12:
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('J','4','2','2'):
+ case VLC_CODEC_I422:
+ case VLC_CODEC_J422:
CASE_PACKED_YUV_422
break;
default:
/* We only want planar YUV 4:2:0 or 4:2:2 */
- msg_Err( p_filter, "Unsupported input chroma (%4s)",
+ msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC;
}
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_filter->p_sys->projection_matrix = malloc( 9 * sizeof( int ) );
if( !p_filter->p_sys->projection_matrix )
{
free( p_filter->p_sys );
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->p_sys->i_color = var_CreateGetIntegerCommand( p_filter,
FILTER_PREFIX "component" );
- var_AddCallback( p_filter, FILTER_PREFIX "component",
- ExtractCallback, p_filter->p_sys );
-
/* Matrix won't be used for RED, GREEN or BLUE in planar formats */
make_projection_matrix( p_filter, p_filter->p_sys->i_color,
p_filter->p_sys->projection_matrix );
+ vlc_mutex_init( &p_filter->p_sys->lock );
+ var_AddCallback( p_filter, FILTER_PREFIX "component",
+ ExtractCallback, p_filter->p_sys );
p_filter->pf_video_filter = Filter;
static void Destroy( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
- free( p_filter->p_sys->projection_matrix );
- free( p_filter->p_sys );
+ var_DelCallback( p_filter, FILTER_PREFIX "component", ExtractCallback,
+ p_sys );
+ vlc_mutex_destroy( &p_sys->lock );
+ free( p_sys->projection_matrix );
+ free( p_sys );
}
/*****************************************************************************
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
picture_t *p_outpic;
+ filter_sys_t *p_sys = p_filter->p_sys;
if( !p_pic ) return NULL;
- p_outpic = p_filter->pf_vout_buffer_new( p_filter );
+ p_outpic = filter_NewPicture( p_filter );
if( !p_outpic )
{
- msg_Warn( p_filter, "can't get output picture" );
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
return NULL;
}
+ vlc_mutex_lock( &p_sys->lock );
switch( p_pic->format.i_chroma )
{
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('J','4','2','0'):
- case VLC_FOURCC('Y','V','1','2'):
- switch( p_filter->p_sys->i_color )
+ case VLC_CODEC_I420:
+ case VLC_CODEC_J420:
+ case VLC_CODEC_YV12:
+ switch( p_sys->i_color )
{
case RED:
get_red_from_yuv420( p_pic, p_outpic,
default:
get_custom_from_yuv420( p_pic, p_outpic,
Y_PLANE, U_PLANE, V_PLANE,
- p_filter->p_sys->projection_matrix);
+ p_sys->projection_matrix);
break;
}
break;
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('J','4','2','2'):
+ case VLC_CODEC_I422:
+ case VLC_CODEC_J422:
switch( p_filter->p_sys->i_color )
{
case RED:
default:
get_custom_from_yuv422( p_pic, p_outpic,
Y_PLANE, U_PLANE, V_PLANE,
- p_filter->p_sys->projection_matrix);
+ p_sys->projection_matrix);
break;
}
break;
CASE_PACKED_YUV_422
get_custom_from_packedyuv422( p_pic, p_outpic,
- p_filter->p_sys->projection_matrix );
+ p_sys->projection_matrix );
break;
default:
- msg_Warn( p_filter, "Unsupported input chroma (%4s)",
+ vlc_mutex_unlock( &p_sys->lock );
+ msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_pic->format.i_chroma) );
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
return NULL;
}
+ vlc_mutex_unlock( &p_sys->lock );
- p_outpic->date = p_pic->date;
- p_outpic->b_force = p_pic->b_force;
- p_outpic->i_nb_fields = p_pic->i_nb_fields;
- p_outpic->b_progressive = p_pic->b_progressive;
- p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
-
- return p_outpic;
-}
-
-static inline uint8_t crop( int a )
-{
- if( a < 0 ) return 0;
- if( a > 255 ) return 255;
- else return (uint8_t)a;
+ return CopyInfoAndRelease( p_outpic, p_pic );
}
#define U 128
double green = ((double)(( 0x00FF00 & color )>>8))/255.;
double blue = ((double)( 0x0000FF & color ))/255.;
double norm = sqrt( red*red + green*green + blue*blue );
- red /= norm;
- green /= norm;
- blue /= norm;
+ if( norm > 0 )
+ {
+ red /= norm;
+ green /= norm;
+ blue /= norm;
+ }
/* XXX: We might still need to norm the rgb_matrix */
double rgb_matrix[9] =
{ red*red, red*green, red*blue,
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
- y2in = y1in + i_pitch;
- y2out = y1out + i_pitch;
+ y2in = y1in + i_in_pitch;
+ y2out = y1out + i_out_pitch;
while( y1in < y1end )
{
- *uout++ = crop( (*y1in * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
+ *uout++ = vlc_uint8( (*y1in * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
/ 65536 + U );
- *vout++ = crop( (*y1in * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
+ *vout++ = vlc_uint8( (*y1in * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *y1out++ = vlc_uint8( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
- *y1out++ = crop( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *y1out++ = vlc_uint8( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
- *y2out++ = crop( (*y2in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *y2out++ = vlc_uint8( (*y2in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
- *y2out++ = crop( (*y2in++ * m[0] + (*uin++ - U) * m[1] + (*vin++ -V) * m[2])
+ *y2out++ = vlc_uint8( (*y2in++ * m[0] + (*uin++ - U) * m[1] + (*vin++ -V) * m[2])
/ 65536 );
}
- y1in += 2*i_pitch - i_visible_pitch;
- y1out += 2*i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += 2*i_in_pitch - i_visible_pitch;
+ y1out += 2*i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
static void get_custom_from_yuv422( picture_t *p_inpic, picture_t *p_outpic,
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
while( y1in < y1end )
{
- *uout++ = crop( (*y1in * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
+ *uout++ = vlc_uint8( (*y1in * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
/ 65536 + U );
- *vout++ = crop( (*y1in * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
+ *vout++ = vlc_uint8( (*y1in * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *y1out++ = vlc_uint8( (*y1in++ * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
- *y1out++ = crop( (*y1in++ * m[0] + (*uin++ -U) * m[1] + (*vin++ -V) * m[2])
+ *y1out++ = vlc_uint8( (*y1in++ * m[0] + (*uin++ -U) * m[1] + (*vin++ -V) * m[2])
/ 65536 );
}
- y1in += i_pitch - i_visible_pitch;
- y1out += i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += i_in_pitch - i_visible_pitch;
+ y1out += i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p->p_pixels + i_u_offset;
uint8_t *vout = p_outpic->p->p_pixels + i_v_offset;
- const int i_pitch = p_inpic->p->i_pitch;
+ const int i_in_pitch = p_inpic->p->i_pitch;
+ const int i_out_pitch = p_outpic->p->i_pitch;
const int i_visible_pitch = p_inpic->p->i_visible_pitch;
const int i_visible_lines = p_inpic->p->i_visible_lines;
- const uint8_t *yend = yin + i_visible_lines * i_pitch;
+ const uint8_t *yend = yin + i_visible_lines * i_in_pitch;
while( yin < yend )
{
const uint8_t *ylend = yin + i_visible_pitch;
while( yin < ylend )
{
- *uout = crop( (*yin * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
+ *uout = vlc_uint8( (*yin * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5])
/ 65536 + U );
uout += 4;
- *vout = crop( (*yin * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
+ *vout = vlc_uint8( (*yin * m[6] + (*uin-U) * m[7] + (*vin-V) * m[8])
/ 65536 + V );
vout += 4;
- *yout = crop( (*yin * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *yout = vlc_uint8( (*yin * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
yin += 2;
yout += 2;
- *yout = crop( (*yin * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
+ *yout = vlc_uint8( (*yin * m[0] + (*uin-U) * m[1] + (*vin-V) * m[2])
/ 65536 );
yin += 2;
yout += 2;
uin += 4;
vin += 4;
}
- yin += i_pitch - i_visible_pitch;
- yout += i_pitch - i_visible_pitch;
- uin += i_pitch - i_visible_pitch;
- uout += i_pitch - i_visible_pitch;
- vin += i_pitch - i_visible_pitch;
- vout += i_pitch - i_visible_pitch;
+ yin += i_in_pitch - i_visible_pitch;
+ yout += i_out_pitch - i_visible_pitch;
+ uin += i_in_pitch - i_visible_pitch;
+ uout += i_out_pitch - i_visible_pitch;
+ vin += i_in_pitch - i_visible_pitch;
+ vout += i_out_pitch - i_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
- y2in = y1in + i_pitch;
- y2out = y1out + i_pitch;
+ y2in = y1in + i_in_pitch;
+ y2out = y1out + i_out_pitch;
while( y1in < y1end )
{
/*
-11058 0 -15504
32768 0 45941
*/
- *uout++ = crop( (*y1in * -11058 + (*vin - V) * -15504)
+ *uout++ = vlc_uint8( (*y1in * -11058 + (*vin - V) * -15504)
/ 65536 + U );
- *vout++ = crop( (*y1in * 32768 + (*vin - V) * 45941)
+ *vout++ = vlc_uint8( (*y1in * 32768 + (*vin - V) * 45941)
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 19595 + (*vin - V) * 27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 19595 + (*vin - V) * 27473)
/ 65536 );
- *y1out++ = crop( (*y1in++ * 19595 + (*vin - V) * 27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 19595 + (*vin - V) * 27473)
/ 65536 );
- *y2out++ = crop( (*y2in++ * 19594 + (*vin - V) * 27473)
+ *y2out++ = vlc_uint8( (*y2in++ * 19594 + (*vin - V) * 27473)
/ 65536 );
- *y2out++ = crop( (*y2in++ * 19594 + (*vin++ - V) * 27473)
+ *y2out++ = vlc_uint8( (*y2in++ * 19594 + (*vin++ - V) * 27473)
/ 65536 );
}
- y1in += 2*i_pitch - i_visible_pitch;
- y1out += 2*i_pitch - i_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += 2*i_in_pitch - i_visible_pitch;
+ y1out += 2*i_out_pitch - i_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
- y2in = y1in + i_pitch;
- y2out = y1out + i_pitch;
+ y2in = y1in + i_in_pitch;
+ y2out = y1out + i_out_pitch;
while( y1in < y1end )
{
/*
-21710 7471 15504
-27439 9443 19595
*/
- *uout++ = crop( (*y1in * -21710 + (*uin-U) * 7471 + (*vin-V) * 15504)
+ *uout++ = vlc_uint8( (*y1in * -21710 + (*uin-U) * 7471 + (*vin-V) * 15504)
/ 65536 + U );
- *vout++ = crop( (*y1in * -27439 + (*uin-U) * 9443 + (*vin-V) * 19595)
+ *vout++ = vlc_uint8( (*y1in * -27439 + (*uin-U) * 9443 + (*vin-V) * 19595)
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
/ 65536 );
- *y1out++ = crop( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
/ 65536 );
- *y2out++ = crop( (*y2in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
+ *y2out++ = vlc_uint8( (*y2in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
/ 65536 );
- *y2out++ = crop( (*y2in++ * 38470 + (*uin++ - U) * -13239 + (*vin++ -V) * -27473)
+ *y2out++ = vlc_uint8( (*y2in++ * 38470 + (*uin++ - U) * -13239 + (*vin++ -V) * -27473)
/ 65536 );
}
- y1in += 2*i_pitch - i_visible_pitch;
- y1out += 2*i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += 2*i_in_pitch - i_visible_pitch;
+ y1out += 2*i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
- y2in = y1in + i_pitch;
- y2out = y1out + i_pitch;
+ y2in = y1in + i_in_pitch;
+ y2out = y1out + i_out_pitch;
while( y1in < y1end )
{
/*
32768 58065 0
-5329 -9443 0
*/
- *uout++ = crop( (*y1in* 32768 + (*uin - U) * 58065 )
+ *uout++ = vlc_uint8( (*y1in* 32768 + (*uin - U) * 58065 )
/ 65536 + U );
- *vout++ = crop( (*y1in * -5329 + (*uin - U) * -9443 )
+ *vout++ = vlc_uint8( (*y1in * -5329 + (*uin - U) * -9443 )
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 7471 + (*uin - U) * 13239 )
+ *y1out++ = vlc_uint8( (*y1in++ * 7471 + (*uin - U) * 13239 )
/ 65536 );
- *y1out++ = crop( (*y1in++ * 7471 + (*uin - U) * 13239 )
+ *y1out++ = vlc_uint8( (*y1in++ * 7471 + (*uin - U) * 13239 )
/ 65536 );
- *y2out++ = crop( (*y2in++ * 7471 + (*uin - U) * 13239 )
+ *y2out++ = vlc_uint8( (*y2in++ * 7471 + (*uin - U) * 13239 )
/ 65536 );
- *y2out++ = crop( (*y2in++ * 7471 + (*uin++ - U) * 13239 )
+ *y2out++ = vlc_uint8( (*y2in++ * 7471 + (*uin++ - U) * 13239 )
/ 65536 );
}
- y1in += 2*i_pitch - i_visible_pitch;
- y1out += 2*i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += 2*i_in_pitch - i_visible_pitch;
+ y1out += 2*i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vout += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_inpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
-11058 0 -15504
32768 0 45941
*/
- *uout++ = crop( (*y1in * -11058 + (*vin - V) * -15504)
+ *uout++ = vlc_uint8( (*y1in * -11058 + (*vin - V) * -15504)
/ 65536 + U );
- *vout++ = crop( (*y1in * 32768 + (*vin - V) * 45941)
+ *vout++ = vlc_uint8( (*y1in * 32768 + (*vin - V) * 45941)
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 19595 + (*vin - V) * 27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 19595 + (*vin - V) * 27473)
/ 65536 );
- *y1out++ = crop( (*y1in++ * 19595 + (*vin++ - V) * 27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 19595 + (*vin++ - V) * 27473)
/ 65536 );
}
- y1in += i_pitch - i_visible_pitch;
- y1out += i_pitch - i_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += i_in_pitch - i_visible_pitch;
+ y1out += i_out_pitch - i_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
-21710 7471 15504
-27439 9443 19595
*/
- *uout++ = crop( (*y1in * -21710 + (*uin-U) * 7471 + (*vin-V) * 15504)
+ *uout++ = vlc_uint8( (*y1in * -21710 + (*uin-U) * 7471 + (*vin-V) * 15504)
/ 65536 + U );
- *vout++ = crop( (*y1in * -27439 + (*uin-U) * 9443 + (*vin-V) * 19595)
+ *vout++ = vlc_uint8( (*y1in * -27439 + (*uin-U) * 9443 + (*vin-V) * 19595)
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 38470 + (*uin-U) * -13239 + (*vin-V) * -27473)
/ 65536 );
- *y1out++ = crop( (*y1in++ * 38470 + (*uin++-U) * -13239 + (*vin++-V) * -27473)
+ *y1out++ = vlc_uint8( (*y1in++ * 38470 + (*uin++-U) * -13239 + (*vin++-V) * -27473)
/ 65536 );
}
- y1in += i_pitch - i_visible_pitch;
- y1out += i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vin += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += i_in_pitch - i_visible_pitch;
+ y1out += i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
uint8_t *uout = p_outpic->p[up].p_pixels;
uint8_t *vout = p_outpic->p[vp].p_pixels;
- const int i_pitch = p_inpic->p[yp].i_pitch;
+ const int i_in_pitch = p_inpic->p[yp].i_pitch;
+ const int i_out_pitch = p_outpic->p[yp].i_pitch;
+
const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch;
const int i_visible_lines = p_inpic->p[yp].i_visible_lines;
-
- const int i_uv_pitch = p_inpic->p[up].i_pitch;
const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch;
- const uint8_t *yend = y1in + i_visible_lines * i_pitch;
+ const uint8_t *yend = y1in + i_visible_lines * i_in_pitch;
while( y1in < yend )
{
const uint8_t *y1end = y1in + i_visible_pitch;
32768 58065 0
-5329 -9443 0
*/
- *uout++ = crop( (*y1in* 32768 + (*uin - U) * 58065 )
+ *uout++ = vlc_uint8( (*y1in* 32768 + (*uin - U) * 58065 )
/ 65536 + U );
- *vout++ = crop( (*y1in * -5329 + (*uin - U) * -9443 )
+ *vout++ = vlc_uint8( (*y1in * -5329 + (*uin - U) * -9443 )
/ 65536 + V );
- *y1out++ = crop( (*y1in++ * 7471 + (*uin - U) * 13239 )
+ *y1out++ = vlc_uint8( (*y1in++ * 7471 + (*uin - U) * 13239 )
/ 65536 );
- *y1out++ = crop( (*y1in++ * 7471 + (*uin++ - U) * 13239 )
+ *y1out++ = vlc_uint8( (*y1in++ * 7471 + (*uin++ - U) * 13239 )
/ 65536 );
}
- y1in += i_pitch - i_visible_pitch;
- y1out += i_pitch - i_visible_pitch;
- uin += i_uv_pitch - i_uv_visible_pitch;
- uout += i_uv_pitch - i_uv_visible_pitch;
- vout += i_uv_pitch - i_uv_visible_pitch;
+ y1in += i_in_pitch - i_visible_pitch;
+ y1out += i_out_pitch - i_visible_pitch;
+ uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch;
+ uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch;
+ vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch;
}
}
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
+ VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ vlc_mutex_lock( &p_sys->lock );
if( !strcmp( psz_var, FILTER_PREFIX "component" ) )
{
p_sys->i_color = newval.i_int;
{
msg_Warn( p_this, "Unknown callback command." );
}
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}
projects / vlc / blobdiff