"better looking pictures." )
#define NAME_TEXT N_("FFmpeg post processing filter chains")
-/* defined by libpostproc */
-#define NAME_LONGTEXT pp_help
+#define NAME_LONGTEXT NAME_TEXT
#define FILTER_PREFIX "postproc-"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( N_("Video post processing filter") );
- add_shortcut( "postprocess" ); /* name is "postproc" */
- add_shortcut( "pp" );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+ set_description( N_("Video post processing filter") )
+ set_shortname( N_("Postproc" ) )
+ add_shortcut( "postprocess" ) /* name is "postproc" */
+ add_shortcut( "pp" )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
- set_capability( "video filter2", 0 );
+ set_capability( "video filter2", 0 )
- set_callbacks( OpenPostproc, ClosePostproc );
+ set_callbacks( OpenPostproc, ClosePostproc )
add_integer_with_range( FILTER_PREFIX "q", PP_QUALITY_MAX, 0,
- PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false );
- add_deprecated_alias( "ffmpeg-pp-q" );
+ PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false )
+ add_deprecated_alias( "ffmpeg-pp-q" )
+ change_safe()
add_string( FILTER_PREFIX "name", "default", NULL, NAME_TEXT,
- NAME_LONGTEXT, true );
- add_deprecated_alias( "ffmpeg-pp-name" );
-vlc_module_end();
+ NAME_LONGTEXT, true )
+ add_deprecated_alias( "ffmpeg-pp-name" )
+vlc_module_end ()
static const char *const ppsz_filter_options[] = {
"q", "name", NULL
pp_context_t *pp_context; /* Never changes after init */
pp_mode_t *pp_mode; /* Set to NULL if post processing is disabled */
+ bool b_had_matrix; /* Set to true if previous pic had a quant matrix (used to prevent spamming warning messages */
+
vlc_mutex_t lock; /* Lock when using or changing pp_mode */
};
switch( p_filter->fmt_in.video.i_chroma )
{
- case VLC_FOURCC('I','4','4','4'):
- case VLC_FOURCC('J','4','4','4'):
+ case VLC_CODEC_I444:
+ case VLC_CODEC_J444:
+ /* case VLC_CODEC_YUVA: FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
i_flags |= PP_FORMAT_444;
break;
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('J','4','2','2'):
+ case VLC_CODEC_I422:
+ case VLC_CODEC_J422:
i_flags |= PP_FORMAT_422;
break;
- case VLC_FOURCC('I','4','1','1'):
+ case VLC_CODEC_I411:
i_flags |= PP_FORMAT_411;
break;
- 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('Y','U','V','A'): FIXME Should work but alpha plane needs to be copied manually and I'm kind of feeling too lazy to write the code to do that ATM (i_pitch vs i_visible_pitch...). */
+ case VLC_CODEC_I420:
+ case VLC_CODEC_J420:
+ case VLC_CODEC_YV12:
i_flags |= PP_FORMAT_420;
break;
default:
vlc_mutex_init( &p_sys->lock );
p_filter->pf_video_filter = PostprocPict;
+ p_sys->b_had_matrix = true;
return VLC_SUCCESS;
}
i_dst_stride[i_plane] = p_outpic->p[i_plane].i_pitch;
}
+ if( !p_pic->p_q && p_sys->b_had_matrix )
+ {
+ msg_Warn( p_filter, "Quantification table was not set by video decoder. Postprocessing won't look good." );
+ p_sys->b_had_matrix = false;
+ }
+ else if( p_pic->p_q )
+ {
+ p_sys->b_had_matrix = true;
+ }
+
pp_postprocess( src, i_src_stride, dst, i_dst_stride,
p_filter->fmt_in.video.i_width,
p_filter->fmt_in.video.i_height,
- NULL /* FIXME ? works by selecting a default table. But maybe setting our own might help improve post processing quality ... */,
- 0 /* FIXME */,
+ p_pic->p_q, p_pic->i_qstride,
p_sys->pp_mode, p_sys->pp_context,
- PP_PICT_TYPE_QP2 /* FIXME ? This should be set only for mpeg2 type codecs if I understand correctly. */ );
+ p_pic->i_qtype == QTYPE_MPEG2 ? PP_PICT_TYPE_QP2 : 0 );
vlc_mutex_unlock( &p_sys->lock );
return CopyInfoAndRelease( p_outpic, p_pic );