*
* 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.
*****************************************************************************/
/*****************************************************************************
static int OpenDecoder( vlc_object_t * );
static void CloseDecoder( vlc_object_t * );
+static int nloopf_list[] = { 0, 1, 2, 3, 4 };
+static char *nloopf_list_text[] =
+ { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
+
static char *enc_hq_list[] = { "rd", "bits", "simple" };
static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
/*****************************************************************************
/* decoder main module */
#if defined(MODULE_NAME_is_ffmpegaltivec) \
|| (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
- set_description( _("AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+ set_description( _("AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
/*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 decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_capability( "decoder", 70 );
#endif
set_section( N_("Decoding") , NULL );
add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
VLC_TRUE );
change_integer_range( 0, 2 );
+ add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
+ SKIPLOOPF_LONGTEXT, VLC_TRUE );
+ change_integer_list( nloopf_list, nloopf_list_text, 0 );
#ifdef LIBAVCODEC_PP
add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
add_submodule();
set_capability( "chroma", 50 );
set_callbacks( E_(OpenChroma), E_(CloseChroma) );
- set_description( _("ffmpeg chroma conversion") );
+ set_description( _("FFmpeg chroma conversion") );
/* encoder submodule */
add_submodule();
set_section( N_("Encoding") , NULL );
- set_description( _("ffmpeg audio/video encoder") );
+ set_description( _("FFmpeg audio/video encoder") );
set_capability( "encoder", 100 );
set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
/* demux submodule */
add_submodule();
- set_description( _("ffmpeg demuxer" ) );
+ set_description( _("FFmpeg demuxer" ) );
set_capability( "demux2", 2 );
set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+ /* mux submodule */
+ add_submodule();
+ set_description( _("FFmpeg muxer" ) );
+ set_capability( "sout mux", 2 );
+ set_callbacks( E_(OpenMux), E_(CloseMux) );
+
/* video filter submodule */
add_submodule();
set_capability( "video filter2", 50 );
set_callbacks( E_(OpenFilter), E_(CloseFilter) );
- set_description( _("ffmpeg video filter") );
+ set_description( _("FFmpeg video filter") );
+
+ /* crop/padd submodule */
+ add_submodule();
+ set_capability( "crop padd", 10 );
+ set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
+ set_description( _("FFmpeg crop padd filter") );
/* video filter submodule */
add_submodule();
set_capability( "video filter2", 0 );
set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
- set_description( _("ffmpeg deinterlace video filter") );
+ set_description( _("FFmpeg deinterlace video filter") );
add_shortcut( "ffmpeg-deinterlace" );
- var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
/*****************************************************************************
int i_cat, i_codec_id, i_result;
char *psz_namecodec;
- AVCodecContext *p_context;
- AVCodec *p_codec;
+ AVCodecContext *p_context = NULL;
+ AVCodec *p_codec = NULL;
/* *** determine codec type *** */
if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
E_(InitLibavcodec)(p_this);
/* *** ask ffmpeg for a decoder *** */
- if( !( p_codec = avcodec_find_decoder( i_codec_id ) ) )
+ p_codec = avcodec_find_decoder( i_codec_id );
+ if( !p_codec )
{
msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
return VLC_EGENERIC;
/* *** get a p_context *** */
p_context = avcodec_alloc_context();
+ if( !p_context )
+ return VLC_ENOMEM;
p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
p_context->opaque = (void *)p_this;
/* Set CPU capabilities */
p_context->dsp_mask = 0;
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
p_context->dsp_mask |= FF_MM_MMX;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
p_context->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
{
p_context->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
p_context->dsp_mask |= FF_MM_SSE;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) )
{
p_context->dsp_mask |= FF_MM_SSE2;
}
decoder_sys_t *p_sys = p_dec->p_sys;
vlc_value_t lockval;
- var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+ var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
switch( p_sys->i_cat )
{
{
if( p_sys->p_context->extradata )
free( p_sys->p_context->extradata );
-
+ p_sys->p_context->extradata = NULL;
vlc_mutex_lock( lockval.p_address );
avcodec_close( p_sys->p_context );
vlc_mutex_unlock( lockval.p_address );
char *psz_new_format;
const char *psz_item_name;
- if( p_avctx == NULL || p_avctx->opaque == NULL )
+ p_avc = p_avctx ? p_avctx->av_class : 0;
+
+#define cln p_avc->class_name
+ /* Make sure we can get p_this back */
+ if( !p_avctx || !p_avc || !cln ||
+ cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' ||
+ cln[4]!='d' || cln[5]!='e' || cln[6]!='c' )
+ {
+ if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va );
return;
+ }
+#undef cln
+
p_this = (vlc_object_t *)p_avctx->opaque;
- p_avc = p_avctx->av_class;
switch( i_level )
{
i_vlc_level = VLC_MSG_DBG;
break;
case AV_LOG_DEBUG:
+ /* Print debug messages if they were requested */
+ if( p_avctx->debug ) vfprintf( stderr, psz_format, va );
+ return;
default:
return;
}
+ 18 + 5 );
snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
+ 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
- msg_GenericVa( p_this, i_vlc_level, MODULE_STRING, psz_new_format, va );
+ msg_GenericVa( p_this, MSG_QUEUE_NORMAL,i_vlc_level,
+ MODULE_STRING, psz_new_format, va );
free( psz_new_format );
}
static int b_ffmpeginit = 0;
vlc_value_t lockval;
- var_Get( p_object->p_libvlc, "avcodec", &lockval );
+ var_Get( p_object->p_libvlc_global, "avcodec", &lockval );
vlc_mutex_lock( lockval.p_address );
/* *** init ffmpeg library (libavcodec) *** */
VIDEO_ES, "h264" },
{ VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
VIDEO_ES, "h264" },
+ { VLC_FOURCC('x','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
/* avc1: special case h264 */
{ VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
VIDEO_ES, "h264" },
VIDEO_ES, "H263" },
{ VLC_FOURCC('U','2','6','3'), CODEC_ID_H263,
VIDEO_ES, "H263" },
+ { VLC_FOURCC('M','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
/* H263i */
{ VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I,
VIDEO_ES, "DV Video" },
{ VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO,
VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','c','p'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video PAL" },
{ VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO,
- VIDEO_ES, "DV Video" },
+ VIDEO_ES, "DV Video Pro" },
+ { VLC_FOURCC('d','v','p','p'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video Pro PAL" },
{ VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO,
VIDEO_ES, "DV Video" },
VIDEO_ES, "Windows Media Video 1" },
{ VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
VIDEO_ES, "Windows Media Video 2" },
-#if 0
+#if LIBAVCODEC_BUILD >= ((51<<16)+(10<<8)+1)
{ VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3,
VIDEO_ES, "Windows Media Video 3" },
- { VLC_FOURCC('V','C','9',' '), CODEC_ID_VC9,
- VIDEO_ES, "Windows Media Video VC9" },
+ { VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1,
+ VIDEO_ES, "Windows Media Video VC1" },
+#endif
+#if 0
+ /* WMVA is the VC-1 codec before the standardization proces,
+ it is not bitstream compatible and deprecated */
+ { VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1,
+ VIDEO_ES, "Windows Media Video Advanced Profile" },
#endif
#if LIBAVCODEC_BUILD >= 4683
VIDEO_ES, "Creative YUV Video" },
/* On2 VP3 Video Codecs */
+ { VLC_FOURCC('V','P','3',' '), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
+ { VLC_FOURCC('V','P','3','0'), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
{ VLC_FOURCC('V','P','3','1'), CODEC_ID_VP3,
VIDEO_ES, "On2's VP3 Video" },
{ VLC_FOURCC('v','p','3','1'), CODEC_ID_VP3,
VIDEO_ES, "On2's VP3 Video" },
+#if LIBAVCODEC_BUILD >= ((51<<16)+(14<<8)+0)
+ { VLC_FOURCC('V','P','5',' '), CODEC_ID_VP5,
+ VIDEO_ES, "On2's VP5 Video" },
+ { VLC_FOURCC('V','P','5','0'), CODEC_ID_VP5,
+ VIDEO_ES, "On2's VP5 Video" },
+ { VLC_FOURCC('V','P','6','2'), CODEC_ID_VP6,
+ VIDEO_ES, "On2's VP6.2 Video" },
+ { VLC_FOURCC('v','p','6','2'), CODEC_ID_VP6,
+ VIDEO_ES, "On2's VP6.2 Video" },
+ { VLC_FOURCC('V','P','6','F'), CODEC_ID_VP6F,
+ VIDEO_ES, "On2's VP6.2 Video (Flash)" },
+#endif
+
#if LIBAVCODEC_BUILD >= 4685
/* Xiph.org theora */
{ VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
#endif
#if LIBAVCODEC_BUILD >= 4752
+ { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE,
+ VIDEO_ES, "Apple QuickTime RLE Video" },
+
{ VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW,
VIDEO_ES, "Apple QuickDraw Video" },
VIDEO_ES, "Indeo Video v2" },
#endif
+#if LIBAVCODEC_BUILD >= ((51<<16)+(13<<8)+0)
+ { VLC_FOURCC('V','M','n','c'), CODEC_ID_VMNC,
+ VIDEO_ES, "VMware Video" },
+#endif
+
+
/*
* Image codecs
*/
VIDEO_ES, "PAM Image" },
#endif
+#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0)
+ { VLC_FOURCC('b','m','p',' '), CODEC_ID_BMP,
+ VIDEO_ES, "BMP Image" },
+#endif
+
/*
* Audio Codecs
*/
AUDIO_ES, "Apple Lossless Audio Codec" },
#endif
-#if LIBAVCODEC_BUILD >= ((50<<16)+(0<<8)+0)
+#if LIBAVCODEC_BUILD >= ((50<<16)+(0<<8)+1)
/* QDM2 */
{ VLC_FOURCC('Q','D','M','2'), CODEC_ID_QDM2,
- AUDIO_ES, "QDM2" },
+ AUDIO_ES, "QDM2 Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0)
+ /* COOK */
+ { VLC_FOURCC('c','o','o','k'), CODEC_ID_COOK,
+ AUDIO_ES, "Cook Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= ((51<<16)+(8<<8)+0)
+ /* Shorten */
+ { VLC_FOURCC('s','h','n',' '), CODEC_ID_SHORTEN,
+ AUDIO_ES, "Shorten Lossless Audio" },
#endif
/* PCM */
projects / vlc / blobdiff