#include "ffmpeg.h"
+
+#if !defined(HAVE_FFMPEG_SWSCALE_H) && !defined(HAVE_LIBSWSCALE_TREE)
void E_(InitLibavcodec) ( vlc_object_t *p_object );
static int CheckInit( filter_t *p_filter );
static picture_t *Process( filter_t *p_filter, picture_t *p_pic );
vlc_bool_t b_resize;
vlc_bool_t b_convert;
vlc_bool_t b_resize_first;
+ vlc_bool_t b_enable_croppadd;
es_format_t fmt_in;
int i_src_ffmpeg_chroma;
ImgReSampleContext *p_rsc;
};
+
/*****************************************************************************
- * OpenFilter: probe the filter and return score
+ * OpenFilterEx: common code to OpenFilter and OpenCropPadd
*****************************************************************************/
-int E_(OpenFilter)( vlc_object_t *p_this )
+static int OpenFilterEx( vlc_object_t *p_this, vlc_bool_t b_enable_croppadd )
{
filter_t *p_filter = (filter_t*)p_this;
filter_sys_t *p_sys;
b_resize =
p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width ||
p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height;
+
+ if ( b_enable_croppadd )
+ {
+ b_resize = b_resize ||
+ p_filter->fmt_in.video.i_visible_width != p_filter->fmt_in.video.i_width ||
+ p_filter->fmt_in.video.i_visible_height != p_filter->fmt_in.video.i_height ||
+ p_filter->fmt_in.video.i_x_offset != 0 ||
+ p_filter->fmt_in.video.i_y_offset != 0 ||
+ p_filter->fmt_out.video.i_visible_width != p_filter->fmt_out.video.i_width ||
+ p_filter->fmt_out.video.i_visible_height != p_filter->fmt_out.video.i_height ||
+ p_filter->fmt_out.video.i_x_offset != 0 ||
+ p_filter->fmt_out.video.i_y_offset != 0;
+ }
+
b_convert =
p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma;
/* Misc init */
p_sys->p_rsc = NULL;
+ p_sys->b_enable_croppadd = b_enable_croppadd;
p_sys->i_src_ffmpeg_chroma =
E_(GetFfmpegChroma)( p_filter->fmt_in.video.i_chroma );
p_sys->i_dst_ffmpeg_chroma =
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * OpenFilter: probe the filter and return score
+ *****************************************************************************/
+int E_(OpenFilter)( vlc_object_t *p_this )
+{
+ return OpenFilterEx( p_this, VLC_FALSE );
+}
+
+/*****************************************************************************
+ * OpenCropPadd: probe the filter and return score
+ *****************************************************************************/
+int E_(OpenCropPadd)( vlc_object_t *p_this )
+{
+ return OpenFilterEx( p_this, VLC_TRUE );
+}
+
+
/*****************************************************************************
* CloseFilter: clean up the filter
*****************************************************************************/
static int CheckInit( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
-
- if( p_filter->fmt_in.video.i_width != p_sys->fmt_in.video.i_width ||
+ vlc_bool_t b_change;
+ int i_croptop=0;
+ int i_cropbottom=0;
+ int i_cropleft=0;
+ int i_cropright=0;
+ int i_paddtop=0;
+ int i_paddbottom=0;
+ int i_paddleft=0;
+ int i_paddright=0;
+
+
+ b_change= p_filter->fmt_in.video.i_width != p_sys->fmt_in.video.i_width ||
p_filter->fmt_in.video.i_height != p_sys->fmt_in.video.i_height ||
p_filter->fmt_out.video.i_width != p_sys->fmt_out.video.i_width ||
- p_filter->fmt_out.video.i_height != p_sys->fmt_out.video.i_height )
+ p_filter->fmt_out.video.i_height != p_sys->fmt_out.video.i_height;
+
+ if ( p_sys->b_enable_croppadd )
+ {
+ b_change = b_change ||
+ p_filter->fmt_in.video.i_y_offset != p_sys->fmt_in.video.i_y_offset ||
+ p_filter->fmt_in.video.i_x_offset != p_sys->fmt_in.video.i_x_offset ||
+ p_filter->fmt_in.video.i_visible_width != p_sys->fmt_in.video.i_visible_width ||
+ p_filter->fmt_in.video.i_visible_height != p_sys->fmt_in.video.i_visible_height ||
+ p_filter->fmt_out.video.i_y_offset != p_sys->fmt_out.video.i_y_offset ||
+ p_filter->fmt_out.video.i_x_offset != p_sys->fmt_out.video.i_x_offset ||
+ p_filter->fmt_out.video.i_visible_width != p_sys->fmt_out.video.i_visible_width ||
+ p_filter->fmt_out.video.i_visible_height != p_sys->fmt_out.video.i_visible_height;
+ }
+
+ if ( b_change )
{
if( p_sys->p_rsc ) img_resample_close( p_sys->p_rsc );
p_sys->p_rsc = 0;
p_sys->b_resize_first = VLC_TRUE;
}
+ if ( p_sys->b_enable_croppadd )
+ {
+ p_sys->b_resize = p_sys->b_resize ||
+ p_filter->fmt_in.video.i_visible_width != p_filter->fmt_in.video.i_width ||
+ p_filter->fmt_in.video.i_visible_height != p_filter->fmt_in.video.i_height ||
+ p_filter->fmt_in.video.i_x_offset != 0 ||
+ p_filter->fmt_in.video.i_y_offset != 0 ||
+ p_filter->fmt_out.video.i_visible_width != p_filter->fmt_out.video.i_width ||
+ p_filter->fmt_out.video.i_visible_height != p_filter->fmt_out.video.i_height ||
+ p_filter->fmt_out.video.i_x_offset != 0 ||
+ p_filter->fmt_out.video.i_y_offset != 0;
+ }
+
if( p_sys->b_resize )
{
- p_sys->p_rsc = img_resample_init( p_filter->fmt_out.video.i_width,
+ if ( p_sys->b_enable_croppadd )
+ {
+ i_croptop=p_filter->fmt_in.video.i_y_offset;
+ i_cropbottom=p_filter->fmt_in.video.i_height
+ - p_filter->fmt_in.video.i_visible_height
+ - p_filter->fmt_in.video.i_y_offset;
+ i_cropleft=p_filter->fmt_in.video.i_x_offset;
+ i_cropright=p_filter->fmt_in.video.i_width
+ - p_filter->fmt_in.video.i_visible_width
+ - p_filter->fmt_in.video.i_x_offset;
+
+
+ i_paddtop=p_filter->fmt_out.video.i_y_offset;
+ i_paddbottom=p_filter->fmt_out.video.i_height
+ - p_filter->fmt_out.video.i_visible_height
+ - p_filter->fmt_out.video.i_y_offset;
+ i_paddleft=p_filter->fmt_out.video.i_x_offset;
+ i_paddright=p_filter->fmt_out.video.i_width
+ - p_filter->fmt_out.video.i_visible_width
+ - p_filter->fmt_out.video.i_x_offset;
+ }
+
+ p_sys->p_rsc = img_resample_full_init(
+ p_filter->fmt_out.video.i_width,
p_filter->fmt_out.video.i_height,
p_filter->fmt_in.video.i_width,
- p_filter->fmt_in.video.i_height );
+ p_filter->fmt_in.video.i_height,
+ i_croptop,i_cropbottom,
+ i_cropleft,i_cropright,
+ i_paddtop,i_paddbottom,
+ i_paddleft,i_paddright );
+
+ msg_Dbg( p_filter, "input: %ix%i -> %ix%i",
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_height,
+ p_filter->fmt_in.video.i_width,
+ p_filter->fmt_in.video.i_height);
if( !p_sys->p_rsc )
{
return VLC_SUCCESS;
}
+/* fill padd code from ffmpeg */
+static int padcolor[3] = { 16, 128, 128 };
+
+/* Expects img to be yuv420 */
+static void fill_pad_region( AVPicture* img, int height, int width,
+ int padtop, int padbottom, int padleft, int padright, int *color )
+{
+ int i, y, shift;
+ uint8_t *optr;
+
+ for ( i = 0; i < 3; i++ )
+ {
+ shift = ( i == 0 ) ? 0 : 1;
+
+ if ( padtop || padleft )
+ {
+ memset( img->data[i], color[i], ( ( ( img->linesize[i] * padtop ) +
+ padleft ) >> shift) );
+ }
+
+ if ( padleft || padright )
+ {
+ optr = img->data[i] + ( img->linesize[i] * ( padtop >> shift ) ) +
+ ( img->linesize[i] - ( padright >> shift ) );
+
+ for ( y = 0; y < ( ( height - ( padtop + padbottom ) ) >> shift ); y++ )
+ {
+ memset( optr, color[i], ( padleft + padright ) >> shift );
+ optr += img->linesize[i];
+ }
+ }
+
+ if (padbottom)
+ {
+ optr = img->data[i] + ( img->linesize[i] * ( ( height - padbottom ) >> shift ) );
+ memset( optr, color[i], ( ( img->linesize[i] * padbottom ) >> shift ) );
+ }
+ }
+}
+
+/* Workaround, because old libavcodec doesnt know how to padd */
+static void img_resample_padd( ImgReSampleContext *s, AVPicture *output,
+ const AVPicture *input, int padtop, int padleft )
+{
+ AVPicture nopadd_pic = *output;
+
+ /* shift out top and left padding for old ffmpeg */
+ nopadd_pic.data[0] += ( nopadd_pic.linesize[0] * padtop + padleft );
+ nopadd_pic.data[1] += ( nopadd_pic.linesize[1] * padtop + padleft ) >> 1;
+ nopadd_pic.data[2] += ( nopadd_pic.linesize[2] * padtop + padleft ) >> 1;
+ img_resample( s, &nopadd_pic, input );
+}
+
+
/*****************************************************************************
* Do the processing here
*****************************************************************************/
if( p_sys->b_resize_first )
{
if( p_sys->b_convert ) p_dst = &p_sys->tmp_pic;
+
img_resample( p_sys->p_rsc, p_dst, p_src );
+
+ if (p_sys->b_enable_croppadd)
+ {
+ if (p_filter->fmt_out.video.i_visible_width != p_filter->fmt_out.video.i_width ||
+ p_filter->fmt_out.video.i_visible_height != p_filter->fmt_out.video.i_height ||
+ p_filter->fmt_out.video.i_x_offset != 0 ||
+ p_filter->fmt_out.video.i_y_offset != 0)
+ {
+ fill_pad_region(p_dst, p_filter->fmt_out.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_y_offset,
+ p_filter->fmt_out.video.i_height
+ - p_filter->fmt_out.video.i_visible_height
+ - p_filter->fmt_out.video.i_y_offset,
+ p_filter->fmt_out.video.i_x_offset,
+ p_filter->fmt_out.video.i_width
+ - p_filter->fmt_out.video.i_visible_width
+ - p_filter->fmt_out.video.i_x_offset,
+ padcolor);
+ }
+ }
+
p_src = p_dst;
}
}
if( p_sys->b_resize && !p_sys->b_resize_first && p_sys->p_rsc )
{
p_dst = &dest_pic;
+
img_resample( p_sys->p_rsc, p_dst, p_src );
+
+ if (p_sys->b_enable_croppadd)
+ {
+ if (p_filter->fmt_out.video.i_visible_width != p_filter->fmt_out.video.i_width ||
+ p_filter->fmt_out.video.i_visible_height != p_filter->fmt_out.video.i_height ||
+ p_filter->fmt_out.video.i_x_offset != 0 ||
+ p_filter->fmt_out.video.i_y_offset != 0)
+ {
+ fill_pad_region(p_dst, p_filter->fmt_out.video.i_height,
+ p_filter->fmt_out.video.i_width,
+ p_filter->fmt_out.video.i_y_offset,
+ p_filter->fmt_out.video.i_height
+ - p_filter->fmt_out.video.i_visible_height
+ - p_filter->fmt_out.video.i_y_offset,
+ p_filter->fmt_out.video.i_x_offset,
+ p_filter->fmt_out.video.i_width
+ - p_filter->fmt_out.video.i_visible_width
+ - p_filter->fmt_out.video.i_x_offset,
+ padcolor);
+ }
+ }
}
/* Special case for RV32 -> YUVA */
p_pic->pf_release( p_pic );
return p_pic_dst;
}
+
+#endif /* ( (defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) */
projects / vlc / blobdiff