# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
#include "vlc_filter.h"
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Video pictures blending") );
+ set_description( N_("Video pictures blending") );
set_capability( "video blending", 100 );
set_callbacks( OpenFilter, CloseFilter );
vlc_module_end();
/* Allocate the memory needed to store the decoder's structure */
if( ( p_filter->p_sys = p_sys =
(filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
- {
- msg_Err( p_filter, "out of memory" );
- return VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
/* Misc init */
p_filter->pf_video_blend = Blend;
/***********************************************************************
* Utils
***********************************************************************/
+static inline uint8_t vlc_uint8( int v )
+{
+ if( v > 255 )
+ return 255;
+ else if( v < 0 )
+ return 0;
+ return v;
+}
+
static inline void yuv_to_rgb( int *r, int *g, int *b,
uint8_t y1, uint8_t u1, uint8_t v1 )
{
# define SCALEBITS 10
# define ONE_HALF (1 << (SCALEBITS - 1))
# define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5))
-# define CLAMP( x ) (((x) > 255) ? 255 : ((x) < 0) ? 0 : (x));
int y, cb, cr, r_add, g_add, b_add;
- FIX(0.71414*255.0/224.0) * cr + ONE_HALF;
b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;
y = (y1 - 16) * FIX(255.0/219.0);
- *r = CLAMP((y + r_add) >> SCALEBITS);
- *g = CLAMP((y + g_add) >> SCALEBITS);
- *b = CLAMP((y + b_add) >> SCALEBITS);
+ *r = vlc_uint8( (y + r_add) >> SCALEBITS );
+ *g = vlc_uint8( (y + g_add) >> SCALEBITS );
+ *b = vlc_uint8( (y + b_add) >> SCALEBITS );
+#undef FIX
+#undef ONE_HALF
+#undef SCALEBITS
}
static inline void rgb_to_yuv( uint8_t *y, uint8_t *u, uint8_t *v,