* ffmpeg: remove some #ifdef (you need at least libavcodec build >= 4655)

and use ffmpeg postprocessing instead of vlc builtins. (It's a lot faster).

modules/codec/ffmpeg/audio.c

@@ -2,7 +2,7 @@
  * audio.c: audio decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: audio.c,v 1.14 2003/02/07 01:22:55 fenrir Exp $
+ * $Id: audio.c,v 1.15 2003/04/17 10:58:30 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -105,9 +105,7 @@ int E_( InitThread_Audio )( adec_thread_t *p_adec )
     /* ***** Fill p_context with init values ***** */
     p_adec->p_context->sample_rate = p_wf->nSamplesPerSec;
     p_adec->p_context->channels = p_wf->nChannels;
-#if LIBAVCODEC_BUILD >= 4618
     p_adec->p_context->block_align = p_wf->nBlockAlign;
-#endif
     p_adec->p_context->bit_rate = p_wf->nAvgBytesPerSec * 8;
 
     if( ( p_adec->p_context->extradata_size = p_wf->cbSize ) > 0 )

modules/codec/ffmpeg/ffmpeg.c

@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.29 2003/04/16 00:12:36 fenrir Exp $
+ * $Id: ffmpeg.c,v 1.30 2003/04/17 10:58:30 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -40,9 +40,19 @@
 
 #include "avcodec.h" /* ffmpeg */
 
-#include "postprocessing/postprocessing.h"
+#if LIBAVCODEC_BUILD < 4655
+#   error You must have a libavcodec >= 4655 (get CVS)
+#endif
+
 
 #include "ffmpeg.h"
+
+#ifdef LIBAVCODEC_PP
+#   include "libpostproc/postprocess.h"
+#else
+#   include "postprocessing/postprocessing.h"
+#endif
+
 #include "video.h" // video ffmpeg specific
 #include "audio.h" // audio ffmpeg specific
 
@@ -77,8 +87,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
 
 #define POSTPROCESSING_Q_LONGTEXT \
     "Quality of post processing\n"\
-    "Valid range is 0 to 6\n" \
-    "(Overridden by others setting)"
+    "Valid range is 0 to 6"
 
 #define POSTPROCESSING_AQ_LONGTEXT \
     "Post processing quality is selected upon time left " \
@@ -95,26 +104,63 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
     "32 ac vlc" \
     "64 Qpel chroma"
 
+/* FIXME (cut/past from ffmpeg */
+#define LIBAVCODEC_PP_LONGHELP \
+"<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"
+
 vlc_module_begin();
     add_category_hint( N_("ffmpeg"), NULL, VLC_FALSE );
-#if LIBAVCODEC_BUILD >= 4615
     add_bool( "ffmpeg-dr", 0, NULL,
               "direct rendering",
               "direct rendering", VLC_TRUE );
-#endif
-#if LIBAVCODEC_BUILD >= 4611
     add_integer ( "ffmpeg-error-resilience", -1, NULL,
                   "error resilience", ERROR_RESILIENCE_LONGTEXT, VLC_TRUE );
     add_integer ( "ffmpeg-workaround-bugs", 1, NULL,
                   "workaround bugs", WORKAROUND_BUGS_LONGTEXT, VLC_FALSE );
-#endif
     add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT, VLC_FALSE );
 
     add_category_hint( N_("Post processing"), NULL, VLC_FALSE );
-    add_module( "ffmpeg-pp", "postprocessing",NULL, NULL,
-                N_( "ffmpeg postprocessing module" ), NULL, VLC_FALSE );
+
     add_integer( "ffmpeg-pp-q", 0, NULL,
                  "post processing quality", POSTPROCESSING_Q_LONGTEXT, VLC_FALSE );
+#ifdef LIBAVCODEC_PP
+    add_string( "ffmpeg-pp-name", "default", NULL,
+                "ffmpeg postproc filter chains", LIBAVCODEC_PP_LONGHELP, VLC_TRUE );
+#else
+    add_module( "ffmpeg-pp", "postprocessing",NULL, NULL,
+                N_( "ffmpeg postprocessing module" ), NULL, VLC_FALSE );
     add_bool( "ffmpeg-pp-auto", 0, NULL,
               "auto-level Post processing quality", POSTPROCESSING_AQ_LONGTEXT, VLC_FALSE );
     add_bool( "ffmpeg-db-yv", 0, NULL,
@@ -135,7 +181,7 @@ vlc_module_begin();
     add_bool( "ffmpeg-dr-c", 0, NULL,
               "force chrominance deringing",
               "force chrominance deringing (override other settings)", VLC_TRUE );
-
+#endif
     set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     set_capability( "decoder", 70 );
     set_callbacks( OpenDecoder, NULL );
@@ -275,12 +321,7 @@ static int InitThread( generic_thread_t *p_decoder )
     }
 
      /* *** Get a p_context *** */
-#if LIBAVCODEC_BUILD >= 4624
     p_decoder->p_context = avcodec_alloc_context();
-#else
-    p_decoder->p_context = malloc( sizeof( AVCodecContext ) );
-    memset( p_decoder->p_context, 0, sizeof( AVCodecContext ) );
-#endif
 
     switch( p_decoder->i_cat )
     {
@@ -399,7 +440,6 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             psz_name = "MPEG-1/2 Video";
             break;
 #endif
-#if LIBAVCODEC_BUILD >= 4608
         case FOURCC_DIV1:
         case FOURCC_div1:
         case FOURCC_MPG4:
@@ -417,7 +457,6 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_codec = CODEC_ID_MSMPEG4V2;
             psz_name = "MS MPEG-4 v2";
             break;
-#endif
 
         case FOURCC_MPG3:
         case FOURCC_mpg3:
@@ -437,21 +476,15 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
         case FOURCC_3IVD:
         case FOURCC_3ivd:
             i_cat = VIDEO_ES;
-#if LIBAVCODEC_BUILD >= 4608
             i_codec = CODEC_ID_MSMPEG4V3;
-#else
-            i_codec = CODEC_ID_MSMPEG4;
-#endif
             psz_name = "MS MPEG-4 v3";
             break;
 
-#if LIBAVCODEC_BUILD >= 4615
         case FOURCC_SVQ1:
             i_cat = VIDEO_ES;
             i_codec = CODEC_ID_SVQ1;
             psz_name = "SVQ-1 (Sorenson Video v1)";
             break;
-#endif
 
         case FOURCC_DIVX:
         case FOURCC_divx:
@@ -512,13 +545,11 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_codec = CODEC_ID_MJPEG;
             psz_name = "Motion JPEG";
             break;
-#if LIBAVCODEC_BUILD >= 4640
         case FOURCC_mjpb:
             i_cat = VIDEO_ES;
             i_codec = CODEC_ID_MJPEGB;
             psz_name = "Motion JPEG B";
             break;
-#endif
         case FOURCC_dvsl:
         case FOURCC_dvsd:
         case FOURCC_DVSD:
@@ -530,7 +561,6 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             psz_name = "DV video";
             break;
 
-#if LIBAVCODEC_BUILD >= 4655
         case FOURCC_MAC3:
             i_cat = AUDIO_ES;
             i_codec = CODEC_ID_MACE3;
@@ -546,9 +576,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_codec = CODEC_ID_DVAUDIO;
             psz_name = "DV audio";
             break;
-#endif
 
-#if LIBAVCODEC_BUILD >= 4632
         case FOURCC_WMA1:
         case FOURCC_wma1:
             i_cat = AUDIO_ES;
@@ -561,7 +589,6 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
             i_codec = CODEC_ID_WMAV2;
             psz_name ="Windows Media Audio 2";
             break;
-#endif
 
 #if LIBAVCODEC_BUILD >= 4663
         case FOURCC_IV31:

modules/codec/ffmpeg/ffmpeg.h

@@ -2,7 +2,7 @@
  * ffmpeg_vdec.h: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ffmpeg.h,v 1.16 2003/04/16 00:12:36 fenrir Exp $
+ * $Id: ffmpeg.h,v 1.17 2003/04/17 10:58:30 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  * 
@@ -47,6 +47,12 @@ typedef struct generic_thread_s
 
 } generic_thread_t;
 
+#if LIBAVCODEC_BUILD >= 4663
+#   define LIBAVCODEC_PP
+#else
+#   undef  LIBAVCODEC_PP
+#endif
+
 #define GetWLE( p ) \
     ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) )
 

modules/codec/ffmpeg/video.h

@@ -2,7 +2,7 @@
  * video.h: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video.h,v 1.6 2002/12/10 10:22:04 fenrir Exp $
+ * $Id: video.h,v 1.7 2003/04/17 10:58:30 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -20,25 +20,24 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
-#if LIBAVCODEC_BUILD >= 4641 && LIBAVCODEC_BUILD < 4645
-#   define AVFrame AVVideoFrame
-#endif
 
 typedef struct vdec_thread_s
 {
     DECODER_THREAD_COMMON
-#if LIBAVCODEC_BUILD >= 4641
+
     AVFrame        *p_ff_pic;
-#else
-    AVPicture           ff_pic, *p_ff_pic;
-#endif
     BITMAPINFOHEADER    *p_format;
 
     vout_thread_t       *p_vout;
 
     /* for post processing */
-    u32                 i_pp_mode; /* valid only with I420 and YV12 */
+#ifdef LIBAVCODEC_PP
+    pp_context_t        *pp_context;
+    pp_mode_t           *pp_mode;
+#else
+    uint32_t            i_pp_mode; /* valid only with I420 and YV12 */
     postprocessing_t    *p_pp;
+#endif
 
     /* for frame skipping algo */
     int b_hurry_up;