/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_codec.h>
/* ffmpeg header */
#define HAVE_MMX 1
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
struct decoder_sys_t
{
/* Common part between video and audio decoder */
- int i_cat;
- int i_codec_id;
- char *psz_namecodec;
-
- AVCodecContext *p_context;
- AVCodec *p_codec;
+ FFMPEG_COMMON_MEMBERS
};
/****************************************************************************
static const char *enc_hq_list[] = { "rd", "bits", "simple" };
static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
+#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)"),
N_("Experimental"), N_("Nearest neighbour (bad quality)"),
N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
+#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define MODULE_DESCRIPTION N_( "Various audio and video decoders/encoders" \
+ "delivered by the FFmpeg library. This includes (MS)MPEG4, DivX, SV1,"\
+ "H261, H263, H264, WMV, WMA, AAC, AMR, DV, MJPEG and other codecs")
+
vlc_module_begin();
set_shortname( "FFmpeg");
set_category( CAT_INPUT );
/*add_requirement( ALTIVEC );*/
set_capability( "decoder", 71 );
#else
- set_description( _("FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+ set_description( _("FFmpeg audio/video decoders/encoders") );
+ set_help( MODULE_DESCRIPTION );
set_capability( "decoder", 70 );
#endif
set_section( N_("Decoding") , NULL );
set_callbacks( OpenDecoder, CloseDecoder );
+
add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE );
add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT,
ERROR_LONGTEXT, VLC_TRUE );
add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT,
VLC_FALSE );
- add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
+ add_bool( "ffmpeg-hurry-up", 1, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
VLC_FALSE );
+ add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT,
+ SKIP_FRAME_LONGTEXT, VLC_TRUE );
+ change_integer_range( -1, 4 );
+ add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT,
+ SKIP_IDCT_LONGTEXT, VLC_TRUE );
+ change_integer_range( -1, 4 );
add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT,
VLC_TRUE );
add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL,
ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE );
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE)
/* demux submodule */
add_submodule();
set_description( _("FFmpeg demuxer" ) );
add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
MUX_LONGTEXT, VLC_TRUE );
set_callbacks( E_(OpenMux), E_(CloseMux) );
+#endif
-#if defined(HAVE_FFMPEG_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_callbacks( E_(OpenScaler), E_(CloseScaler) );
add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE );
change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
-#else
- /* chroma conversion submodule */
- add_submodule();
- set_capability( "chroma", 50 );
- set_callbacks( E_(OpenChroma), E_(CloseChroma) );
- set_description( _("FFmpeg chroma conversion") );
+#else
/* video filter submodule */
add_submodule();
set_capability( "video filter2", 50 );
set_capability( "crop padd", 10 );
set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
set_description( _("FFmpeg crop padd filter") );
+#endif
+
+ /* chroma conversion submodule */
+ add_submodule();
+ set_capability( "chroma", 50 );
+ set_callbacks( E_(OpenChroma), E_(CloseChroma) );
+ set_description( _("FFmpeg chroma conversion") );
/* video filter submodule */
add_submodule();
set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
set_description( _("FFmpeg deinterlace video filter") );
add_shortcut( "ffmpeg-deinterlace" );
-#endif
-
- var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
p_context->opaque = (void *)p_this;
/* Set CPU capabilities */
+ unsigned i_cpu = vlc_CPU();
p_context->dsp_mask = 0;
- if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
p_context->dsp_mask |= FF_MM_MMX;
}
- if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
p_context->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
p_context->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
p_context->dsp_mask |= FF_MM_SSE;
}
- if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) )
+ if( !(i_cpu & CPU_CAPABILITY_SSE2) )
{
p_context->dsp_mask |= FF_MM_SSE2;
}
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_value_t lockval;
-
- var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
switch( p_sys->i_cat )
{
if( p_sys->p_context )
{
+ vlc_mutex_t *lock;
+
if( p_sys->p_context->extradata )
free( p_sys->p_context->extradata );
p_sys->p_context->extradata = NULL;
- vlc_mutex_lock( lockval.p_address );
+
+ lock = var_AcquireMutex( "avcodec" );
avcodec_close( p_sys->p_context );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
av_free( p_sys->p_context );
}
void E_(InitLibavcodec)( vlc_object_t *p_object )
{
static int b_ffmpeginit = 0;
- vlc_value_t lockval;
-
- var_Get( p_object->p_libvlc_global, "avcodec", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
/* *** init ffmpeg library (libavcodec) *** */
if( !b_ffmpeginit )
msg_Dbg( p_object, "libavcodec already initialized" );
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
}
/*****************************************************************************
{ VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 },
/* 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 },
+#endif
{ VLC_FOURCC('R','V','3','2'), PIX_FMT_RGBA32 },
+#if defined(PIX_FMT_RGBA)
+ { VLC_FOURCC('R','G','B','A'), PIX_FMT_RGBA },
+#endif
{ VLC_FOURCC('G','R','E','Y'), PIX_FMT_GRAY8 },
{ 0, 0 }
/* ATI VCR2 */
{ VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "ATI VCR2 Video" },
+ { VLC_FOURCC('M','M','E','S'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "Matrox MPEG-2" },
+ { VLC_FOURCC('m','m','e','s'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "Matrox MPEG-2" },
/* MPEG-4 Video */
{ VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
VIDEO_ES, "Jomigo HDX4 (MPEG-4 Video)" },
{ VLC_FOURCC('S','M','P','4'), CODEC_ID_MPEG4,
VIDEO_ES, "Samsung SMP4 (MPEG-4 Video)" },
+ { VLC_FOURCC('f','v','f','w'), CODEC_ID_MPEG4,
+ VIDEO_ES, "FFmpeg MPEG-4" },
+ { VLC_FOURCC('F','V','F','W'), CODEC_ID_MPEG4,
+ VIDEO_ES, "FFmpeg MPEG-4" },
/* MSMPEG4 v1 */
{ VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1,
VIDEO_ES, "On2's VP6.1 Video" },
#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(47<<8)+0)
+ { VLC_FOURCC('V','P','6','A'), CODEC_ID_VP6A,
+ VIDEO_ES, "On2's VP6 A Video" },
+#endif
+
/* Xiph.org theora */
{ VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
VIDEO_ES, "Xiph.org's Theora Video" },
{ VLC_FOURCC('s','n','o','w'), CODEC_ID_SNOW,
VIDEO_ES, "FFMpeg SNOW wavelet Video" },
-
-
-
{ VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE,
VIDEO_ES, "Apple QuickTime RLE Video" },
VIDEO_ES, "Chinese AVS" },
#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+0)
+ /* Untested yet */
+ { VLC_FOURCC('A','V','d','n'), CODEC_ID_DNXHD,
+ VIDEO_ES, "DNxHD" },
+#endif
+ { VLC_FOURCC('8','B','P','S'), CODEC_ID_8BPS,
+ VIDEO_ES, "8BPS" },
+
/* Videogames Codecs */
/* Interplay MVE */
{ VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6,
AUDIO_ES, "MACE-6 Audio" },
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+1)
+ /* MUSEPACK7 Audio */
+ { VLC_FOURCC('M','P','C',' '), CODEC_ID_MUSEPACK7,
+ AUDIO_ES, "MUSEPACK7 Audio" },
+#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(48<<8)+0)
+ /* MUSEPACK8 Audio */
+ { VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8,
+ AUDIO_ES, "MUSEPACK8 Audio" },
+#endif
+
/* RealAudio 1.0 */
{ VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
AUDIO_ES, "RealAudio 1.0" },
+ { VLC_FOURCC('l','p','c','J'), CODEC_ID_RA_144,
+ AUDIO_ES, "RealAudio 1.0" },
/* RealAudio 2.0 */
{ VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
{ 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" },
{ VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
AUDIO_ES, "Id RoQ DPCM Audio" },
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(27<<8)+0)
/* DCIN Audio */
{ VLC_FOURCC('D','C','I','A'), CODEC_ID_DSICINAUDIO,
AUDIO_ES, "Delphine CIN Audio" },
+#endif
/* Sony Playstation XA ADPCM */
{ VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA,
{ VLC_FOURCC('S','O','N','C'), CODEC_ID_SONIC,
AUDIO_ES, "Sonic" },
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(34<<8)+0)
{ VLC_FOURCC(0x1,0x4,0x0,0x0), CODEC_ID_IMC,
AUDIO_ES, "IMC" },
-
+#endif
{ VLC_FOURCC(0x22,0x0,0x0,0x0), CODEC_ID_TRUESPEECH,
AUDIO_ES, "TrueSpeech" },
-
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(46<<8)+0)
+ { VLC_FOURCC('N','E','L','L'), CODEC_ID_NELLYMOSER,
+ AUDIO_ES, "NellyMoser ASAO" },
+#endif
+#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(44<<8)+0)
+ { VLC_FOURCC('A','P','E',' '), CODEC_ID_APE,
+ AUDIO_ES, "Monkey's Audio" },
+#endif
/* PCM */
{ VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
AUDIO_ES, "PCM S8" },