/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_codec.h>
#include <vlc_vout.h>
#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 );
-static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
/*****************************************************************************
* filter_sys_t : filter descriptor
int i_dst_ffmpeg_chroma;
AVPicture tmp_pic;
+
ImgReSampleContext *p_rsc;
};
-
/*****************************************************************************
* OpenFilterEx: common code to OpenFilter and OpenCropPadd
*****************************************************************************/
}
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;
+ ( 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;
+ ( 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;
+ ( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma );
if( !b_resize && !b_convert )
{
if( CheckInit( p_filter ) != VLC_SUCCESS )
{
+ if( p_sys->p_rsc ) img_resample_close( p_sys->p_rsc );
+ avpicture_free( &p_sys->tmp_pic );
free( p_sys );
return VLC_EGENERIC;
}
filter_sys_t *p_sys = p_filter->p_sys;
if( p_sys->p_rsc ) img_resample_close( p_sys->p_rsc );
-
avpicture_free( &p_sys->tmp_pic );
free( p_sys );
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;
+ 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 );
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;
+ ( 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->p_rsc = NULL;
p_sys->b_convert =
- p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma;
+ ( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma );
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;
+ ( 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 );
p_sys->b_resize_first =
- p_filter->fmt_in.video.i_width * p_filter->fmt_in.video.i_height >
- 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_out.video.i_width * p_filter->fmt_out.video.i_height );
if( p_sys->b_resize &&
- p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUV420P &&
- p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUVJ420P &&
- p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUV420P &&
- p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUVJ420P )
+ ( p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUV420P ) &&
+ ( p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUVJ420P ) &&
+ ( p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUV420P ) &&
+ ( p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUVJ420P ) )
{
msg_Err( p_filter, "img_resample_init only deals with I420" );
return VLC_EGENERIC;
}
- else if( p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUV420P &&
- p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUVJ420P )
+ else if( ( p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUV420P ) &&
+ ( p_sys->i_src_ffmpeg_chroma != PIX_FMT_YUVJ420P ) )
{
p_sys->b_resize_first = VLC_FALSE;
}
- else if( p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUV420P &&
- p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUVJ420P )
+ else if( ( p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUV420P ) &&
+ ( p_sys->i_dst_ffmpeg_chroma != PIX_FMT_YUVJ420P ) )
{
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;
+ ( 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 )
{
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
+ 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
+ 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
+ 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
+ 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;
}
i_paddtop,i_paddbottom,
i_paddleft,i_paddright );
+ if( !p_sys->p_rsc )
+ {
+ msg_Err( p_filter, "img_resample_init failed" );
+ return VLC_EGENERIC;
+ }
+
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 )
- {
- msg_Err( p_filter, "img_resample_init failed" );
- return VLC_EGENERIC;
- }
}
avpicture_free( &p_sys->tmp_pic );
p_pic->pf_release( p_pic );
return p_pic_dst;
}
-
-/*****************************************************************************
- * OpenDeinterlace: probe the filter and return score
- *****************************************************************************/
-int E_(OpenDeinterlace)( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t*)p_this;
- filter_sys_t *p_sys;
-
- /* Check if we can handle that formats */
- if( E_(GetFfmpegChroma)( p_filter->fmt_in.video.i_chroma ) < 0 )
- {
- return VLC_EGENERIC;
- }
-
- /* 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;
- }
-
- /* Misc init */
- p_sys->i_src_ffmpeg_chroma =
- E_(GetFfmpegChroma)( p_filter->fmt_in.video.i_chroma );
- p_filter->pf_video_filter = Deinterlace;
-
- msg_Dbg( p_filter, "deinterlacing" );
-
- /* libavcodec needs to be initialized for some chroma conversions */
- E_(InitLibavcodec)(p_this);
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * CloseDeinterlace: clean up the filter
- *****************************************************************************/
-void E_(CloseDeinterlace)( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t*)p_this;
- filter_sys_t *p_sys = p_filter->p_sys;
-
- free( p_sys );
-}
-
-/*****************************************************************************
- * Do the processing here
- *****************************************************************************/
-static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
-{
- filter_sys_t *p_sys = p_filter->p_sys;
- AVPicture src_pic, dest_pic;
- picture_t *p_pic_dst;
- int i;
-
- /* Request output picture */
- p_pic_dst = p_filter->pf_vout_buffer_new( p_filter );
- if( !p_pic_dst )
- {
- msg_Warn( p_filter, "can't get output picture" );
- return NULL;
- }
-
- /* Prepare the AVPictures for the conversion */
- for( i = 0; i < p_pic->i_planes; i++ )
- {
- src_pic.data[i] = p_pic->p[i].p_pixels;
- src_pic.linesize[i] = p_pic->p[i].i_pitch;
- }
- for( i = 0; i < p_pic_dst->i_planes; i++ )
- {
- dest_pic.data[i] = p_pic_dst->p[i].p_pixels;
- dest_pic.linesize[i] = p_pic_dst->p[i].i_pitch;
- }
-
- avpicture_deinterlace( &dest_pic, &src_pic, p_sys->i_src_ffmpeg_chroma,
- p_filter->fmt_in.video.i_width,
- p_filter->fmt_in.video.i_height );
-
- p_pic_dst->date = p_pic->date;
- p_pic_dst->b_force = p_pic->b_force;
- p_pic_dst->i_nb_fields = p_pic->i_nb_fields;
- p_pic_dst->b_progressive = VLC_TRUE;
- p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
-
- p_pic->pf_release( p_pic );
- return p_pic_dst;
-}
-
#endif /* ( (defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) */
projects / vlc / blobdiff