#endif
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_codec.h>
/* ffmpeg header */
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
+# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
static const char *nloopf_list_text[] =
{ N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
+#ifdef ENABLE_SOUT
static const char *enc_hq_list[] = { "rd", "bits", "simple" };
static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
+#endif
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
static const char *ppsz_mode_descriptions[] =
{ N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"),
set_callbacks( OpenDecoder, CloseDecoder );
- add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE );
+ add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true );
add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT,
- ERROR_LONGTEXT, VLC_TRUE );
+ ERROR_LONGTEXT, true );
add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT,
- VLC_FALSE );
+ false );
add_bool( "ffmpeg-hurry-up", 1, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
- VLC_FALSE );
+ false );
add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT,
- SKIP_FRAME_LONGTEXT, VLC_TRUE );
+ SKIP_FRAME_LONGTEXT, true );
change_integer_range( -1, 4 );
add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT,
- SKIP_IDCT_LONGTEXT, VLC_TRUE );
+ SKIP_IDCT_LONGTEXT, true );
change_integer_range( -1, 4 );
add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT,
- VLC_TRUE );
+ true );
add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
- VLC_TRUE );
+ true );
change_integer_range( 0, 2 );
add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
- SKIPLOOPF_LONGTEXT, VLC_TRUE );
+ SKIPLOOPF_LONGTEXT, true );
change_integer_list( nloopf_list, nloopf_list_text, 0 );
- add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
+ add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, false );
add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
- LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
+ LIBAVCODEC_PP_LONGTEXT, true );
add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
- VLC_TRUE );
+ true );
+#ifdef ENABLE_SOUT
/* encoder submodule */
add_submodule();
set_section( N_("Encoding") , NULL );
set_description( _("FFmpeg audio/video encoder") );
set_capability( "encoder", 100 );
- set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
+ set_callbacks( OpenEncoder, CloseEncoder );
add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
- ENC_HQ_LONGTEXT, VLC_FALSE );
+ ENC_HQ_LONGTEXT, false );
change_string_list( enc_hq_list, enc_hq_list_text, 0 );
add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT,
- ENC_KEYINT_LONGTEXT, VLC_FALSE );
+ ENC_KEYINT_LONGTEXT, false );
add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT,
- ENC_BFRAMES_LONGTEXT, VLC_FALSE );
+ ENC_BFRAMES_LONGTEXT, false );
add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT,
- ENC_HURRYUP_LONGTEXT, VLC_FALSE );
+ ENC_HURRYUP_LONGTEXT, false );
add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT,
- ENC_INTERLACE_LONGTEXT, VLC_TRUE );
+ ENC_INTERLACE_LONGTEXT, true );
add_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT,
- ENC_INTERLACE_ME_LONGTEXT, VLC_TRUE );
+ ENC_INTERLACE_ME_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT,
- ENC_VT_LONGTEXT, VLC_TRUE );
+ ENC_VT_LONGTEXT, true );
add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
- ENC_PRE_ME_LONGTEXT, VLC_TRUE );
+ ENC_PRE_ME_LONGTEXT, true );
add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
- ENC_RC_STRICT_LONGTEXT, VLC_TRUE );
+ ENC_RC_STRICT_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
- ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE );
+ ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL,
- ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE );
+ ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
- ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE );
+ ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
- ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, VLC_TRUE );
+ ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true );
add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL,
- ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, VLC_TRUE );
+ ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "qmin", 0, NULL,
- ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, VLC_TRUE );
+ ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "qmax", 0, NULL,
- ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, VLC_TRUE );
+ ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true );
add_bool( ENC_CFG_PREFIX "trellis", 0, NULL,
- ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, VLC_TRUE );
+ ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "qscale", 0, NULL,
- ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, VLC_TRUE );
+ ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "strict", 0, NULL,
- ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, VLC_TRUE );
+ ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL,
- ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, VLC_TRUE );
+ ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL,
- ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, VLC_TRUE );
+ ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL,
- ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, VLC_TRUE );
+ ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true );
add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL,
- ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, VLC_TRUE );
+ ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL,
- ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, VLC_TRUE );
+ ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true );
add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL,
- ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE );
+ ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true );
+
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
+ /* Audio AAC encoder profile */
+ add_string( ENC_CFG_PREFIX "aac-profile", "main", NULL,
+ ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true );
+#endif
+#endif /* ENABLE_SOUT */
+
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE)
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE)
/* demux submodule */
add_submodule();
set_description( _("FFmpeg demuxer" ) );
- set_capability( "demux2", 2 );
- set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+ set_capability( "demux", 2 );
+ set_callbacks( OpenDemux, CloseDemux );
+#ifdef ENABLE_SOUT
/* mux submodule */
add_submodule();
set_description( _("FFmpeg muxer" ) );
set_capability( "sout mux", 2 );
add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
- MUX_LONGTEXT, VLC_TRUE );
- set_callbacks( E_(OpenMux), E_(CloseMux) );
+ MUX_LONGTEXT, true );
+ set_callbacks( OpenMux, CloseMux );
+#endif
#endif
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
/* video filter submodule */
add_submodule();
set_description( _("Video scaling filter") );
set_capability( "video filter2", 1000 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
- set_callbacks( E_(OpenScaler), E_(CloseScaler) );
- add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE );
+ set_callbacks( OpenScaler, CloseScaler );
+ add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true );
change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
#else
/* video filter submodule */
add_submodule();
set_capability( "video filter2", 50 );
- set_callbacks( E_(OpenFilter), E_(CloseFilter) );
+ set_callbacks( OpenFilter, CloseFilter );
set_description( _("FFmpeg video filter") );
/* crop/padd submodule */
add_submodule();
set_capability( "crop padd", 10 );
- set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
+ set_callbacks( OpenCropPadd, CloseFilter );
set_description( _("FFmpeg crop padd filter") );
#endif
/* chroma conversion submodule */
add_submodule();
set_capability( "chroma", 50 );
- set_callbacks( E_(OpenChroma), E_(CloseChroma) );
+ set_callbacks( OpenChroma, CloseChroma );
set_description( _("FFmpeg chroma conversion") );
/* video filter submodule */
add_submodule();
set_capability( "video filter2", 0 );
- set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
+ set_callbacks( OpenDeinterlace, CloseDeinterlace );
set_description( _("FFmpeg deinterlace video filter") );
add_shortcut( "ffmpeg-deinterlace" );
AVCodec *p_codec = NULL;
/* *** determine codec type *** */
- if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
+ if( !GetFfmpegCodec( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
{
return VLC_EGENERIC;
}
/* Initialization must be done before avcodec_find_decoder() */
- E_(InitLibavcodec)(p_this);
+ InitLibavcodec(p_this);
/* *** ask ffmpeg for a decoder *** */
p_codec = avcodec_find_decoder( i_codec_id );
p_context->dsp_mask |= FF_MM_SSE2;
}
- p_dec->b_need_packetized = VLC_TRUE;
+ p_dec->b_need_packetized = true;
switch( i_cat )
{
case VIDEO_ES:
- p_dec->pf_decode_video = E_(DecodeVideo);
- i_result = E_( InitVideoDec )( p_dec, p_context, p_codec,
+ p_dec->pf_decode_video = DecodeVideo;
+ i_result = InitVideoDec ( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
break;
case AUDIO_ES:
- p_dec->pf_decode_audio = E_(DecodeAudio);
- i_result = E_( InitAudioDec )( p_dec, p_context, p_codec,
+ p_dec->pf_decode_audio = DecodeAudio;
+ i_result = InitAudioDec ( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
break;
default:
switch( p_sys->i_cat )
{
case AUDIO_ES:
- E_( EndAudioDec )( p_dec );
+ EndAudioDec ( p_dec );
break;
case VIDEO_ES:
- E_( EndVideoDec )( p_dec );
+ EndVideoDec ( p_dec );
break;
}
/*****************************************************************************
*
*****************************************************************************/
-void E_(LibavcodecCallback)( void *p_opaque, int i_level,
+void LibavcodecCallback( void *p_opaque, int i_level,
const char *psz_format, va_list va )
{
int i_vlc_level;
free( psz_new_format );
}
-void E_(InitLibavcodec)( vlc_object_t *p_object )
+void InitLibavcodec( vlc_object_t *p_object )
{
static int b_ffmpeginit = 0;
vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
{
avcodec_init();
avcodec_register_all();
- av_log_set_callback( E_(LibavcodecCallback) );
+ av_log_set_callback( LibavcodecCallback );
b_ffmpeginit = 1;
msg_Dbg( p_object, "libavcodec initialized (interface %d )",
/* Packed RGB formats */
#if defined(WORDS_BIGENDIAN)
+ { VLC_FOURCC('R','G','B','8'), PIX_FMT_BGR8 },
{ VLC_FOURCC('R','V','1','5'), PIX_FMT_BGR555 },
{ VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 },
{ VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 },
#else
+#if defined(PIX_FMT_RGB8)
+ { VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8 },
+#endif
{ VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },
{ VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 },
{ VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 },
{ 0, 0 }
};
-int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
+int GetFfmpegChroma( vlc_fourcc_t i_chroma )
{
int i;
return -1;
}
-vlc_fourcc_t E_(GetVlcChroma)( int i_ffmpeg_chroma )
+vlc_fourcc_t GetVlcChroma( int i_ffmpeg_chroma )
{
int i;
VIDEO_ES, "Sony HDV (MPEG-2 Video)" },
{ VLC_FOURCC('h','d','v','3'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "FCP HDV (MPEG-2 Video)" },
+ { VLC_FOURCC('h','d','v','5'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "HDV 720p25 (MPEG-2 Video)" },
{ VLC_FOURCC('m','x','5','n'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "MPEG2 IMX NTSC 525/60 50mb/s (FCP)" },
{ VLC_FOURCC('m','x','5','p'), CODEC_ID_MPEG2VIDEO,
{ VLC_FOURCC('8','B','P','S'), CODEC_ID_8BPS,
VIDEO_ES, "8BPS" },
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(52<<8)+0)
+ { VLC_FOURCC('M','L','2','O'), CODEC_ID_MIMIC,
+ VIDEO_ES, "Mimic" },
+#endif
+
/* Videogames Codecs */
/* Interplay MVE */
/* MUSEPACK8 Audio */
{ VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8,
AUDIO_ES, "MUSEPACK8 Audio" },
+ { VLC_FOURCC('M','P','C','8'), CODEC_ID_MUSEPACK8,
+ AUDIO_ES, "MUSEPACK8 Audio" },
#endif
/* RealAudio 1.0 */
{ VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC,
AUDIO_ES, "MPEG AAC Audio" },
+ /* AC-3 Audio (Dolby Digital) */
+ { VLC_FOURCC('a','c','-','3'), CODEC_ID_AC3,
+ AUDIO_ES, "AC-3 Audio (Dolby Digital)" },
+
/* 4X Technologies */
{ VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM,
AUDIO_ES, "4X Technologies Audio" },
{ 0, 0, 0, 0 }
};
-int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
+int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
int *pi_ffmpeg_codec, const char **ppsz_name )
{
int i;
if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec;
if( ppsz_name ) *ppsz_name = (char *)codecs_table[i].psz_name;
- return VLC_TRUE;
+ return true;
}
}
- return VLC_FALSE;
+ return false;
}
-int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat,
+int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
{
int i;
if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
- return VLC_TRUE;
+ return true;
}
}
- return VLC_FALSE;
+ return false;
}
projects / vlc / blobdiff