Changeset c0662427d22a4c90a57a051a46a552eaef1f31bf

Timestamp:

03/06/08 12:29:48 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212488988 +0200

git-parent:

[1ce62168f30a42924db2535fe8c499e1eae5d2bb]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212487310 +0200

Message:

Img resample based module (functionality untested ... but compilation and loading works). Remove unneeded stuff from swscale.

Files:

• configure.ac (modified) (2 diffs)
• modules/codec/ffmpeg/Modules.am (modified) (3 diffs)
• modules/codec/ffmpeg/chroma.c (modified) (7 diffs)
• modules/codec/ffmpeg/imgresample.c (added)
• modules/codec/ffmpeg/scale.c (modified) (1 diff)
• modules/codec/ffmpeg/swscale.c (modified) (3 diffs)
• modules/codec/ffmpeg/video_filter.c (modified) (2 diffs)

configure.ac

@@ -3009 +3009 @@
-      CPPFLAGS="${CPPFLAGS} ${IMGRESAMPLE_CFLAGS}"
-      CFLAGS="${CFLAGS} ${IMGRESAMPLE_CFLAGS}"
-      LIBS="${CFLAGS} ${IMGRESAMPLE_LIBS}"
-      AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
-      AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
@@ -3023 +3022 @@
-            AC_MSG_ERROR([swscale (and its fallback module imgresample) support will be missing. Use --disable-swscale to ignore this error. (This basically means that you will be missing any good software scaling module and some video chroma converters.)])
-          fi
-
+,${IMGRESAMPLE_LIBS}
-      VLC_RESTORE_FLAGS
-    ],[

modules/codec/ffmpeg/Modules.am

@@ -32 +32 @@
-    swscale.c \
-    swscale.h \
-    video_filter.c \
-    chroma.c \
-    scale.c \
-    $(NULL)
-
-# FIXME
-SOURCES_imgresample = \
-
-
-
-
-
+
+
+
+
-    $(NULL)
-
@@ -54 +50 @@
-    $(LTLIBavformat) \
-    $(LTLIBswscale) \
+    $(LTLIBimgresample) \
-    $(LTLIBpostproc)
-
@@ -60 +57 @@
-    libavformat_plugin.la \
-    libswscale_plugin.la \
+    libimgresample_plugin.la \
-    libpostproc_plugin.la
-

modules/codec/ffmpeg/chroma.c

@@ -2 +2 @@
- * chroma.c: chroma conversion using ffmpeg library
- *****************************************************************************
-1
+8
- * $Id$
- *
@@ -32 +32 @@
-#include <vlc_common.h>
-#include <vlc_vout.h>
-
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H)
-#include <vlc_filter.h>
-#endif
-
-/* ffmpeg header */
@@ -48 +45 @@
-#include "ffmpeg.h"
-
-
-void ChromaConversion( vout_thread_t *, picture
+
+picture_t *ChromaConversion_Filter( filter
-
-/*****************************************************************************
@@ -88 +85 @@
-    }
-
-_io = ChromaConversion
+ = ChromaConversion_Filter
-
-    p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
@@ -96 +93 @@
-    }
-
-.p_sys->i_src_vlc_chroma = p_vout->render
-vout->output
+p_sys->i_src_vlc_chroma = p_filter->fmt_in.video
+filter->fmt_out.video
-    p_filter->p_sys->i_src_ffmpeg_chroma = i_ffmpeg_chroma[0];
-    p_filter->p_sys->i_dst_ffmpeg_chroma = i_ffmpeg_chroma[1];
@@ -126 +123 @@
-}
-
+VIDEO_FILTER_WRAPPER( ChromaConversion )
+
-/*****************************************************************************
- * ChromaConversion: actual chroma conversion function
@@ -201 +200 @@
-    free( p_filter->p_sys );
-}
-#endif

modules/codec/ffmpeg/scale.c

@@ -52 +52 @@
-
-/* Version checking */
-( (defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H)) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)) 
+LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0
-
-/*****************************************************************************

modules/codec/ffmpeg/swscale.c

@@ -50 +50 @@
-#include "ffmpeg.h"
-
-#ifdef HAVE_POSTPROC_POSTPROCESS_H
-#    include <postproc/postprocess.h>
-#else
-#    include <libpostproc/postprocess.h>
-#endif
-
-/*****************************************************************************
- * decoder_sys_t: decoder descriptor
- *****************************************************************************/
-struct decoder_sys_t
-{
-    /* Common part between video and audio decoder */
-    FFMPEG_COMMON_MEMBERS
-};
-
-/****************************************************************************
- * Local prototypes
@@ -79 +64 @@
- *****************************************************************************/
-vlc_module_begin();
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H)
-    /* video filter submodule */
-    set_description( N_("Video scaling filter") );
-    set_capability( "video filter2", 1000 );
@@ -88 +71 @@
-    add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true );
-        change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
-
-#else
-    /* video filter submodule */
-    set_capability( "video filter2", 50 );
-    set_callbacks( OpenFilter, CloseFilter );
-    set_description( N_("FFmpeg video filter") );
-
-    /* crop/padd submodule */
-    add_submodule();
-    set_capability( "crop padd", 10 );
-    set_callbacks( OpenCropPadd, CloseFilter );
-    set_description( N_("FFmpeg crop padd filter") );
-
-    /* chroma conversion submodule */
-    add_submodule();
-    set_capability( "chroma", 50 );
-    set_callbacks( OpenChroma, CloseChroma );
-    set_description( N_("FFmpeg chroma conversion") );
-#endif
-vlc_module_end();
-

modules/codec/ffmpeg/video_filter.c

@@ -46 +46 @@
-#include "ffmpeg.h"
-
-#if !defined(HAVE_LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_FFMPEG_SWSCALE_H)
-static int CheckInit( filter_t *p_filter );
-static picture_t *Process( filter_t *p_filter, picture_t *p_pic );
@@ -565 +564 @@
-    return p_pic_dst;
-}
-#endif /* ( (defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H) */