* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.58 2003/10/29 20:53:41 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
/* ffmpeg header */
+#define HAVE_MMX
#ifdef HAVE_FFMPEG_AVCODEC_H
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
-#if LIBAVCODEC_BUILD < 4655
-# error You must have a libavcodec >= 4655 (get CVS)
+#if LIBAVCODEC_BUILD < 4680
+# error You must have a libavcodec >= 4680 (get CVS)
#endif
#include "ffmpeg.h"
* Local prototypes
****************************************************************************/
static int OpenDecoder( vlc_object_t * );
-static int InitDecoder( decoder_t * );
-static int EndDecoder( decoder_t * );
-
-static int b_ffmpeginit = 0;
+static void CloseDecoder( vlc_object_t * );
+static char *enc_hq_list[] = { "rd", "bits", "simple" };
+static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
/* decoder main module */
- add_category_hint( N_("ffmpeg"), NULL, VLC_FALSE );
- set_capability( "decoder", 70 );
- set_callbacks( OpenDecoder, NULL );
set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+ set_capability( "decoder", 70 );
+ 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,
VLC_FALSE );
add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
VLC_FALSE );
- add_integer( "ffmpeg-truncated", 0, NULL, TRUNC_TEXT, TRUNC_LONGTEXT,
- VLC_FALSE );
#ifdef LIBAVCODEC_PP
add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
#endif
+ add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
+ VLC_TRUE );
/* chroma conversion submodule */
add_submodule();
set_capability( "chroma", 50 );
- set_callbacks( E_(OpenChroma), NULL );
+ set_callbacks( E_(OpenChroma), E_(CloseChroma) );
set_description( _("ffmpeg chroma conversion") );
- /* video encoder submodule */
- add_submodule();
- set_description( _("ffmpeg video encoder") );
- set_capability( "video encoder", 100 );
- set_callbacks( E_(OpenVideoEncoder), E_(CloseVideoEncoder) );
-
- /* audio encoder submodule */
- add_submodule();
- set_description( _("ffmpeg audio encoder") );
- set_capability( "audio encoder", 10 );
- set_callbacks( E_(OpenAudioEncoder), E_(CloseAudioEncoder) );
-
+ /* encoder submodule */
+ add_submodule();
+ set_description( _("ffmpeg audio/video encoder") );
+ set_capability( "encoder", 100 );
+ set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
+
+ add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
+ ENC_HQ_LONGTEXT, VLC_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 );
+ add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT,
+ ENC_BFRAMES_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT,
+ ENC_HURRYUP_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT,
+ ENC_INTERLACE_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT,
+ ENC_VT_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
+ ENC_PRE_ME_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
+ ENC_RC_STRICT_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8 * 3/2, NULL,
+ ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 0.1, NULL,
+ ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
+ ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
+ ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL,
+ ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmin", 0, NULL,
+ ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmax", 0, NULL,
+ ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "trellis", 0, NULL,
+ ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, VLC_TRUE );
+
+ /* demux submodule */
+ add_submodule();
+ set_description( _("ffmpeg demuxer" ) );
+ set_capability( "demux2", 1 );
+ set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+
var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
static int OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*) p_this;
- int i_cat, i_codec_id;
+ int i_cat, i_codec_id, i_result;
char *psz_namecodec;
- if( !E_(GetFfmpegCodec)( p_dec->p_fifo->i_fourcc, &i_cat, &i_codec_id,
+ AVCodecContext *p_context;
+ AVCodec *p_codec;
+
+ /* *** determine codec type *** */
+ if( !E_(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);
-
- if( !avcodec_find_decoder( i_codec_id ) )
+ /* Bail out if buggy decoder */
+ if( i_codec_id == CODEC_ID_AAC )
{
- msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
+ msg_Dbg( p_dec, "refusing to use ffmpeg's (%s) decoder which is buggy",
+ psz_namecodec );
return VLC_EGENERIC;
}
- p_dec->pf_init = InitDecoder;
- p_dec->pf_decode = (i_cat == VIDEO_ES) ? E_(DecodeVideo) : E_(DecodeAudio);
- p_dec->pf_end = EndDecoder;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * InitDecoder: Initalize the decoder
- *****************************************************************************/
-static int InitDecoder( decoder_t *p_dec )
-{
- int i_cat, i_codec_id, i_result;
- char *psz_namecodec;
- AVCodecContext *p_context;
- AVCodec *p_codec;
-
- /* *** determine codec type *** */
- E_(GetFfmpegCodec)( p_dec->p_fifo->i_fourcc,
- &i_cat, &i_codec_id, &psz_namecodec );
+ /* Initialization must be done before avcodec_find_decoder() */
+ E_(InitLibavcodec)(p_this);
/* *** ask ffmpeg for a decoder *** */
if( !( p_codec = avcodec_find_decoder( i_codec_id ) ) )
{
- msg_Err( p_dec, "codec not found (%s)", psz_namecodec );
+ msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
return VLC_EGENERIC;
}
/* *** get a p_context *** */
p_context = avcodec_alloc_context();
+ p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
+
+ /* Set CPU capabilities */
+ p_context->dsp_mask = 0;
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ {
+ p_context->dsp_mask |= FF_MM_MMX;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ {
+ p_context->dsp_mask |= FF_MM_MMXEXT;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ {
+ p_context->dsp_mask |= FF_MM_3DNOW;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ {
+ p_context->dsp_mask |= FF_MM_SSE;
+ p_context->dsp_mask |= FF_MM_SSE2;
+ }
switch( i_cat )
{
case VIDEO_ES:
+ p_dec->b_need_packetized = VLC_TRUE;
+ p_dec->pf_decode_video = E_(DecodeVideo);
i_result = E_( InitVideoDec )( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
- p_dec->pf_decode = E_(DecodeVideo);
break;
case AUDIO_ES:
+ p_dec->pf_decode_audio = E_(DecodeAudio);
i_result = E_( InitAudioDec )( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
- p_dec->pf_decode = E_(DecodeAudio);
break;
default:
i_result = VLC_EGENERIC;
return i_result;
}
-
+
/*****************************************************************************
- * EndDecoder: decoder destruction
+ * CloseDecoder: decoder destruction
*****************************************************************************/
-static int EndDecoder( decoder_t *p_dec )
+static void CloseDecoder( vlc_object_t *p_this )
{
+ decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
if( !p_sys->p_context )
avcodec_close( p_sys->p_context );
msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
- free( p_sys->p_context );
+ av_free( p_sys->p_context );
}
switch( p_sys->i_cat )
}
free( p_sys );
- return VLC_SUCCESS;
}
/*****************************************************************************
* local Functions
*****************************************************************************/
-int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
- int *pi_ffmpeg_codec, char **ppsz_name )
+int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
{
- int i_cat;
- int i_codec;
- char *psz_name;
+ switch( i_chroma )
+ {
+ case VLC_FOURCC( 'I', '4', '2', '0' ):
+ return PIX_FMT_YUV420P;
+ case VLC_FOURCC( 'I', '4', '2', '2' ):
+ return PIX_FMT_YUV422P;
+ case VLC_FOURCC( 'I', '4', '4', '4' ):
+ return PIX_FMT_YUV444P;
+ case VLC_FOURCC( 'R', 'V', '1', '5' ):
+ return PIX_FMT_RGB555;
+ case VLC_FOURCC( 'R', 'V', '1', '6' ):
+ return PIX_FMT_RGB565;
+ case VLC_FOURCC( 'R', 'V', '2', '4' ):
+ return PIX_FMT_RGB24;
+ case VLC_FOURCC( 'R', 'V', '3', '2' ):
+ return PIX_FMT_RGBA32;
+ case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
+ return PIX_FMT_GRAY8;
+ case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
+ return PIX_FMT_YUV422;
+ default:
+ return -1;
+ }
+}
+
+void E_(InitLibavcodec)( vlc_object_t *p_object )
+{
+ static int b_ffmpeginit = 0;
+ vlc_value_t lockval;
+
+ var_Get( p_object->p_libvlc, "avcodec", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- switch( i_fourcc )
+ /* *** init ffmpeg library (libavcodec) *** */
+ if( !b_ffmpeginit )
{
+ avcodec_init();
+ avcodec_register_all();
+ b_ffmpeginit = 1;
- /*
- * Video Codecs
- */
+ msg_Dbg( p_object, "libavcodec initialized (interface %d )",
+ LIBAVCODEC_BUILD );
+ }
+ else
+ {
+ msg_Dbg( p_object, "libavcodec already initialized" );
+ }
+
+ vlc_mutex_unlock( lockval.p_address );
+}
+
+
+static struct
+{
+ vlc_fourcc_t i_fourcc;
+ int i_codec;
+ int i_cat;
+ char *psz_name;
+} codecs_table[] =
+{
/* MPEG-1 Video */
- case VLC_FOURCC('m','p','1','v'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MPEG1VIDEO;
- psz_name = "MPEG-1 Video";
- break;
+ { VLC_FOURCC('m','p','1','v'), CODEC_ID_MPEG1VIDEO,
+ VIDEO_ES, "MPEG-1 Video" },
/* MPEG-2 Video */
- case VLC_FOURCC('m','p','2','v'):
- case VLC_FOURCC('m','p','g','v'):
- i_cat = VIDEO_ES;
-#if LIBAVCODEC_BUILD >= 4676
- i_codec = CODEC_ID_MPEG2VIDEO;
- psz_name = "MPEG-2 Video";
-#else
- i_codec = CODEC_ID_MPEG1VIDEO;
- psz_name = "MPEG-1 Video";
-#endif
- break;
+ { VLC_FOURCC('m','p','2','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
+ { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
/* MPEG-4 Video */
- case VLC_FOURCC('D','I','V','X'):
- case VLC_FOURCC('d','i','v','x'):
- case VLC_FOURCC('M','P','4','S'):
- case VLC_FOURCC('m','p','4','s'):
- case VLC_FOURCC('M','4','S','2'):
- case VLC_FOURCC('m','4','s','2'):
- case VLC_FOURCC('x','v','i','d'):
- case VLC_FOURCC('X','V','I','D'):
- case VLC_FOURCC('X','v','i','D'):
- case VLC_FOURCC('D','X','5','0'):
- case VLC_FOURCC('m','p','4','v'):
- case VLC_FOURCC( 4, 0, 0, 0 ):
- case VLC_FOURCC('m','4','c','c'):
- case VLC_FOURCC('M','4','C','C'):
+ { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','i','v','x'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','P','4','S'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','s'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','S','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','s','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('x','v','i','d'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','V','I','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','v','i','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('D','X','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','x','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC( 4, 0, 0, 0 ), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','C','C'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
/* 3ivx delta 3.5 Unsupported
* putting it here gives extreme distorted images
- case VLC_FOURCC('3','I','V','1'):
- case VLC_FOURCC('3','i','v','1'): */
+ { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" }, */
/* 3ivx delta 4 */
- case VLC_FOURCC('3','I','V','2'):
- case VLC_FOURCC('3','i','v','2'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MPEG4;
- psz_name = "MPEG-4";
- break;
+ { VLC_FOURCC('3','I','V','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
/* MSMPEG4 v1 */
- case VLC_FOURCC('D','I','V','1'):
- case VLC_FOURCC('d','i','v','1'):
- case VLC_FOURCC('M','P','G','4'):
- case VLC_FOURCC('m','p','g','4'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V1;
- psz_name = "MS MPEG-4 v1";
- break;
+ { VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('d','i','v','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('M','P','G','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('m','p','g','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
/* MSMPEG4 v2 */
- case VLC_FOURCC('D','I','V','2'):
- case VLC_FOURCC('d','i','v','2'):
- case VLC_FOURCC('M','P','4','2'):
- case VLC_FOURCC('m','p','4','2'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V2;
- psz_name = "MS MPEG-4 v2";
- break;
+ { VLC_FOURCC('D','I','V','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('d','i','v','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('M','P','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('m','p','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
/* MSMPEG4 v3 / M$ mpeg4 v3 */
- case VLC_FOURCC('M','P','G','3'):
- case VLC_FOURCC('m','p','g','3'):
- case VLC_FOURCC('d','i','v','3'):
- case VLC_FOURCC('M','P','4','3'):
- case VLC_FOURCC('m','p','4','3'):
+ { VLC_FOURCC('M','P','G','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','g','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('M','P','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
/* DivX 3.20 */
- case VLC_FOURCC('D','I','V','3'):
- case VLC_FOURCC('D','I','V','4'):
- case VLC_FOURCC('d','i','v','4'):
- case VLC_FOURCC('D','I','V','5'):
- case VLC_FOURCC('d','i','v','5'):
- case VLC_FOURCC('D','I','V','6'):
- case VLC_FOURCC('d','i','v','6'):
+ { VLC_FOURCC('D','I','V','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
/* AngelPotion stuff */
- case VLC_FOURCC('A','P','4','1'):
+ { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
/* 3ivx doctered divx files */
- case VLC_FOURCC('3','I','V','D'):
- case VLC_FOURCC('3','i','v','d'):
+ { VLC_FOURCC('3','I','V','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','i','v','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
/* who knows? */
- case VLC_FOURCC('3','V','I','D'):
- case VLC_FOURCC('3','v','i','d'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V3;
- psz_name = "MS MPEG-4 v3";
- break;
+ { VLC_FOURCC('3','V','I','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','v','i','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
/* Sorenson v1 */
- case VLC_FOURCC('S','V','Q','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_SVQ1;
- psz_name = "SVQ-1 (Sorenson Video v1)";
- break;
+ { VLC_FOURCC('S','V','Q','1'), CODEC_ID_SVQ1,
+ VIDEO_ES, "SVQ-1 (Sorenson Video v1)" },
/* Sorenson v3 */
- case VLC_FOURCC('S','V','Q','3'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_SVQ3;
- psz_name = "SVQ-3 (Sorenson Video v3)";
- break;
+ { VLC_FOURCC('S','V','Q','3'), CODEC_ID_SVQ3,
+ VIDEO_ES, "SVQ-3 (Sorenson Video v3)" },
+
+ /* h264 */
+ { VLC_FOURCC('h','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
/* H263 and H263i */
/* H263(+) is also known as Real Video 1.0 */
/* FIXME FOURCC_H263P exist but what fourcc ? */
/* H263 */
- case VLC_FOURCC('H','2','6','3'):
- case VLC_FOURCC('h','2','6','3'):
- case VLC_FOURCC('U','2','6','3'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_H263;
- psz_name = "H263";
- break;
+ { VLC_FOURCC('H','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('h','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
/* H263i */
- case VLC_FOURCC('I','2','6','3'):
- case VLC_FOURCC('i','2','6','3'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_H263I;
- psz_name = "I263.I";
- break;
+ { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
+ { VLC_FOURCC('i','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
-#if LIBAVCODEC_BUILD >= 4669
/* Flash (H263) variant */
- case VLC_FOURCC('F','L','V','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_FLV1;
- psz_name = "Flash Video";
- break;
+ { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
+ VIDEO_ES, "Flash Video" },
+
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
+ VIDEO_ES, "Flic Video" },
#endif
/* MJPEG */
- case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
- case VLC_FOURCC( 'm', 'j', 'p', 'g' ):
- case VLC_FOURCC( 'm', 'j', 'p', 'a' ): /* for mov file */
- case VLC_FOURCC( 'j', 'p', 'e', 'g' ):
- case VLC_FOURCC( 'J', 'P', 'E', 'G' ):
- case VLC_FOURCC( 'J', 'F', 'I', 'F' ):
- case VLC_FOURCC( 'J', 'P', 'G', 'L' ):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MJPEG;
- psz_name = "Motion JPEG";
- break;
- case VLC_FOURCC( 'm', 'j', 'p', 'b' ): /* for mov file */
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MJPEGB;
- psz_name = "Motion JPEG B";
- break;
+ { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'a' ), CODEC_ID_MJPEG, /* for mov file */
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'j', 'p', 'e', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'E', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'F', 'I', 'F' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'G', 'L' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+
+ { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB, /* for mov file */
+ VIDEO_ES, "Motion JPEG B Video" },
+
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC( 'S', 'P', '5', 'X' ), CODEC_ID_SP5X,
+ VIDEO_ES, "Sunplus Motion JPEG Video" },
+#endif
/* DV */
- case VLC_FOURCC('d','v','s','l'):
- case VLC_FOURCC('d','v','s','d'):
- case VLC_FOURCC('D','V','S','D'):
- case VLC_FOURCC('d','v','h','d'):
- case VLC_FOURCC('d','v','c',' '):
- case VLC_FOURCC('d','v','p',' '):
- case VLC_FOURCC('C','D','V','C'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_DVVIDEO;
- psz_name = "DV video";
- break;
+ { VLC_FOURCC('d','v','s','l'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','s','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('D','V','S','D'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','h','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
/* Windows Media Video */
- case VLC_FOURCC('W','M','V','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_WMV1;
- psz_name ="Windows Media Video 1";
- break;
- case VLC_FOURCC('W','M','V','2'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_WMV2;
- psz_name ="Windows Media Video 2";
- break;
+ { VLC_FOURCC('W','M','V','1'), CODEC_ID_WMV1,
+ VIDEO_ES, "Windows Media Video 1" },
+ { VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
+ VIDEO_ES, "Windows Media Video 2" },
#if LIBAVCODEC_BUILD >= 4683
/* Microsoft Video 1 */
- case VLC_FOURCC('M','S','V','C'):
- case VLC_FOURCC('m','s','v','c'):
- case VLC_FOURCC('C','R','A','M'):
- case VLC_FOURCC('c','r','a','m'):
- case VLC_FOURCC('W','H','A','M'):
- case VLC_FOURCC('w','h','a','m'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSVIDEO1;
- psz_name = "Microsoft Video 1";
- break;
+ { VLC_FOURCC('M','S','V','C'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('m','s','v','c'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('C','R','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('c','r','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('W','H','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('w','h','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
/* Microsoft RLE */
- case VLC_FOURCC('m','r','l','e'):
- case VLC_FOURCC(0x1,0x0,0x0,0x0):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSRLE;
- psz_name = "Microsoft RLE";
- break;
+ { VLC_FOURCC('m','r','l','e'), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
+ { VLC_FOURCC(0x1,0x0,0x0,0x0), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
#endif
-#if( ( LIBAVCODEC_BUILD >= 4663 ) && ( !defined( WORDS_BIGENDIAN ) ) )
+#if( !defined( WORDS_BIGENDIAN ) )
/* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
- case VLC_FOURCC('I','V','3','1'):
- case VLC_FOURCC('i','v','3','1'):
- case VLC_FOURCC('I','V','3','2'):
- case VLC_FOURCC('i','v','3','2'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_INDEO3;
- psz_name = "Indeo v3";
- break;
+ { VLC_FOURCC('I','V','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('I','V','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
#endif
/* Huff YUV */
- case VLC_FOURCC('H','F','Y','U'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_HUFFYUV;
- psz_name ="Huff YUV";
- break;
+ { VLC_FOURCC('H','F','Y','U'), CODEC_ID_HUFFYUV,
+ VIDEO_ES, "Huff YUV Video" },
/* Creative YUV */
- case VLC_FOURCC('C','Y','U','V'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_CYUV;
- psz_name ="Creative YUV";
- break;
+ { VLC_FOURCC('C','Y','U','V'), CODEC_ID_CYUV,
+ VIDEO_ES, "Creative YUV Video" },
-#if LIBAVCODEC_BUILD >= 4668
/* On2 VP3 Video Codecs */
- case VLC_FOURCC('V','P','3','1'):
- case VLC_FOURCC('v','p','3','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_VP3;
- psz_name = "On2's VP3 Video";
- break;
+ { 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 >= 4685
+ /* Xiph.org theora */
+ { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
+ VIDEO_ES, "Xiph.org's Theora Video" },
#endif
#if ( !defined( WORDS_BIGENDIAN ) )
-#if LIBAVCODEC_BUILD >= 4668
/* Asus Video (Another thing that doesn't work on PPC) */
- case VLC_FOURCC('A','S','V','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_ASV1;
- psz_name = "Asus V1";
- break;
-#endif
-#if LIBAVCODEC_BUILD >= 4677
- case VLC_FOURCC('A','S','V','2'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_ASV2;
- psz_name = "Asus V2";
- break;
-#endif
+ { VLC_FOURCC('A','S','V','1'), CODEC_ID_ASV1,
+ VIDEO_ES, "Asus V1 Video" },
+ { VLC_FOURCC('A','S','V','2'), CODEC_ID_ASV2,
+ VIDEO_ES, "Asus V2 Video" },
#endif
-#if LIBAVCODEC_BUILD >= 4668
/* FFMPEG Video 1 (lossless codec) */
- case VLC_FOURCC('F','F','V','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_FFV1;
- psz_name = "FFMpeg Video 1";
- break;
-#endif
+ { VLC_FOURCC('F','F','V','1'), CODEC_ID_FFV1,
+ VIDEO_ES, "FFMpeg Video 1" },
-#if LIBAVCODEC_BUILD >= 4669
/* ATI VCR1 */
- case VLC_FOURCC('V','C','R','1'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_VCR1;
- psz_name = "ATI VCR1";
- break;
-#endif
+ { VLC_FOURCC('V','C','R','1'), CODEC_ID_VCR1,
+ VIDEO_ES, "ATI VCR1 Video" },
-#if LIBAVCODEC_BUILD >= 4672
/* Cirrus Logic AccuPak */
- case VLC_FOURCC('C','L','J','R'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_CLJR;
- psz_name = "Creative Logic AccuPak";
- break;
-#endif
+ { VLC_FOURCC('C','L','J','R'), CODEC_ID_CLJR,
+ VIDEO_ES, "Creative Logic AccuPak" },
-#if LIBAVCODEC_BUILD >= 4683
+ /* Real Video */
+ { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 10" },
+ { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 13" },
+
+#if LIBAVCODEC_BUILD >= 4684
/* Apple Video */
- case VLC_FOURCC('r','p','z','a'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_RPZA;
- psz_name = "Apple Video";
- break;
-#endif
+ { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA,
+ VIDEO_ES, "Apple Video" },
+
+ { VLC_FOURCC('s','m','c',' '), CODEC_ID_SMC,
+ VIDEO_ES, "Apple graphics" },
-#if LIBAVCODEC_BUILD >= 4683
/* Cinepak */
- case VLC_FOURCC('c','v','i','d'):
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_CINEPAK;
- psz_name = "Cinepak";
- break;
+ { VLC_FOURCC('c','v','i','d'), CODEC_ID_CINEPAK,
+ VIDEO_ES, "Cinepak Video" },
+
+ /* Id Quake II CIN */
+ { VLC_FOURCC('I','D','C','I'), CODEC_ID_IDCIN,
+ VIDEO_ES, "Id Quake II CIN Video" },
+#endif
+
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','v'), CODEC_ID_4XM,
+ VIDEO_ES, "4X Technologies Video" },
+
+#if LIBAVCODEC_BUILD >= 4694
+ /* Duck TrueMotion */
+ { VLC_FOURCC('D','U','C','K'), CODEC_ID_TRUEMOTION1,
+ VIDEO_ES, "Duck TrueMotion v1 Video" },
+#endif
+
+ /* Interplay MVE */
+ { VLC_FOURCC('i','m','v','e'), CODEC_ID_INTERPLAY_VIDEO,
+ VIDEO_ES, "Interplay MVE Video" },
+
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','v'), CODEC_ID_ROQ,
+ VIDEO_ES, "Id RoQ Video" },
+
+ /* Sony Playstation MDEC */
+ { VLC_FOURCC('M','D','E','C'), CODEC_ID_MDEC,
+ VIDEO_ES, "PSX MDEC Video" },
+
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','v'), CODEC_ID_VMDVIDEO,
+ VIDEO_ES, "Sierra VMD Video" },
#endif
/*
*/
/* Windows Media Audio 1 */
- case VLC_FOURCC('W','M','A','1'):
- case VLC_FOURCC('w','m','a','1'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_WMAV1;
- psz_name ="Windows Media Audio 1";
- break;
+ { VLC_FOURCC('W','M','A','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
+ { VLC_FOURCC('w','m','a','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
/* Windows Media Audio 2 */
- case VLC_FOURCC('W','M','A','2'):
- case VLC_FOURCC('w','m','a','2'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_WMAV2;
- psz_name ="Windows Media Audio 2";
- break;
+ { VLC_FOURCC('W','M','A','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
+ { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
/* DV Audio */
- case VLC_FOURCC('d','v','a','u'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_DVAUDIO;
- psz_name = "DV audio";
- break;
+ { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
+ AUDIO_ES, "DV Audio" },
/* MACE-3 Audio */
- case VLC_FOURCC('M','A','C','3'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_MACE3;
- psz_name = "MACE-3 audio";
- break;
+ { VLC_FOURCC('M','A','C','3'), CODEC_ID_MACE3,
+ AUDIO_ES, "MACE-3 Audio" },
/* MACE-6 Audio */
- case VLC_FOURCC('M','A','C','6'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_MACE6;
- psz_name = "MACE-6 audio";
- break;
+ { VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6,
+ AUDIO_ES, "MACE-6 Audio" },
-#if LIBAVCODEC_BUILD >= 4668
/* RealAudio 1.0 */
- case VLC_FOURCC('1','4','_','4'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_RA_144;
- psz_name = "RealAudio 1.0";
- break;
+ { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
+ AUDIO_ES, "RealAudio 1.0" },
/* RealAudio 2.0 */
- case VLC_FOURCC('2','8','_','8'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_RA_288;
- psz_name = "RealAudio 2.0";
- break;
-#endif
+ { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
+ AUDIO_ES, "RealAudio 2.0" },
/* MPEG Audio layer 1/2/3 */
- case VLC_FOURCC('m','p','g','a'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_MP2;
- psz_name = "MPEG Audio layer 1/2";
- break;
- case VLC_FOURCC('m','p','3',' '):
- i_cat = AUDIO_ES;
-#if LIBAVCODEC_BUILD >= 4678
- i_codec = CODEC_ID_MP3;
-#else
- i_codec = CODEC_ID_MP3LAME;
-#endif
- psz_name = "MPEG Audio layer 1/2/3";
- break;
+ { VLC_FOURCC('m','p','g','a'), CODEC_ID_MP2,
+ AUDIO_ES, "MPEG Audio layer 1/2" },
+ { VLC_FOURCC('m','p','3',' '), CODEC_ID_MP3,
+ AUDIO_ES, "MPEG Audio layer 1/2/3" },
/* A52 Audio (aka AC3) */
- case VLC_FOURCC('a','5','2',' '):
- case VLC_FOURCC('a','5','2','b'): /* VLC specific hack */
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_AC3;
- psz_name = "A52 Audio (aka AC3)";
- break;
+ { VLC_FOURCC('a','5','2',' '), CODEC_ID_AC3,
+ AUDIO_ES, "A52 Audio (aka AC3)" },
+ { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */
+ AUDIO_ES, "A52 Audio (aka AC3)" },
/* AAC audio */
- case VLC_FOURCC('m','p','4','a'):
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_AAC;
- psz_name = "MPEG AAC Audio";
- break;
+ { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC,
+ AUDIO_ES, "MPEG AAC Audio" },
- default:
- i_cat = UNKNOWN_ES;
- i_codec = CODEC_ID_NONE;
- psz_name = NULL;
- break;
- }
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM,
+ AUDIO_ES, "4X Technologies Audio" },
- if( i_codec != CODEC_ID_NONE )
- {
- if( pi_cat ) *pi_cat = i_cat;
- if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = i_codec;
- if( ppsz_name ) *ppsz_name = psz_name;
- return VLC_TRUE;
- }
+ /* Interplay DPCM */
+ { VLC_FOURCC('i','d','p','c'), CODEC_ID_INTERPLAY_DPCM,
+ AUDIO_ES, "Interplay DPCM Audio" },
- return VLC_FALSE;
-}
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
+ AUDIO_ES, "Id RoQ DPCM Audio" },
-int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
+#if LIBAVCODEC_BUILD >= 4685
+ /* Sony Playstation XA ADPCM */
+ { VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA,
+ AUDIO_ES, "PSX XA ADPCM Audio" },
+
+ /* ADX ADPCM */
+ { VLC_FOURCC('a','d','x',' '), CODEC_ID_ADPCM_ADX,
+ AUDIO_ES, "ADX ADPCM Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','a'), CODEC_ID_VMDAUDIO,
+ AUDIO_ES, "Sierra VMD Audio" },
+#endif
+
+ /* PCM */
+ { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
+ AUDIO_ES, "PCM S8" },
+ { VLC_FOURCC('u','8',' ',' '), CODEC_ID_PCM_U8,
+ AUDIO_ES, "PCM U8" },
+ { VLC_FOURCC('s','1','6','l'), CODEC_ID_PCM_S16LE,
+ AUDIO_ES, "PCM S16 LE" },
+ { VLC_FOURCC('s','1','6','b'), CODEC_ID_PCM_S16BE,
+ AUDIO_ES, "PCM S16 BE" },
+ { VLC_FOURCC('u','1','6','l'), CODEC_ID_PCM_U16LE,
+ AUDIO_ES, "PCM U16 LE" },
+ { VLC_FOURCC('u','1','6','b'), CODEC_ID_PCM_U16BE,
+ AUDIO_ES, "PCM U16 BE" },
+ { VLC_FOURCC('a','l','a','w'), CODEC_ID_PCM_ALAW,
+ AUDIO_ES, "PCM ALAW" },
+ { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW,
+ AUDIO_ES, "PCM ULAW" },
+
+ {0}
+};
+
+int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
+ int *pi_ffmpeg_codec, char **ppsz_name )
{
- switch( i_chroma )
+ int i;
+
+ for( i = 0; codecs_table[i].i_fourcc != 0; i++ )
{
- case VLC_FOURCC( 'I', '4', '2', '0' ):
- return PIX_FMT_YUV420P;
- case VLC_FOURCC( 'I', '4', '2', '2' ):
- return PIX_FMT_YUV422P;
- case VLC_FOURCC( 'I', '4', '4', '4' ):
- return PIX_FMT_YUV444P;
- case VLC_FOURCC( 'R', 'V', '1', '5' ):
- return PIX_FMT_RGB555;
- case VLC_FOURCC( 'R', 'V', '1', '6' ):
- return PIX_FMT_RGB565;
- case VLC_FOURCC( 'R', 'V', '2', '4' ):
- return PIX_FMT_RGB24;
- case VLC_FOURCC( 'R', 'V', '3', '2' ):
- return PIX_FMT_RGBA32;
- case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
- return PIX_FMT_GRAY8;
- case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
- return PIX_FMT_YUV422;
- default:
- return 0;
+ if( codecs_table[i].i_fourcc == i_fourcc )
+ {
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
+
+ return VLC_TRUE;
+ }
}
+ return VLC_FALSE;
}
-void E_(InitLibavcodec)( vlc_object_t *p_object )
+int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat,
+ vlc_fourcc_t *pi_fourcc, char **ppsz_name )
{
- vlc_value_t lockval;
-
- var_Get( p_object->p_libvlc, "avcodec", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ int i;
- /* *** init ffmpeg library (libavcodec) *** */
- if( !b_ffmpeginit )
- {
- avcodec_init();
- avcodec_register_all();
- b_ffmpeginit = 1;
-
- msg_Dbg( p_object, "libavcodec initialized (interface %d )",
- LIBAVCODEC_BUILD );
- }
- else
+ for( i = 0; codecs_table[i].i_codec != 0; i++ )
{
- msg_Dbg( p_object, "libavcodec already initialized" );
+ if( codecs_table[i].i_codec == i_ffmpeg_codec )
+ {
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
+
+ return VLC_TRUE;
+ }
}
-
- vlc_mutex_unlock( lockval.p_address );
+ return VLC_FALSE;
}
projects / vlc / blobdiff