/*****************************************************************************
* postprocess.c: video postprocessing using the ffmpeg library
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: postprocess.c,v 1.2 2003/10/28 14:17:51 gbazin Exp $
+ * Copyright (C) 1999-2001 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#include "ffmpeg.h"
-#ifdef LIBAVCODEC_PP
-
#ifdef HAVE_POSTPROC_POSTPROCESS_H
# include <postproc/postprocess.h>
#else
# include <libpostproc/postprocess.h>
#endif
+#ifndef PP_CPU_CAPS_ALTIVEC
+# define PP_CPU_CAPS_ALTIVEC 0
+#endif
+
/*****************************************************************************
* video_postproc_sys_t : ffmpeg video postprocessing descriptor
*****************************************************************************/
pp_context_t *pp_context;
pp_mode_t *pp_mode;
+ vlc_bool_t *pb_pp;
+
int i_width;
int i_height;
} video_postproc_sys_t;
+static int PPQCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data );
+
/*****************************************************************************
* OpenPostproc: probe and open the postproc
*****************************************************************************/
-int E_(OpenPostproc)( decoder_t *p_dec, void **pp_data )
+void *E_(OpenPostproc)( decoder_t *p_dec, vlc_bool_t *pb_pp )
{
- video_postproc_sys_t **pp_sys = (video_postproc_sys_t **)pp_data;
- pp_mode_t *pp_mode;
- vlc_value_t val;
-
- /* ***** Load post processing if enabled ***** */
- var_Create( p_dec, "ffmpeg-pp-q", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-pp-q", &val );
- if( val.i_int > 0 )
- {
- int i_quality = val.i_int;
- char *psz_name = config_GetPsz( p_dec, "ffmpeg-pp-name" );
+ video_postproc_sys_t *p_sys;
+ vlc_value_t val, val_orig, text;
- if( !psz_name )
- {
- psz_name = strdup( "default" );
- }
- else if( *psz_name == '\0' )
- {
- free( psz_name );
- psz_name = strdup( "default" );
- }
+ p_sys = malloc( sizeof(video_postproc_sys_t) );
+ p_sys->pp_context = NULL;
+ p_sys->pp_mode = NULL;
- pp_mode = pp_get_mode_by_name_and_quality( psz_name, i_quality );
+ *pb_pp = VLC_FALSE;
+ p_sys->pb_pp = pb_pp;
- if( !pp_mode )
- {
- msg_Err( p_dec, "failed geting mode for postproc" );
- }
- else
- {
- msg_Info( p_dec, "postprocessing activated" );
- }
- free( psz_name );
+ /* Create object variable if not already done */
+ if( var_Type( p_dec, "ffmpeg-pp-q" ) == 0 )
+ {
+ var_Create( p_dec, "ffmpeg-pp-q",
+ VLC_VAR_INTEGER | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
+ text.psz_string = _("Post processing");
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_SETTEXT, &text, NULL );
- *pp_sys = malloc( sizeof(video_postproc_sys_t) );
- (*pp_sys)->pp_context = NULL;
- (*pp_sys)->pp_mode = pp_mode;
+ var_Get( p_dec, "ffmpeg-pp-q", &val_orig );
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_DELCHOICE, &val_orig, NULL );
- return VLC_SUCCESS;
- }
- else
- {
- msg_Dbg( p_dec, "no postprocessing enabled" );
- return VLC_EGENERIC;
+ val.i_int = 0; text.psz_string = _("Disable");
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, &text );
+ val.i_int = 1; text.psz_string = _("1 (Lowest)");
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, &text );
+ val.i_int = 2;
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, NULL );
+ val.i_int = 3;
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, NULL );
+ val.i_int = 4;
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, NULL );
+ val.i_int = 5;
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, NULL );
+ val.i_int = 6; text.psz_string = _("6 (Highest)");
+ var_Change( p_dec, "ffmpeg-pp-q", VLC_VAR_ADDCHOICE, &val, &text );
+ var_AddCallback( p_dec, "ffmpeg-pp-q", PPQCallback, p_sys );
}
+
+ /* ***** Load post processing if enabled ***** */
+ var_Get( p_dec, "ffmpeg-pp-q", &val );
+ var_Set( p_dec, "ffmpeg-pp-q", val_orig );
+ if( val_orig.i_int )
+ *pb_pp = VLC_TRUE;
+
+ return p_sys;
}
/*****************************************************************************
- * InitPostproc:
+ * InitPostproc:
*****************************************************************************/
int E_(InitPostproc)( decoder_t *p_dec, void *p_data,
int i_width, int i_height, int pix_fmt )
{
video_postproc_sys_t *p_sys = (video_postproc_sys_t *)p_data;
- int32_t i_cpu = p_dec->p_libvlc->i_cpu;
+ unsigned i_cpu = vlc_CPU();
int i_flags = 0;
+ /* Set CPU capabilities */
if( i_cpu & CPU_CAPABILITY_MMX )
{
i_flags |= PP_CPU_CAPS_MMX;
{
i_flags |= PP_CPU_CAPS_3DNOW;
}
+ if( i_cpu & CPU_CAPABILITY_ALTIVEC )
+ {
+ i_flags |= PP_CPU_CAPS_ALTIVEC;
+ }
switch( pix_fmt )
{
}
/*****************************************************************************
- * PostprocPict:
+ * PostprocPict:
*****************************************************************************/
int E_(PostprocPict)( decoder_t *p_dec, void *p_data,
picture_t *p_pic, AVFrame *p_ff_pic )
}
/*****************************************************************************
- * ClosePostproc:
+ * ClosePostproc:
*****************************************************************************/
void E_(ClosePostproc)( decoder_t *p_dec, void *p_data )
{
pp_free_mode( p_sys->pp_mode );
if( p_sys->pp_context ) pp_free_context( p_sys->pp_context );
}
+
+ var_DelCallback( p_dec, "ffmpeg-pp-q", PPQCallback, p_sys );
+
+ if( p_sys ) free( p_sys );
}
-#endif /* LIBAVCODEC_PP */
+/*****************************************************************************
+ * object variables callbacks: a bunch of object variables are used by the
+ * interfaces to interact with the decoder.
+ *****************************************************************************/
+static int PPQCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ video_postproc_sys_t *p_sys = (video_postproc_sys_t *)p_data;
+
+ if( newval.i_int > 0 )
+ {
+ int i_quality = newval.i_int;
+ char *psz_name = config_GetPsz( p_dec, "ffmpeg-pp-name" );
+ pp_mode_t *pp_mode;
+
+ if( !psz_name )
+ {
+ psz_name = strdup( "default" );
+ }
+ else if( *psz_name == '\0' )
+ {
+ free( psz_name );
+ psz_name = strdup( "default" );
+ }
+
+ pp_mode = pp_get_mode_by_name_and_quality( psz_name, i_quality );
+
+ if( !pp_mode )
+ {
+ msg_Err( p_dec, "failed getting mode for postproc" );
+ newval.i_int = 0;
+ }
+ else
+ {
+ msg_Dbg( p_dec, "postprocessing enabled" );
+ }
+ free( psz_name );
+
+ p_sys->pp_mode = pp_mode;
+ }
+ else
+ {
+ msg_Dbg( p_dec, "postprocessing disabled" );
+ }
+
+ *p_sys->pb_pp = newval.i_int;
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff