Skip to content

V
vlc-2-2
Commit 32c1dee5 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Validate input chroma in transform filter, make it work with Packed YUV... 

Validate input chroma in transform filter, make it work with Packed YUV (tested with YUY2 only but should work with other variants). Other misc changes.
parent 7e3fc332
Show whitespace changes
Inline Side-by-side
Showing with 289 additions and 73 deletions
modules/video_filter/adjust.c
View file @ 32c1dee5
...@@ -125,18 +125,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -125,18 +125,7 @@ static int Create( vlc_object_t *p_this )
switch( p_filter->fmt_in.video.i_chroma ) switch( p_filter->fmt_in.video.i_chroma )
{ {
case VLC_FOURCC('I','4','2','0'): CASE_PLANAR_YUV
case VLC_FOURCC('I','Y','U','V'):
case VLC_FOURCC('J','4','2','0'):
case VLC_FOURCC('Y','V','1','2'):
case VLC_FOURCC('I','4','1','1'):
case VLC_FOURCC('I','4','1','0'):
case VLC_FOURCC('Y','V','U','9'):
case VLC_FOURCC('I','4','2','2'):
case VLC_FOURCC('J','4','2','2'):
case VLC_FOURCC('I','4','4','4'):
case VLC_FOURCC('J','4','4','4'):
case VLC_FOURCC('Y','U','V','A'):
/* Planar YUV */ /* Planar YUV */
p_filter->pf_video_filter = FilterPlanar; p_filter->pf_video_filter = FilterPlanar;
break; break;
......
modules/video_filter/filter_picture.h
View file @ 32c1dee5
...@@ -21,8 +21,21 @@ ...@@ -21,8 +21,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#define CASE_PLANAR_YUV \
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_FOURCC('I','4','1','1'): \
case VLC_FOURCC('I','4','1','0'): \
case VLC_FOURCC('Y','V','U','9'): \
case VLC_FOURCC('I','4','2','2'): \
case VLC_FOURCC('J','4','2','2'): \
case VLC_FOURCC('I','4','4','4'): \
case VLC_FOURCC('J','4','4','4'): \
case VLC_FOURCC('Y','U','V','A'):
#define CASE_PACKED_YUV_422 \ #define CASE_PACKED_YUV_422 \
case VLC_FOURCC('I','U','Y','V'): \
case VLC_FOURCC('U','Y','V','Y'): \ case VLC_FOURCC('U','Y','V','Y'): \
case VLC_FOURCC('U','Y','N','V'): \ case VLC_FOURCC('U','Y','N','V'): \
case VLC_FOURCC('Y','4','2','2'): \ case VLC_FOURCC('Y','4','2','2'): \
...@@ -36,7 +49,6 @@ static inline int GetPackedYuvOffsets( vlc_fourcc_t i_chroma, ...@@ -36,7 +49,6 @@ static inline int GetPackedYuvOffsets( vlc_fourcc_t i_chroma,
{ {
switch( i_chroma ) switch( i_chroma )
{ {
case VLC_FOURCC('I','U','Y','V'): /* <-- FIXME: interlaced */
case VLC_FOURCC('U','Y','V','Y'): case VLC_FOURCC('U','Y','V','Y'):
case VLC_FOURCC('U','Y','N','V'): case VLC_FOURCC('U','Y','N','V'):
case VLC_FOURCC('Y','4','2','2'): case VLC_FOURCC('Y','4','2','2'):
......
modules/video_filter/transform.c
View file @ 32c1dee5
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <vlc_vout.h> #include <vlc_vout.h>
#include "filter_common.h" #include "filter_common.h"
#include "filter_picture.h"
#define TRANSFORM_MODE_HFLIP 1 #define TRANSFORM_MODE_HFLIP 1
#define TRANSFORM_MODE_VFLIP 2 #define TRANSFORM_MODE_VFLIP 2
...@@ -46,6 +47,9 @@ static int Init ( vout_thread_t * ); ...@@ -46,6 +47,9 @@ static int Init ( vout_thread_t * );
static void End ( vout_thread_t * ); static void End ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * ); static void Render ( vout_thread_t *, picture_t * );
static void FilterPlanar( vout_thread_t *, const picture_t *, picture_t * );
static void FilterYUYV( vout_thread_t *, const picture_t *, picture_t * );
static int SendEvents( vlc_object_t *, char const *, static int SendEvents( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
...@@ -92,6 +96,8 @@ struct vout_sys_t ...@@ -92,6 +96,8 @@ struct vout_sys_t
int i_mode; int i_mode;
vlc_bool_t b_rotation; vlc_bool_t b_rotation;
vout_thread_t *p_vout; vout_thread_t *p_vout;
void (*pf_filter)( vout_thread_t *, const picture_t *, picture_t * );
}; };
/***************************************************************************** /*****************************************************************************
...@@ -133,6 +139,23 @@ static int Create( vlc_object_t *p_this ) ...@@ -133,6 +139,23 @@ static int Create( vlc_object_t *p_this )
/* Look what method was requested */ /* Look what method was requested */
psz_method = var_CreateGetNonEmptyString( p_vout, "transform-type" ); psz_method = var_CreateGetNonEmptyString( p_vout, "transform-type" );
switch( p_vout->fmt_in.i_chroma )
{
CASE_PLANAR_YUV
case VLC_FOURCC('G','R','E','Y'):
p_vout->p_sys->pf_filter = FilterPlanar;
break;
CASE_PACKED_YUV_422
p_vout->p_sys->pf_filter = FilterYUYV;
break;
default:
msg_Err( p_vout, "Unsupported chroma" );
free( p_vout->p_sys );
return VLC_EGENERIC;
}
if( psz_method == NULL ) if( psz_method == NULL )
{ {
msg_Err( p_vout, "configuration variable %s empty", "transform-type" ); msg_Err( p_vout, "configuration variable %s empty", "transform-type" );
...@@ -284,7 +307,6 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -284,7 +307,6 @@ static void Destroy( vlc_object_t *p_this )
static void Render( vout_thread_t *p_vout, picture_t *p_pic ) static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{ {
picture_t *p_outpic; picture_t *p_outpic;
int i_index;
/* This is a new frame. Get a structure from the video_output. */ /* This is a new frame. Get a structure from the video_output. */
while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) ) while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
...@@ -300,6 +322,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -300,6 +322,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
p_vout->p_sys->pf_filter( p_vout, p_pic, p_outpic );
vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
}
/*****************************************************************************
* 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_vout )
{
vout_thread_t *p_vout = (vout_thread_t *)_p_vout;
vlc_value_t sentval = newval;
/* Translate the mouse coordinates */
if( !strcmp( psz_var, "mouse-x" ) )
{
switch( p_vout->p_sys->i_mode )
{
case TRANSFORM_MODE_270:
sentval.i_int = p_vout->p_sys->p_vout->output.i_width
- sentval.i_int;
case TRANSFORM_MODE_90:
var_Set( p_vout, "mouse-y", sentval );
return VLC_SUCCESS;
case TRANSFORM_MODE_180:
case TRANSFORM_MODE_HFLIP:
sentval.i_int = p_vout->p_sys->p_vout->output.i_width
- sentval.i_int;
break;
case TRANSFORM_MODE_VFLIP:
default:
break;
}
}
else if( !strcmp( psz_var, "mouse-y" ) )
{
switch( p_vout->p_sys->i_mode )
{
case TRANSFORM_MODE_90:
sentval.i_int = p_vout->p_sys->p_vout->output.i_height
- sentval.i_int;
case TRANSFORM_MODE_270:
var_Set( p_vout, "mouse-x", sentval );
return VLC_SUCCESS;
case TRANSFORM_MODE_180:
case TRANSFORM_MODE_VFLIP:
sentval.i_int = p_vout->p_sys->p_vout->output.i_height
- sentval.i_int;
break;
case TRANSFORM_MODE_HFLIP:
default:
break;
}
}
var_Set( p_vout, psz_var, sentval );
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;
}
static void FilterPlanar( vout_thread_t *p_vout,
const picture_t *p_pic, picture_t *p_outpic )
{
int i_index;
switch( p_vout->p_sys->i_mode ) switch( p_vout->p_sys->i_mode )
{ {
case TRANSFORM_MODE_90: case TRANSFORM_MODE_90:
...@@ -439,79 +543,190 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -439,79 +543,190 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
default: default:
break; break;
} }
vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
} }
/***************************************************************************** static void FilterYUYV( vout_thread_t *p_vout,
* SendEvents: forward mouse and keyboard events to the parent p_vout const picture_t *p_pic, picture_t *p_outpic )
*****************************************************************************/
static int SendEvents( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
{ {
vout_thread_t *p_vout = (vout_thread_t *)_p_vout; int i_index;
vlc_value_t sentval = newval; int i_y_offset, i_u_offset, i_v_offset;
if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset,
&i_u_offset, &i_v_offset ) != VLC_SUCCESS )
return;
/* Translate the mouse coordinates */
if( !strcmp( psz_var, "mouse-x" ) )
{
switch( p_vout->p_sys->i_mode ) switch( p_vout->p_sys->i_mode )
{ {
case TRANSFORM_MODE_270:
sentval.i_int = p_vout->p_sys->p_vout->output.i_width
- sentval.i_int;
case TRANSFORM_MODE_90: case TRANSFORM_MODE_90:
var_Set( p_vout, "mouse-y", sentval ); for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
return VLC_SUCCESS; {
int i_pitch = p_pic->p[i_index].i_pitch;
case TRANSFORM_MODE_180: uint8_t *p_in = p_pic->p[i_index].p_pixels;
case TRANSFORM_MODE_HFLIP:
sentval.i_int = p_vout->p_sys->p_vout->output.i_width
- sentval.i_int;
break;
case TRANSFORM_MODE_VFLIP: uint8_t *p_out = p_outpic->p[i_index].p_pixels;
default: uint8_t *p_out_end = p_out +
break; p_outpic->p[i_index].i_visible_lines *
p_outpic->p[i_index].i_pitch;
int i_offset = i_u_offset;
int i_offset2 = i_v_offset;
for( ; p_out < p_out_end ; )
{
uint8_t *p_line_end;
p_out_end -= p_outpic->p[i_index].i_pitch
- p_outpic->p[i_index].i_visible_pitch;
p_line_end = p_in + p_pic->p[i_index].i_visible_lines *
i_pitch;
for( ; p_in < p_line_end ; )
{
p_line_end -= i_pitch;
p_out_end -= 4;
p_out_end[i_y_offset+2] = p_line_end[i_y_offset];
p_out_end[i_u_offset] = p_line_end[i_offset];
p_line_end -= i_pitch;
p_out_end[i_y_offset] = p_line_end[i_y_offset];
p_out_end[i_v_offset] = p_line_end[i_offset2];
}
p_in += 2;
{
int a = i_offset;
i_offset = i_offset2;
i_offset2 = a;
} }
} }
else if( !strcmp( psz_var, "mouse-y" ) ) }
break;
case TRANSFORM_MODE_180:
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{ {
switch( p_vout->p_sys->i_mode ) uint8_t *p_in = p_pic->p[i_index].p_pixels;
uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
* p_pic->p[i_index].i_pitch;
uint8_t *p_out = p_outpic->p[i_index].p_pixels;
for( ; p_in < p_in_end ; )
{ {
case TRANSFORM_MODE_90: uint8_t *p_line_start = p_in_end
sentval.i_int = p_vout->p_sys->p_vout->output.i_height - p_pic->p[i_index].i_pitch;
- sentval.i_int; p_in_end -= p_pic->p[i_index].i_pitch
- p_pic->p[i_index].i_visible_pitch;
for( ; p_line_start < p_in_end ; )
{
p_in_end -= 4;
p_out[i_y_offset] = p_in_end[i_y_offset+2];
p_out[i_u_offset] = p_in_end[i_u_offset];
p_out[i_y_offset+2] = p_in_end[i_y_offset];
p_out[i_v_offset] = p_in_end[i_v_offset];
p_out += 4;
}
p_out += p_outpic->p[i_index].i_pitch
- p_outpic->p[i_index].i_visible_pitch;
}
}
break;
case TRANSFORM_MODE_270: case TRANSFORM_MODE_270:
var_Set( p_vout, "mouse-x", sentval ); for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
return VLC_SUCCESS; {
int i_pitch = p_pic->p[i_index].i_pitch;
case TRANSFORM_MODE_180: uint8_t *p_in = p_pic->p[i_index].p_pixels;
case TRANSFORM_MODE_VFLIP:
sentval.i_int = p_vout->p_sys->p_vout->output.i_height uint8_t *p_out = p_outpic->p[i_index].p_pixels;
- sentval.i_int; uint8_t *p_out_end = p_out +
p_outpic->p[i_index].i_visible_lines *
p_outpic->p[i_index].i_pitch;
int i_offset = i_u_offset;
int i_offset2 = i_v_offset;
for( ; p_out < p_out_end ; )
{
uint8_t *p_in_end;
p_in_end = p_in
+ p_pic->p[i_index].i_visible_lines * i_pitch;
for( ; p_in < p_in_end ; )
{
p_in_end -= i_pitch;
p_out[i_y_offset] = p_in_end[i_y_offset];
p_out[i_u_offset] = p_in_end[i_offset];
p_in_end -= i_pitch;
p_out[i_y_offset+2] = p_in_end[i_y_offset];
p_out[i_v_offset] = p_in_end[i_offset2];
p_out += 4;
}
p_out += p_outpic->p[i_index].i_pitch
- p_outpic->p[i_index].i_visible_pitch;
p_in += 2;
{
int a = i_offset;
i_offset = i_offset2;
i_offset2 = a;
}
}
}
break; break;
case TRANSFORM_MODE_HFLIP: case TRANSFORM_MODE_HFLIP:
default: for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
break; {
uint8_t *p_in = p_pic->p[i_index].p_pixels;
uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
* p_pic->p[i_index].i_pitch;
uint8_t *p_out = p_outpic->p[i_index].p_pixels;
for( ; p_in < p_in_end ; )
{
p_in_end -= p_pic->p[i_index].i_pitch;
p_vout->p_libvlc->pf_memcpy( p_out, p_in_end,
p_pic->p[i_index].i_visible_pitch );
p_out += p_pic->p[i_index].i_pitch;
} }
} }
break;
var_Set( p_vout, psz_var, sentval ); case TRANSFORM_MODE_VFLIP:
for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
{
uint8_t *p_in = p_pic->p[i_index].p_pixels;
uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
* p_pic->p[i_index].i_pitch;
return VLC_SUCCESS; uint8_t *p_out = p_outpic->p[i_index].p_pixels;
}
/***************************************************************************** for( ; p_in < p_in_end ; )
* SendEventsToChild: forward events to the child/children vout {
*****************************************************************************/ uint8_t *p_line_end = p_in
static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, + p_pic->p[i_index].i_visible_pitch;
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ for( ; p_in < p_line_end ; )
vout_thread_t *p_vout = (vout_thread_t *)p_this; {
var_Set( p_vout->p_sys->p_vout, psz_var, newval ); p_line_end -= 4;
return VLC_SUCCESS; p_out[i_y_offset] = p_line_end[i_y_offset+2];
p_out[i_u_offset] = p_line_end[i_u_offset];
p_out[i_y_offset+2] = p_line_end[i_y_offset];
p_out[i_v_offset] = p_line_end[i_v_offset];
p_out += 4;
}
p_in += p_pic->p[i_index].i_pitch;
}
}
break;
default:
break;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment