* $Id$
*
* Authors: Sigmund Augdal <dnumgis@videolan.org>
+ * Antoine Cellerier <dionoea at videolan dot 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
# include "config.h"
#endif
-#include <errno.h>
#include <math.h>
#include <vlc_common.h>
static void Destroy ( vlc_object_t * );
static picture_t *Filter( filter_t *, picture_t * );
+static picture_t *FilterPacked( filter_t *, picture_t * );
/*****************************************************************************
* Module descriptor
vlc_module_end ()
static const char *const ppsz_filter_options[] = {
- "color", "saturationthes", "similaritythres", NULL
+ "color", "saturationthres", "similaritythres", NULL
};
/*****************************************************************************
switch( p_filter->fmt_in.video.i_chroma )
{
CASE_PLANAR_YUV
+ p_filter->pf_video_filter = Filter;
+ break;
+
+ CASE_PACKED_YUV_422
+ p_filter->pf_video_filter = FilterPacked;
break;
default:
var_AddCallback( p_filter, CFG_PREFIX "similaritythres", FilterCallback, NULL );
var_AddCallback( p_filter, CFG_PREFIX "saturationthres", FilterCallback, NULL );
- p_filter->pf_video_filter = Filter;
-
return VLC_SUCCESS;
}
free( p_filter->p_sys );
}
+static void GetReference( int *refu, int *refv, int *reflength,
+ uint32_t i_color )
+{
+ int i_red = ( i_color & 0xFF0000 ) >> 16;
+ int i_green = ( i_color & 0x00FF00 ) >> 8;
+ int i_blue = ( i_color & 0x0000FF );
+ int i_u = (int8_t)(( -38 * i_red - 74 * i_green + 112 * i_blue + 128) >> 8) + 128;
+ int i_v = (int8_t)(( 112 * i_red - 94 * i_green - 18 * i_blue + 128) >> 8) + 128;
+ *refu = i_u - 0x80;
+ *refv = i_v - 0x80;
+ *reflength = sqrt(*refu * *refu + *refv * *refv);
+}
+
+static bool IsSimilar( int u, int v,
+ int refu, int refv, int reflength,
+ int i_satthres, int i_simthres )
+{
+ int length = sqrt(u * u + v * v);
+
+ int diffu = refu * length - u * reflength;
+ int diffv = refv * length - v * reflength;
+ int64_t difflen2 = diffu * diffu + diffv * diffv;
+ int64_t thres = length * reflength;
+ thres *= thres;
+ return length > i_satthres && (difflen2 * i_simthres < thres);
+}
/*****************************************************************************
* Render: displays previously rendered output
*****************************************************************************
{
picture_t *p_outpic;
filter_sys_t *p_sys = p_filter->p_sys;
- uint8_t *p_in_y, *p_in_u, *p_in_v, *p_in_end_u;
- uint8_t *p_out_y, *p_out_u, *p_out_v;
vlc_mutex_lock( &p_sys->lock );
int i_simthres = p_sys->i_simthres;
return NULL;
}
- p_in_u = p_pic->p[U_PLANE].p_pixels;
- p_in_v = p_pic->p[V_PLANE].p_pixels;
- p_in_y = p_pic->p[Y_PLANE].p_pixels;
- p_in_end_u = p_in_u + p_pic->p[U_PLANE].i_visible_lines
- * p_pic->p[U_PLANE].i_pitch - 8;
+ /* Copy the Y plane */
+ plane_CopyPixels( &p_outpic->p[Y_PLANE], &p_pic->p[Y_PLANE] );
+
+ /*
+ * Do the U and V planes
+ */
+ int refu, refv, reflength;
+ GetReference( &refu, &refv, &reflength, i_color );
+
+ for( int y = 0; y < p_pic->p[U_PLANE].i_visible_lines; y++ )
+ {
+ uint8_t *p_src_u = &p_pic->p[U_PLANE].p_pixels[y * p_pic->p[U_PLANE].i_pitch];
+ uint8_t *p_src_v = &p_pic->p[V_PLANE].p_pixels[y * p_pic->p[V_PLANE].i_pitch];
+ uint8_t *p_dst_u = &p_outpic->p[U_PLANE].p_pixels[y * p_outpic->p[U_PLANE].i_pitch];
+ uint8_t *p_dst_v = &p_outpic->p[V_PLANE].p_pixels[y * p_outpic->p[V_PLANE].i_pitch];
+
+ for( int x = 0; x < p_pic->p[U_PLANE].i_visible_pitch; x++ )
+ {
+ if( IsSimilar( *p_src_u - 0x80, *p_src_v - 0x80,
+ refu, refv, reflength,
+ i_satthres, i_simthres ) )
+
+ {
+ *p_dst_u++ = *p_src_u;
+ *p_dst_v++ = *p_src_v;
+ }
+ else
+ {
+ *p_dst_u++ = 0x80;
+ *p_dst_v++ = 0x80;
+ }
+ p_src_u++;
+ p_src_v++;
+ }
+ }
+
+ return CopyInfoAndRelease( p_outpic, p_pic );
+}
+
+static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
+{
+ picture_t *p_outpic;
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ vlc_mutex_lock( &p_sys->lock );
+ int i_simthres = p_sys->i_simthres;
+ int i_satthres = p_sys->i_satthres;
+ int i_color = p_sys->i_color;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ if( !p_pic ) return NULL;
- p_out_y = p_outpic->p[Y_PLANE].p_pixels;
- p_out_u = p_outpic->p[U_PLANE].p_pixels;
- p_out_v = p_outpic->p[V_PLANE].p_pixels;
+ p_outpic = filter_NewPicture( p_filter );
+ if( !p_outpic )
+ {
+ picture_Release( p_pic );
+ return NULL;
+ }
- /* Create grayscale version of input */
- vlc_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines
- * p_pic->p[Y_PLANE].i_pitch - 8 );
- vlc_memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines
- * p_pic->p[U_PLANE].i_pitch - 8 );
- vlc_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines
- * p_pic->p[U_PLANE].i_pitch - 8 );
+ int i_y_offset, i_u_offset, i_v_offset;
+ int i_ret = GetPackedYuvOffsets( p_filter->fmt_in.video.i_chroma,
+ &i_y_offset, &i_u_offset, &i_v_offset );
+ if( i_ret == VLC_EGENERIC )
+ {
+ picture_Release( p_pic );
+ return NULL;
+ }
/*
- * Do the U and V planes
+ * Copy Y and do the U and V planes
*/
- int i_red = ( i_color & 0xFF0000 ) >> 16;
- int i_green = ( i_color & 0xFF00 ) >> 8;
- int i_blue = i_color & 0xFF;
- int i_u = (int8_t)(( -38 * i_red - 74 * i_green +
- 112 * i_blue + 128) >> 8) + 128;
- int i_v = (int8_t)(( 112 * i_red - 94 * i_green -
- 18 * i_blue + 128) >> 8) + 128;
- int refu = i_u - 0x80; /*bright red*/
- int refv = i_v - 0x80;
- int reflength = sqrt(refu*refu+refv*refv);
-
- while( p_in_u < p_in_end_u ) {
- /* Length of color vector */
- int inu = (*p_in_u) - 0x80;
- int inv = (*p_in_v) - 0x80;
- int length = sqrt(inu*inu+inv*inv);
-
- int diffu = refu * length - inu *reflength;
- int diffv = refv * length - inv *reflength;
- long long int difflen2=diffu*diffu;
- difflen2 +=diffv*diffv;
- long long int thres = length*reflength;
- thres *= thres;
- if( length > i_satthres && (difflen2*i_simthres< thres ) ) {
- *p_out_u = *p_in_u;
- *p_out_v = *p_in_v;
-// fprintf(stderr,"keeping color %d %d\n", length, difflen2);
+ int refu, refv, reflength;
+ GetReference( &refu, &refv, &reflength, i_color );
+
+ for( int y = 0; y < p_pic->p->i_visible_lines; y++ )
+ {
+ uint8_t *p_src = &p_pic->p->p_pixels[y * p_pic->p->i_pitch];
+ uint8_t *p_dst = &p_outpic->p->p_pixels[y * p_outpic->p->i_pitch];
+
+ for( int x = 0; x < p_pic->p->i_visible_pitch / 4; x++ )
+ {
+ p_dst[i_y_offset + 0] = p_src[i_y_offset + 0];
+ p_dst[i_y_offset + 2] = p_src[i_y_offset + 2];
+
+ if( IsSimilar( p_src[i_u_offset] - 0x80, p_src[i_v_offset] - 0x80,
+ refu, refv, reflength,
+ i_satthres, i_simthres ) )
+ {
+ p_dst[i_u_offset] = p_src[i_u_offset];
+ p_dst[i_v_offset] = p_src[i_v_offset];
+ }
+ else
+ {
+ p_dst[i_u_offset] = 0x80;
+ p_dst[i_v_offset] = 0x80;
+ }
+
+ p_dst += 4;
+ p_src += 4;
}
- p_in_u++;
- p_in_v++;
- p_out_u++;
- p_out_v++;
}
return CopyInfoAndRelease( p_outpic, p_pic );
projects / vlc / blobdiff