X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fffmpeg%2Fffmpeg.c;h=e3cbfbd5f0a8400e05b17cc1d9afabeda7e1e04e;hb=c84e40d0a9048e364c2eeb61b416ae57bbb05080;hp=d7d756b85715214942ad8a805e97bef2e56cf6ec;hpb=e08927e56bf27d539a416437f0bb33230279e4f6;p=vlc

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index d7d756b857..e3cbfbd5f0 100644
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,9 +2,10 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.43 2003/06/15 22:32:06 hartman Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Gildas Bazin <gbazin@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,32 +25,21 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
 #include <vlc/decoder.h>
-#include <vlc/input.h>
-
-#include <string.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"
 
 #ifdef LIBAVCODEC_PP
@@ -58,621 +48,942 @@
 #   else
 #       include <libpostproc/postprocess.h>
 #   endif
-#else
-#   include "postprocessing/postprocessing.h"
 #endif
 
-#include "video.h" // video ffmpeg specific
-#include "audio.h" // audio ffmpeg specific
-
-/*
- * Local prototypes
- */
-int             E_(OpenChroma)  ( vlc_object_t * );
-static int      OpenDecoder     ( vlc_object_t * );
-static int      RunDecoder      ( decoder_fifo_t * );
-
-static int      InitThread      ( generic_thread_t * );
-static void     EndThread       ( generic_thread_t * );
-
+/*****************************************************************************
+ * decoder_sys_t: decoder descriptor
+ *****************************************************************************/
+struct decoder_sys_t
+{
+    /* Common part between video and audio decoder */
+    int i_cat;
+    int i_codec_id;
+    char *psz_namecodec;
 
-static int      b_ffmpeginit = 0;
+    AVCodecContext *p_context;
+    AVCodec        *p_codec;
+};
 
-static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int OpenDecoder( vlc_object_t * );
+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
  *****************************************************************************/
-#define DR_TEXT N_("Direct rendering")
-
-#define ERROR_TEXT N_("Error resilience")
-#define ERROR_LONGTEXT N_( \
-    "ffmpeg can make errors resiliences.          \n" \
-    "Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) " \
-    "this will produce a lot of errors.\n" \
-    "Valid range is -1 to 99 (-1 disables all errors resiliences).")
-
-#define BUGS_TEXT N_("Workaround bugs")
-#define BUGS_LONGTEXT N_( \
-    "Try to fix some bugs\n" \
-    "1  autodetect\n" \
-    "2  old msmpeg4\n" \
-    "4  xvid interlaced\n" \
-    "8  ump4 \n" \
-    "16 no padding\n" \
-    "32 ac vlc\n" \
-    "64 Qpel chroma")
-
-#define HURRYUP_TEXT N_("Hurry up")
-#define HURRYUP_LONGTEXT N_( \
-    "Allow the decoder to partially decode or skip frame(s) " \
-    "when there is not enough time. It's useful with low CPU power " \
-    "but it can produce distorted pictures.")
-
-#define TRUNC_TEXT N_("Truncated stream")
-#define TRUNC_LONGTEXT N_("truncated stream -1:auto,0:disable,:1:enable")
-
-#define PP_Q_TEXT N_("Post processing quality")
-#define PP_Q_LONGTEXT N_( \
-    "Quality of post processing. Valid range is 0 to 6\n" \
-    "Higher levels require considerable more CPU power, but produce " \
-    "better looking pictures." )
-
-#define LIBAVCODEC_PP_TEXT N_("Ffmpeg postproc filter chains")
-/* FIXME (cut/past from ffmpeg */
-#define LIBAVCODEC_PP_LONGTEXT \
-"<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
-"long form example:\n" \
-"vdeblock:autoq/hdeblock:autoq/linblenddeint    default,-vdeblock\n" \
-"short form example:\n" \
-"vb:a/hb:a/lb de,-vb\n" \
-"more examples:\n" \
-"tn:64:128:256\n" \
-"Filters                        Options\n" \
-"short  long name       short   long option     Description\n" \
-"*      *               a       autoq           cpu power dependant enabler\n" \
-"                       c       chrom           chrominance filtring enabled\n" \
-"                       y       nochrom         chrominance filtring disabled\n" \
-"hb     hdeblock        (2 Threshold)           horizontal deblocking filter\n" \
-"       1. difference factor: default=64, higher -> more deblocking\n" \
-"       2. flatness threshold: default=40, lower -> more deblocking\n" \
-"                       the h & v deblocking filters share these\n" \
-"                       so u cant set different thresholds for h / v\n" \
-"vb     vdeblock        (2 Threshold)           vertical deblocking filter\n" \
-"h1     x1hdeblock                              Experimental h deblock filter 1\n" \
-"v1     x1vdeblock                              Experimental v deblock filter 1\n" \
-"dr     dering                                  Deringing filter\n" \
-"al     autolevels                              automatic brightness / contrast\n" \
-"                       f       fullyrange      stretch luminance to (0..255)\n" \
-"lb     linblenddeint                           linear blend deinterlacer\n" \
-"li     linipoldeint                            linear interpolating deinterlace\n" \
-"ci     cubicipoldeint                          cubic interpolating deinterlacer\n" \
-"md     mediandeint                             median deinterlacer\n" \
-"fd     ffmpegdeint                             ffmpeg deinterlacer\n" \
-"de     default                                 hb:a,vb:a,dr:a,al\n" \
-"fa     fast                                    h1:a,v1:a,dr:a,al\n" \
-"tn     tmpnoise        (3 Thresholds)          Temporal Noise Reducer\n" \
-"                       1. <= 2. <= 3.          larger -> stronger filtering\n" \
-"fq     forceQuant      <quantizer>             Force quantizer\n"
-
-#define FFMPEG_PP_TEXT N_( "Ffmpeg postprocessing module" )
-
-#define PP_AQ_TEXT N_("Auto-level Post processing quality")
-#define PP_AQ_LONGTEXT N_( \
-    "Post processing quality is selected upon time left " \
-    "but no more than requested quality\n" \
-    "Not yet implemented !")
-
-#define FFMPEG_YV_TEXT N_("Force vertical luminance deblocking")
-#define FFMPEG_YV_LONGTEXT N_("Force vertical luminance deblocking (override other settings)")
-
-#define FFMPEG_YH_TEXT N_("Force horizontal luminance deblocking")
-#define FFMPEG_YH_LONGTEXT N_("Force horizontal luminance deblocking (override other settings)")
-
-#define FFMPEG_CV_TEXT N_("Force vertical chrominance deblocking")
-#define FFMPEG_CV_LONGTEXT N_("Force vertical chrominance deblocking (override other settings)")
-
-#define FFMPEG_CH_TEXT N_("Force horizontal chrominance deblocking")
-#define FFMPEG_CH_LONGTEXT N_("Force horizontal chrominance deblocking (override other settings)")
-
-#define FFMPEG_Y_DR_TEXT N_("Force luminance deringing")
-#define FFMPEG_Y_DR_LONGTEXT N_("Force luminance deringing (override other settings)")
-
-#define FFMPEG_C_DR_TEXT N_("Force chrominance deringing")
-#define FFMPEG_C_DR_LONGTEXT N_("Force chrominance deringing (override other settings)")
-
 vlc_module_begin();
-    add_category_hint( N_("ffmpeg"), NULL, VLC_FALSE );
+    set_shortname( "FFmpeg");
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_SCODEC );
+    /* 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)") );
+    /*add_requirement( ALTIVEC );*/
+    set_capability( "decoder", 71 );
+#else
+    set_description( _("ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     set_capability( "decoder", 70 );
-    set_callbacks( OpenDecoder, NULL );
-    set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+#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, VLC_FALSE );
-    add_integer( "ffmpeg-truncated", -1, NULL, TRUNC_TEXT, TRUNC_LONGTEXT, VLC_FALSE );
-
-    add_category_hint( N_("Post processing"), NULL, VLC_FALSE );
+    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,
+        VLC_FALSE );
+    add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT,
+        VLC_TRUE );
+    add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
+        VLC_TRUE );
+        change_integer_range( 0, 2 );
 
-    add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
 #ifdef LIBAVCODEC_PP
-    add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT, LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
-#else
-    add_module( "ffmpeg-pp", "postprocessing",NULL, NULL, FFMPEG_PP_TEXT, NULL, VLC_FALSE );
-    add_bool( "ffmpeg-pp-auto", 0, NULL, PP_AQ_TEXT, PP_AQ_LONGTEXT, VLC_FALSE );
-    add_bool( "ffmpeg-db-yv", 0, NULL, FFMPEG_YV_TEXT, FFMPEG_YV_LONGTEXT, VLC_TRUE );
-    add_bool( "ffmpeg-db-yh", 0, NULL, FFMPEG_YH_TEXT, FFMPEG_YH_LONGTEXT, VLC_TRUE );
-    add_bool( "ffmpeg-db-cv", 0, NULL, FFMPEG_CV_TEXT, FFMPEG_CV_LONGTEXT, VLC_TRUE );
-    add_bool( "ffmpeg-db-ch", 0, NULL, FFMPEG_CH_TEXT, FFMPEG_CH_LONGTEXT, VLC_TRUE );
-    add_bool( "ffmpeg-dr-y", 0, NULL, FFMPEG_Y_DR_TEXT, FFMPEG_Y_DR_LONGTEXT, VLC_TRUE );
-    add_bool( "ffmpeg-dr-c", 0, NULL, FFMPEG_C_DR_TEXT, FFMPEG_C_DR_LONGTEXT, VLC_TRUE );
+    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") );
 
+    /* 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) );
+
+    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 );
+    add_float( ENC_CFG_PREFIX "qscale", 0, NULL,
+               ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, VLC_TRUE );
+    add_integer( ENC_CFG_PREFIX "strict", 0, NULL,
+                 ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, VLC_TRUE );
+
+    /* demux submodule */
+    add_submodule();
+    set_description( _("ffmpeg demuxer" ) );
+    set_capability( "demux2", 2 );
+    set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+
+    /* video filter submodule */
+    add_submodule();
+    set_capability( "video filter2", 50 );
+    set_callbacks( E_(OpenFilter), E_(CloseFilter) );
+    set_description( _("ffmpeg video filter") );
+
+    /* video filter submodule */
+    add_submodule();
+    set_capability( "video filter2", 0 );
+    set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
+    set_description( _("ffmpeg deinterlace video filter") );
+    add_shortcut( "ffmpeg-deinterlace" );
+
+    var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
 vlc_module_end();
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to chose.
  *****************************************************************************/
 static int OpenDecoder( vlc_object_t *p_this )
 {
-    decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
+    decoder_t *p_dec = (decoder_t*) p_this;
+    int i_cat, i_codec_id, i_result;
+    char *psz_namecodec;
+
+    AVCodecContext *p_context;
+    AVCodec        *p_codec;
 
-    if( ffmpeg_GetFfmpegCodec( p_fifo->i_fourcc, NULL, NULL, NULL ) )
+    /* *** determine codec type *** */
+    if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
+                             &psz_namecodec ) )
     {
-        p_fifo->pf_run = RunDecoder;
-        return VLC_SUCCESS;
+        return VLC_EGENERIC;
     }
 
-    return VLC_EGENERIC;
-}
-
-typedef union decoder_thread_u
-{
-    generic_thread_t gen;
-    adec_thread_t    audio;
-    vdec_thread_t    video;
-
-} decoder_thread_t;
+    /* Bail out if buggy decoder */
+    if( i_codec_id == CODEC_ID_AAC )
+    {
+        msg_Dbg( p_dec, "refusing to use ffmpeg's (%s) decoder which is buggy",
+                 psz_namecodec );
+        return VLC_EGENERIC;
+    }
 
+    /* Initialization must be done before avcodec_find_decoder() */
+    E_(InitLibavcodec)(p_this);
 
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
-{
-    generic_thread_t *p_decoder;
-    int b_error;
-
-    if ( !(p_decoder = malloc( sizeof( decoder_thread_t ) ) ) )
+    /* *** ask ffmpeg for a decoder *** */
+    if( !( p_codec = avcodec_find_decoder( i_codec_id ) ) )
     {
-        msg_Err( p_fifo, "out of memory" );
-        DecoderError( p_fifo );
-        return( -1 );
+        msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
+        return VLC_EGENERIC;
     }
-    memset( p_decoder, 0, sizeof( decoder_thread_t ) );
 
-    p_decoder->p_fifo = p_fifo;
+    /* *** get a p_context *** */
+    p_context = avcodec_alloc_context();
+    p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
 
-    if( InitThread( p_decoder ) != 0 )
+    /* Set CPU capabilities */
+    p_context->dsp_mask = 0;
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
     {
-        msg_Err( p_fifo, "initialization failed" );
-        DecoderError( p_fifo );
-        return( -1 );
+        p_context->dsp_mask |= FF_MM_MMX;
     }
-
-    while( (!p_decoder->p_fifo->b_die) && (!p_decoder->p_fifo->b_error) )
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
     {
-        switch( p_decoder->i_cat )
-        {
-            case VIDEO_ES:
-                E_( DecodeThread_Video )( (vdec_thread_t*)p_decoder );
-                break;
-            case AUDIO_ES:
-                E_( DecodeThread_Audio )( (adec_thread_t*)p_decoder );
-                break;
-        }
+        p_context->dsp_mask |= FF_MM_MMXEXT;
     }
-
-    if( ( b_error = p_decoder->p_fifo->b_error ) )
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
     {
-        DecoderError( p_decoder->p_fifo );
+        p_context->dsp_mask |= FF_MM_3DNOW;
+    }
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+    {
+        p_context->dsp_mask |= FF_MM_SSE;
+    }
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+    {
+        p_context->dsp_mask |= FF_MM_SSE2;
     }
 
-    EndThread( p_decoder );
-
-    if( b_error )
+    switch( i_cat )
     {
-        return( -1 );
+    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 );
+        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 );
+        break;
+    default:
+        i_result = VLC_EGENERIC;
     }
 
-    return( 0 );
+    if( i_result == VLC_SUCCESS ) p_dec->p_sys->i_cat = i_cat;
+
+    return i_result;
 }
 
 /*****************************************************************************
- *
- * Functions that initialize, decode and end the decoding process
- *
+ * CloseDecoder: decoder destruction
  *****************************************************************************/
+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;
+
+    switch( p_sys->i_cat )
+    {
+    case AUDIO_ES:
+        E_( EndAudioDec )( p_dec );
+        break;
+    case VIDEO_ES:
+        E_( EndVideoDec )( p_dec );
+        break;
+    }
+
+    if( p_sys->p_context )
+    {
+        if( p_sys->p_context->extradata )
+            free( p_sys->p_context->extradata );
+
+        avcodec_close( p_sys->p_context );
+        msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
+        av_free( p_sys->p_context );
+    }
+
+    free( p_sys );
+}
 
 /*****************************************************************************
- * InitThread: initialize vdec output thread
- *****************************************************************************
- * This function is called from decoder_Run and performs the second step
- * of the initialization. It returns 0 on success. Note that the thread's
- * flag are not modified inside this function.
- *
- * ffmpeg codec will be open, some memory allocated. But Vout is not yet
- *   open (done after the first decoded frame)
+ * local Functions
  *****************************************************************************/
-
-static int InitThread( generic_thread_t *p_decoder )
+void E_(InitLibavcodec)( vlc_object_t *p_object )
 {
-    int i_result;
+    static int b_ffmpeginit = 0;
+    vlc_value_t lockval;
+
+    var_Get( p_object->p_libvlc, "avcodec", &lockval );
+    vlc_mutex_lock( lockval.p_address );
 
-     /* *** init ffmpeg library (libavcodec) *** */
+    /* *** init ffmpeg library (libavcodec) *** */
     if( !b_ffmpeginit )
     {
         avcodec_init();
         avcodec_register_all();
         b_ffmpeginit = 1;
 
-        msg_Dbg( p_decoder->p_fifo, "libavcodec initialized (interface "
-                                    LIBAVCODEC_BUILD_STR ")" );
+        msg_Dbg( p_object, "libavcodec initialized (interface %d )",
+                 LIBAVCODEC_BUILD );
     }
     else
     {
-        msg_Dbg( p_decoder->p_fifo, "libavcodec already initialized" );
-    }
-
-    /* *** determine codec type *** */
-    ffmpeg_GetFfmpegCodec( p_decoder->p_fifo->i_fourcc,
-                           &p_decoder->i_cat,
-                           &p_decoder->i_codec_id,
-                           &p_decoder->psz_namecodec );
-
-    /* *** ask ffmpeg for a decoder *** */
-    if( !( p_decoder->p_codec =
-                avcodec_find_decoder( p_decoder->i_codec_id ) ) )
-    {
-        msg_Err( p_decoder->p_fifo,
-                 "codec not found (%s)",
-                 p_decoder->psz_namecodec );
-        return( -1 );
-    }
-
-     /* *** Get a p_context *** */
-    p_decoder->p_context = avcodec_alloc_context();
-
-    switch( p_decoder->i_cat )
-    {
-        case VIDEO_ES:
-            i_result = E_( InitThread_Video )( (vdec_thread_t*)p_decoder );
-            break;
-        case AUDIO_ES:
-            i_result = E_( InitThread_Audio )( (adec_thread_t*)p_decoder );
-            break;
-        default:
-            i_result = -1;
+        msg_Dbg( p_object, "libavcodec already initialized" );
     }
 
-    p_decoder->pts = 0;
-    p_decoder->p_buffer = NULL;
-    p_decoder->i_buffer = 0;
-    p_decoder->i_buffer_size = 0;
-
-    return( i_result );
+    vlc_mutex_unlock( lockval.p_address );
 }
 
 /*****************************************************************************
- * EndThread: thread destruction
- *****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
+ * Chroma fourcc -> ffmpeg_id mapping
  *****************************************************************************/
-static void EndThread( generic_thread_t *p_decoder )
+static struct
 {
+    vlc_fourcc_t  i_chroma;
+    int  i_chroma_id;
 
-    if( !p_decoder )
-    {
-        return;
-    }
+} chroma_table[] =
+{
+    /* Planar YUV formats */
+    { VLC_FOURCC('Y','U','V','A'), PIX_FMT_YUV444P }, /* Hack */
+    { VLC_FOURCC('I','4','4','4'), PIX_FMT_YUV444P },
+    { VLC_FOURCC('J','4','4','4'), PIX_FMT_YUVJ444P },
+    { VLC_FOURCC('I','4','2','2'), PIX_FMT_YUV422P },
+    { VLC_FOURCC('J','4','2','2'), PIX_FMT_YUVJ422P },
+    { VLC_FOURCC('I','4','2','0'), PIX_FMT_YUV420P },
+    { VLC_FOURCC('Y','V','1','2'), PIX_FMT_YUV420P },
+    { VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P },
+    { VLC_FOURCC('J','4','2','0'), PIX_FMT_YUVJ420P },
+    { VLC_FOURCC('I','4','1','1'), PIX_FMT_YUV411P },
+    { VLC_FOURCC('I','4','1','0'), PIX_FMT_YUV410P },
+    { VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P },
+
+    /* Packed YUV formats */
+    { VLC_FOURCC('Y','U','Y','2'), PIX_FMT_YUV422 },
+#if LIBAVCODEC_BUILD >= 4720
+    { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 },
+#endif
+
+    /* Packed RGB formats */
+    { 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 },
+    { VLC_FOURCC('R','V','3','2'), PIX_FMT_RGBA32 },
+    { VLC_FOURCC('G','R','E','Y'), PIX_FMT_GRAY8 },
 
-    if( p_decoder->p_context != NULL)
+    {0}
+};
+
+int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
+{
+    int i;
+
+    for( i = 0; chroma_table[i].i_chroma != 0; i++ )
     {
-        FREE( p_decoder->p_context->extradata );
-        avcodec_close( p_decoder->p_context );
-        msg_Dbg( p_decoder->p_fifo,
-                 "ffmpeg codec (%s) stopped",
-                 p_decoder->psz_namecodec );
-        free( p_decoder->p_context );
+        if( chroma_table[i].i_chroma == i_chroma )
+            return chroma_table[i].i_chroma_id;
     }
+    return -1;
+}
 
-    FREE( p_decoder->p_buffer );
+vlc_fourcc_t E_(GetVlcChroma)( int i_ffmpeg_chroma )
+{
+    int i;
 
-    switch( p_decoder->i_cat )
+    for( i = 0; chroma_table[i].i_chroma != 0; i++ )
     {
-        case AUDIO_ES:
-            E_( EndThread_Audio )( (adec_thread_t*)p_decoder );
-            break;
-        case VIDEO_ES:
-            E_( EndThread_Video )( (vdec_thread_t*)p_decoder );
-            break;
+        if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma )
+            return chroma_table[i].i_chroma;
     }
-
-    free( p_decoder );
+    return 0;
 }
 
 /*****************************************************************************
- * locales Functions
+ * Codec fourcc -> ffmpeg_id mapping
  *****************************************************************************/
+static struct
+{
+    vlc_fourcc_t  i_fourcc;
+    int  i_codec;
+    int  i_cat;
+    char *psz_name;
 
-int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes )
+} codecs_table[] =
 {
-    int i_copy;
-    int i_count;
+    /* MPEG-1 Video */
+    { VLC_FOURCC('m','p','1','v'), CODEC_ID_MPEG1VIDEO,
+      VIDEO_ES, "MPEG-1 Video" },
+
+    /* MPEG-2 Video */
+    { 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 */
+    { 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('X','V','I','X'), CODEC_ID_MPEG4,
+      VIDEO_ES, "MPEG-4 Video" },
+    { VLC_FOURCC('x','v','i','x'), 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('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
+    { 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 */
+    { 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 */
+    { 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 */
+    { 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 */
+    { 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 */
+    { 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 */
+    { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3,
+      VIDEO_ES, "MS MPEG-4 Video v3" },
+    /* 3ivx doctered divx files */
+    { 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? */
+    { 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 */
+    { VLC_FOURCC('S','V','Q','1'), CODEC_ID_SVQ1,
+      VIDEO_ES, "SVQ-1 (Sorenson Video v1)" },
+
+    /* Sorenson v3 */
+    { 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" },
+    /* avc1: special case h264 */
+    { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
+      VIDEO_ES, "h264" },
+    { VLC_FOURCC('V','S','S','H'), CODEC_ID_H264,
+      VIDEO_ES, "h264" },
+    { VLC_FOURCC('v','s','s','h'), CODEC_ID_H264,
+      VIDEO_ES, "h264" },
+
+/* H263 and H263i */
+/* H263(+) is also known as Real Video 1.0 */
 
-    data_packet_t   *p_data;
+/* FIXME FOURCC_H263P exist but what fourcc ? */
 
-    i_count = 0;
-    p_data = p_pes->p_first;
-    while( p_data != NULL && i_count < i_max )
-    {
+    /* H263 */
+    { 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 */
+    { 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" },
+
+    /* Flash (H263) variant */
+    { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
+      VIDEO_ES, "Flash Video" },
+
+#if LIBAVCODEC_BUILD > 4716
+    { VLC_FOURCC('H','2','6','1'), CODEC_ID_H261,
+      VIDEO_ES, "H.261" },
+#endif
 
-        i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
-                        i_max - i_count );
+#if LIBAVCODEC_BUILD > 4680
+    { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
+      VIDEO_ES, "Flic Video" },
+#endif
 
-        if( i_copy > 0 )
-        {
-            memcpy( p_buf,
-                    p_data->p_payload_start,
-                    i_copy );
-        }
+    /* MJPEG */
+    { 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
 
-        p_data = p_data->p_next;
-        i_count += i_copy;
-        p_buf   += i_copy;
-    }
+    /* DV */
+    { 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 */
+    { 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 0
+    { 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" },
+#endif
 
-    if( i_count < i_max )
-    {
-        memset( p_buf, 0, i_max - i_count );
-    }
-    return( i_count );
-}
+#if LIBAVCODEC_BUILD >= 4683
+    /* Microsoft Video 1 */
+    { 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 */
+    { 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
 
+    /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
+    { 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" },
+
+#if LIBAVCODEC_BUILD >= 4721
+    { VLC_FOURCC('t','s','c','c'), CODEC_ID_TSCC,
+      VIDEO_ES, "TechSmith Camtasia Screen Capture Video" },
+#endif
 
-static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
-                                  int *pi_cat,
-                                  int *pi_ffmpeg_codec,
-                                  char **ppsz_name )
-{
-    int i_cat;
-    int i_codec;
-    char *psz_name;
+    /* Huff YUV */
+    { VLC_FOURCC('H','F','Y','U'), CODEC_ID_HUFFYUV,
+      VIDEO_ES, "Huff YUV Video" },
 
-    switch( i_fourcc )
-    {
-#if 0
-        /* XXX don't use it */
-        case FOURCC_mpgv:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MPEG1VIDEO;
-            psz_name = "MPEG-1/2 Video";
-            break;
+    /* Creative YUV */
+    { VLC_FOURCC('C','Y','U','V'), CODEC_ID_CYUV,
+      VIDEO_ES, "Creative YUV Video" },
+
+    /* On2 VP3 Video Codecs */
+    { 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
-        case FOURCC_DIV1:
-        case FOURCC_div1:
-        case FOURCC_MPG4:
-        case FOURCC_mpg4:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MSMPEG4V1;
-            psz_name = "MS MPEG-4 v1";
-            break;
-
-        case FOURCC_DIV2:
-        case FOURCC_div2:
-        case FOURCC_MP42:
-        case FOURCC_mp42:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MSMPEG4V2;
-            psz_name = "MS MPEG-4 v2";
-            break;
-
-        case FOURCC_MPG3:
-        case FOURCC_mpg3:
-        case FOURCC_div3:
-        case FOURCC_MP43:
-        case FOURCC_mp43:
-        case FOURCC_DIV3:
-        case FOURCC_DIV4:
-        case FOURCC_div4:
-        case FOURCC_DIV5:
-        case FOURCC_div5:
-        case FOURCC_DIV6:
-        case FOURCC_div6:
-        case FOURCC_AP41:
-        case FOURCC_3VID:
-        case FOURCC_3vid:
-        case FOURCC_3IVD:
-        case FOURCC_3ivd:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MSMPEG4V3;
-            psz_name = "MS MPEG-4 v3";
-            break;
-
-        case FOURCC_SVQ1:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_SVQ1;
-            psz_name = "SVQ-1 (Sorenson Video v1)";
-            break;
-#if LIBAVCODEC_BUILD >= 4666
-        case FOURCC_SVQ3:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_SVQ3;
-            psz_name = "SVQ-3 (Sorenson Video v3)";
-            break;
+
+#if ( !defined( WORDS_BIGENDIAN ) )
+    /* Asus Video (Another thing that doesn't work on PPC) */
+    { 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
 
-        case FOURCC_DIVX:
-        case FOURCC_divx:
-        case FOURCC_MP4S:
-        case FOURCC_mp4s:
-        case FOURCC_M4S2:
-        case FOURCC_m4s2:
-        case FOURCC_xvid:
-        case FOURCC_XVID:
-        case FOURCC_XviD:
-        case FOURCC_DX50:
-        case FOURCC_mp4v:
-        case FOURCC_4:
-        /* 3iv1 is unsupported by ffmpeg
-           putting it here gives extreme distorted images
-        case FOURCC_3IV1:
-        case FOURCC_3iv1:
-        */
-        case FOURCC_3IV2:
-        case FOURCC_3iv2:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MPEG4;
-            psz_name = "MPEG-4";
-            break;
-/* FIXME FOURCC_H263P exist but what fourcc ? */
-        case FOURCC_H263:
-        case FOURCC_h263:
-        case FOURCC_U263:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_H263;
-            psz_name = "H263";
-            break;
-
-        case FOURCC_I263:
-        case FOURCC_i263:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_H263I;
-            psz_name = "I263.I";
-            break;
-        case FOURCC_WMV1:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_WMV1;
-            psz_name ="Windows Media Video 1";
-            break;
-        case FOURCC_WMV2:
-        case FOURCC_MSS1:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_WMV2;
-            psz_name ="Windows Media Video 2";
-            break;
-        case FOURCC_MJPG:
-        case FOURCC_mjpg:
-        case FOURCC_mjpa:
-        case FOURCC_jpeg:
-        case FOURCC_JPEG:
-        case FOURCC_JFIF:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MJPEG;
-            psz_name = "Motion JPEG";
-            break;
-        case FOURCC_mjpb:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_MJPEGB;
-            psz_name = "Motion JPEG B";
-            break;
-        case FOURCC_dvsl:
-        case FOURCC_dvsd:
-        case FOURCC_DVSD:
-        case FOURCC_dvhd:
-        case FOURCC_dvc:
-        case FOURCC_dvp:
-            i_cat = VIDEO_ES;
-            i_codec = CODEC_ID_DVVIDEO;
-            psz_name = "DV video";
-            break;
-
-        case FOURCC_MAC3:
-            i_cat = AUDIO_ES;
-            i_codec = CODEC_ID_MACE3;
-            psz_name = "MACE-3 audio";
-            break;
-        case FOURCC_MAC6:
-            i_cat = AUDIO_ES;
-            i_codec = CODEC_ID_MACE6;
-            psz_name = "MACE-6 audio";
-            break;
-        case FOURCC_dvau:
-            i_cat = AUDIO_ES;
-            i_codec = CODEC_ID_DVAUDIO;
-            psz_name = "DV audio";
-            break;
-
-        case FOURCC_WMA1:
-        case FOURCC_wma1:
-            i_cat = AUDIO_ES;
-            i_codec = CODEC_ID_WMAV1;
-            psz_name ="Windows Media Audio 1";
-            break;
-        case FOURCC_WMA2:
-        case FOURCC_wma2:
-            i_cat = AUDIO_ES;
-            i_codec = CODEC_ID_WMAV2;
-            psz_name ="Windows Media Audio 2";
-            break;
-
-#if( ( LIBAVCODEC_BUILD >= 4663 ) && ( !defined( WORDS_BIGENDIAN ) ) )
-        /* Quality of this decoder on ppc is not good */
-	case FOURCC_IV31:
-        case FOURCC_iv31:
-        case FOURCC_IV32:
-        case FOURCC_iv32:
-            i_cat    = VIDEO_ES;
-            i_codec  = CODEC_ID_INDEO3;
-            psz_name = "Indeo v3";
-            break;
+    /* FFMPEG Video 1 (lossless codec) */
+    { VLC_FOURCC('F','F','V','1'), CODEC_ID_FFV1,
+      VIDEO_ES, "FFMpeg Video 1" },
+
+    /* ATI VCR1 */
+    { VLC_FOURCC('V','C','R','1'), CODEC_ID_VCR1,
+      VIDEO_ES, "ATI VCR1 Video" },
+
+    /* Cirrus Logic AccuPak */
+    { VLC_FOURCC('C','L','J','R'), CODEC_ID_CLJR,
+      VIDEO_ES, "Creative Logic AccuPak" },
+
+    /* 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 */
+    { 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" },
+
+    /* Cinepak */
+    { 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
 
-#if LIBAVCODEC_BUILD >= 4668
-	/* Not yet finished 
-        case FOURCC_vp31:
-	case FOURCC_VP31:
-	    i_cat    = VIDEO_ES;
-	    i_codec  = CODEC_ID_VP3;
-	    psz_name = "On2's VP3 Video";
-	    break;
-
-        case FOURCC_asv1:
-        case FOURCC_ASV1:
-            i_cat    = VIDEO_ES;
-            i_codec  = CODEC_ID_ASV1;
-            psz_name = "Asus V1";
-            break; */
+    /* 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
 
-        default:
-            i_cat = UNKNOWN_ES;
-            i_codec = CODEC_ID_NONE;
-            psz_name = NULL;
-            break;
-    }
+    /* Interplay MVE */
+    { VLC_FOURCC('i','m','v','e'), CODEC_ID_INTERPLAY_VIDEO,
+      VIDEO_ES, "Interplay MVE Video" },
 
-    if( i_codec != CODEC_ID_NONE )
+    /* 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
+
+#if LIBAVCODEC_BUILD >= 4719
+    /* FFMPEG's SNOW wavelet codec */
+    { VLC_FOURCC('S','N','O','W'), CODEC_ID_SNOW,
+      VIDEO_ES, "FFMpeg SNOW wavelet Video" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4752
+    { VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW,
+      VIDEO_ES, "Apple QuickDraw Video" },
+
+    { VLC_FOURCC('Q','P','E','G'), CODEC_ID_QPEG,
+      VIDEO_ES, "QPEG Video" },
+    { VLC_FOURCC('Q','1','.','0'), CODEC_ID_QPEG,
+      VIDEO_ES, "QPEG Video" },
+    { VLC_FOURCC('Q','1','.','1'), CODEC_ID_QPEG,
+      VIDEO_ES, "QPEG Video" },
+
+    { VLC_FOURCC('U','L','T','I'), CODEC_ID_ULTI,
+      VIDEO_ES, "IBM Ultimotion Video" },
+
+    { VLC_FOURCC('V','I','X','L'), CODEC_ID_VIXL,
+      VIDEO_ES, "Miro/Pinnacle VideoXL Video" },
+
+    { VLC_FOURCC('L','O','C','O'), CODEC_ID_LOCO,
+      VIDEO_ES, "LOCO Video" },
+
+    { VLC_FOURCC('W','N','V','1'), CODEC_ID_WNV1,
+      VIDEO_ES, "Winnov WNV1 Video" },
+
+    { VLC_FOURCC('A','A','S','C'), CODEC_ID_AASC,
+      VIDEO_ES, "Autodesc RLE Video" },
+#endif
+#if LIBAVCODEC_BUILD >= 4753
+    { VLC_FOURCC('I','V','2','0'), CODEC_ID_INDEO2,
+      VIDEO_ES, "Indeo Video v2" },
+    { VLC_FOURCC('R','T','2','1'), CODEC_ID_INDEO2,
+      VIDEO_ES, "Indeo Video v2" },
+#endif
+
+    /*
+     *  Image codecs
+     */
+
+#if LIBAVCODEC_BUILD >= 4731
+    { VLC_FOURCC('p','n','g',' '), CODEC_ID_PNG,
+      VIDEO_ES, "PNG Image" },
+    { VLC_FOURCC('p','p','m',' '), CODEC_ID_PPM,
+      VIDEO_ES, "PPM Image" },
+    { VLC_FOURCC('p','g','m',' '), CODEC_ID_PGM,
+      VIDEO_ES, "PGM Image" },
+    { VLC_FOURCC('p','g','m','y'), CODEC_ID_PGMYUV,
+      VIDEO_ES, "PGM YUV Image" },
+    { VLC_FOURCC('p','a','m',' '), CODEC_ID_PAM,
+      VIDEO_ES, "PAM Image" },
+#endif
+
+    /*
+     *  Audio Codecs
+     */
+
+    /* Windows Media Audio 1 */
+    { 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 */
+    { 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 */
+    { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
+      AUDIO_ES, "DV Audio" },
+
+    /* MACE-3 Audio */
+    { VLC_FOURCC('M','A','C','3'), CODEC_ID_MACE3,
+      AUDIO_ES, "MACE-3 Audio" },
+
+    /* MACE-6 Audio */
+    { VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6,
+      AUDIO_ES, "MACE-6 Audio" },
+
+    /* RealAudio 1.0 */
+    { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
+      AUDIO_ES, "RealAudio 1.0" },
+
+    /* RealAudio 2.0 */
+    { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
+      AUDIO_ES, "RealAudio 2.0" },
+
+    /* MPEG Audio layer 1/2/3 */
+    { 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) */
+    { 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)" },
+
+#if LIBAVCODEC_BUILD >= 4719
+    /* DTS Audio */
+    { VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS,
+      AUDIO_ES, "DTS Audio" },
+#endif
+
+    /* AAC audio */
+    { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC,
+      AUDIO_ES, "MPEG AAC Audio" },
+
+    /* 4X Technologies */
+    { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM,
+      AUDIO_ES, "4X Technologies Audio" },
+
+    /* Interplay DPCM */
+    { VLC_FOURCC('i','d','p','c'), CODEC_ID_INTERPLAY_DPCM,
+      AUDIO_ES, "Interplay DPCM Audio" },
+
+    /* Id RoQ */
+    { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
+      AUDIO_ES, "Id RoQ DPCM Audio" },
+
+#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
+
+#if LIBAVCODEC_BUILD >= 4706
+    /* G.726 ADPCM */
+    { VLC_FOURCC('g','7','2','6'), CODEC_ID_ADPCM_G726,
+      AUDIO_ES, "G.726 ADPCM Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4683
+    /* AMR */
+    { VLC_FOURCC('s','a','m','r'), CODEC_ID_AMR_NB,
+      AUDIO_ES, "AMR narrow band" },
+    { VLC_FOURCC('s','a','w','b'), CODEC_ID_AMR_WB,
+      AUDIO_ES, "AMR wide band" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4703
+    /* FLAC */
+    { VLC_FOURCC('f','l','a','c'), CODEC_ID_FLAC,
+      AUDIO_ES, "FLAC (Free Lossless Audio Codec)" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4745
+    /* ALAC */
+    { VLC_FOURCC('a','l','a','c'), CODEC_ID_ALAC,
+      AUDIO_ES, "Apple Lossless Audio Codec" },
+#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 )
+{
+    int i;
+
+    for( i = 0; codecs_table[i].i_fourcc != 0; i++ )
     {
-        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 );
-    }
+        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_FALSE );
+            return VLC_TRUE;
+        }
+    }
+    return VLC_FALSE;
 }
 
+int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat,
+                      vlc_fourcc_t *pi_fourcc, char **ppsz_name )
+{
+    int i;
 
+    for( i = 0; codecs_table[i].i_codec != 0; i++ )
+    {
+        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;
+        }
+    }
+    return VLC_FALSE;
+}