Changeset a519caccb5a01a42700c664d69bb5ced218dafa1

Timestamp:

06/02/08 18:43:54 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[7f9999df31ecac9d34fcf98a6074776ab275b754]

git-author:

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

Message:

Split ffmpeg module in avcodec (decoders, encoders, deinterlacing), avformat (demuxers, muxers), swscale (scaling, chroma conversion) and postproc modules.

Files:

• configure.ac (modified) (3 diffs)
• modules/codec/ffmpeg/Modules.am (modified) (1 diff)
• modules/codec/ffmpeg/avcodec.c (added)
• modules/codec/ffmpeg/avformat.c (added)
• modules/codec/ffmpeg/chroma.c (modified) (2 diffs)
• modules/codec/ffmpeg/ffmpeg.c (deleted)
• modules/codec/ffmpeg/postproc.c (added)
• modules/codec/ffmpeg/swscale.c (added)
• modules/codec/ffmpeg/video.c (modified) (4 diffs)
• modules/codec/ffmpeg/video_filter.c (modified) (2 diffs)

configure.ac

@@ -193 +193 @@
-    VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
-    VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup])
-ffmpeg
+avcodec avformat swscale postproc
-    VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
-    VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation])
@@ -646 +646 @@
-])
-AC_CHECK_LIB(m,pow,[
-ffmpeg
+avcodec avformat swscale postproc
-])
-AC_CHECK_LIB(m,sqrt,[
@@ -2994 +2994 @@
-
-dnl
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    [
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
-     CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
-     AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h)
-     AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
-     AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h)
-     dnl newer ffmpeg have a separate libpostproc
-     PKG_CHECK_MODULES(POSTPROC, libpostproc,[
-       VLC_ADD_CFLAGS([ffmpeg],[${POSTPROC_CFLAGS}]) 
-       VLC_ADD_LIBS([ffmpeg],[${POSTPROC_LIBS}]) 
-       ])
-     CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
-     CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
-     AC_CHECK_HEADERS(postproc/postprocess.h)
-     VLC_ADD_PLUGIN([ffmpeg])
-     if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then
-        VLC_ADD_PLUGIN([stream_out_switcher])
-     fi
-     VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
-     VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}])
-
-     dnl even newer ffmpeg has a libswscale
-     PKG_CHECK_MODULES(SWSCALE,[libswscale],[
-       VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
-       VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
-       AC_CHECK_LIB(swscale, sws_getContext,
-         [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],
-         [AC_CHECK_LIB(avcodec,img_resample,[],
-            [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
-         [${FFMPEG_LIBS}])
-         ],
-         [${SWSCALE_LIBS}])
-    ],[AC_CHECK_LIB(avcodec,img_resample,[],
-        [AC_MSG_ERROR([Your FFmpeg library doesn't have the needed img_resample() function. You should rebuild it with software scaler disabled, or install the swscale headers.])],
-        [${FFMPEG_LIBS}])
-      ]
-    )
-    VLC_RESTORE_FLAGS
-
-  ],[
-
-    dnl
-    dnl last chance: at the default place
-    dnl
-      VLC_SAVE_FLAGS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-      VLC_RESTORE_FLAGS
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      VLC_RESTORE_FLAGS
+    ],[
+      AC_MSG_ERROR([Could not find libavformat, libavcodec or libavutil.])
+  ])
+fi
+
+dnl
+dnl  swscale image scaling and conversion plugin
+dnl
+
+AC_ARG_ENABLE(swscale,
+[  --enable-swscale    libswscale image scaling and conversion (default enabled)])
+if test "${enable_swscale}" != "no"
+then
+  PKG_CHECK_MODULES(SWSCALE,[libswscale, libavutil],
+    [
+      VLC_SAVE_FLAGS
+      CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
+      CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}"
+      AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h)
+      AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
+      VLC_ADD_PLUGIN([swscale])
+      VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS])
+      VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS])
+      VLC_RESTORE_FLAGS
+    ],[
+      AC_MSG_ERROR([Could not find libswscale or libavutil.])
+  ])
+fi
+
+dnl
+dnl  postproc plugin
+dnl
+
+AC_ARG_ENABLE(postproc,
+[  --enable-postproc   libpostproc image post-processing (default enabled)])
+if test "${enable_postproc}" != "no"
+then
+  PKG_CHECK_MODULES(POSTPROC,[libpostproc],
+    [
+      VLC_SAVE_FLAGS
+      CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
+      CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
+      AC_CHECK_HEADERS(libpostproc/postproc.h ffmpeg/postproc.h)
+      VLC_ADD_PLUGIN([postproc])
+      VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS])
+      VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS])
+      VLC_RESTORE_FLAGS
+    ],[
+      AC_MSG_ERROR([Could not find libpostproc.])
-  ])
-fi

modules/codec/ffmpeg/Modules.am

@@ -1 @@
-ffmpeg
-ffmpeg
-ffmpeg
+avcodec
+avcodec
+avcodec
-    video.c \
-    audio.c \
-    video_filter.c \
-    deinterlace.c \
-    chroma.c \
-    postprocess.c \
-    demux.c \
-    scale.c \
-    $(NULL)
-
-
+
+
+
+
+
+
-    encoder.c \
-    $(NULL)
-
+SOURCES_avformat = \
+    avformat.c \
+    avformat.h \
+    demux.c \
+    $(NULL)
+
-if ENABLE_SOUT
-ffmpeg += mux.c encoder
+avformat += mux
-endif
-libvlc_LTLIBRARIES += $(LTLIBffmpeg)
-EXTRA_LTLIBRARIES += libffmpeg_plugin.la
-
-
-
-
-
-
+
+
+
+
+
+
+
-    video_filter.c \
-    deinterlace.c \
-    chroma.c \
-    encoder.c \
-    postprocess.c \
-    demux.c \
-    mux.c \
-    scale.c \
-    $(NULL)
-
+SOURCES_postproc = \
+    postproc.c \
+    postprocess.c \
+    $(NULL)
+
+libvlc_LTLIBRARIES += \
+    $(LTLIBavcodec) \
+    $(LTLIBavformat) \
+    $(LTLIBswscale) \
+    $(LTLIBpostproc)
+
+EXTRA_LTLIBRARIES += \
+    libavcodec_plugin.la \
+    libavformat_plugin.la \
+    libswscale_plugin.la \
+    libpostproc_plugin.la
+
+# FIXME SOURCES_ffmpegaltivec = \
+# FIXME     ffmpeg.c \
+# FIXME     ffmpeg.h \
+# FIXME     video.c \
+# FIXME     audio.c \
+# FIXME     video_filter.c \
+# FIXME     deinterlace.c \
+# FIXME     chroma.c \
+# FIXME     encoder.c \
+# FIXME     postprocess.c \
+# FIXME     demux.c \
+# FIXME     mux.c \
+# FIXME     scale.c \
+# FIXME     $(NULL)
+

modules/codec/ffmpeg/chroma.c

@@ -49 +49 @@
-
-#if !defined(HAVE_LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_FFMPEG_SWSCALE_H)
-void InitLibavcodec ( vlc_object_t *p_object );
-static void ChromaConversion( vout_thread_t *, picture_t *, picture_t * );
-
@@ -124 +123 @@
-    }
-
-    /* libavcodec needs to be initialized for some chroma conversions */
-    InitLibavcodec(p_this);
-
-    return VLC_SUCCESS;
-}

modules/codec/ffmpeg/video.c

@@ -220 +220 @@
-    p_pic = p_dec->pf_vout_buffer_new( p_dec );
-
-
-
-
-
-
-
+// FIXME
+// FIXME
+// FIXME
+// FIXME
+// FIXME
+// FIXME
-
-    return p_pic;
@@ -362 +362 @@
-    p_sys->p_pp = NULL;
-    p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = false;
-
+// FIXME 
-
-    /* ffmpeg doesn't properly release old pictures when frames are skipped */
@@ -725 +725 @@
-
-    if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
-
+// FIXME 
-    free( p_sys->p_buffer_orig );
-}
@@ -820 +820 @@
-        int i_src_stride, i_dst_stride;
-
-
-
-
+// FIXME 
+// FIXME
+// FIXME 
-        {
-            for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )

modules/codec/ffmpeg/video_filter.c

@@ -47 +47 @@
-
-#if !defined(HAVE_LIBSWSCALE_SWSCALE_H)  && !defined(HAVE_FFMPEG_SWSCALE_H)
-void InitLibavcodec ( vlc_object_t *p_object );
-static int CheckInit( filter_t *p_filter );
-static picture_t *Process( filter_t *p_filter, picture_t *p_pic );
@@ -150 +149 @@
-             p_filter->fmt_out.video.i_width, p_filter->fmt_out.video.i_height,
-             (char *)&p_filter->fmt_out.video.i_chroma );
-
-    /* libavcodec needs to be initialized for some chroma conversions */
-    InitLibavcodec(p_this);
-
-    return VLC_SUCCESS;