Changeset 3a49e9f3cae6e766766fbf81ed9239a6e475be7e

Timestamp:

06/03/08 15:19:37 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[11aac010aca2776806eeee5f95fbdf6b87e751be]

git-author:

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

Message:

Split should now be complete (postproc still needs to be fixed).

Files:

• modules/codec/ffmpeg/Modules.am (modified) (2 diffs)
• modules/codec/ffmpeg/avcodec.c (modified) (3 diffs)
• modules/codec/ffmpeg/avcodec.h (modified) (1 diff)
• modules/codec/ffmpeg/avformat.c (modified) (2 diffs)
• modules/codec/ffmpeg/avutil.h (added)
• modules/codec/ffmpeg/imgresample.c (modified) (2 diffs)
• modules/codec/ffmpeg/mux.c (modified) (4 diffs)
• modules/codec/ffmpeg/swscale.c (modified) (1 diff)
• modules/codec/ffmpeg/video.c (modified) (1 diff)

modules/codec/ffmpeg/Modules.am

@@ -5 +5 @@
-    audio.c \
-    deinterlace.c \
+    avutil.h \
-    fourcc.h \
-    chroma.h \
@@ -21 +22 @@
-    avformat.h \
-    demux.c \
+    avutil.h \
-    fourcc.h \
-    chroma.h \

modules/codec/ffmpeg/avcodec.c

@@ -50 +50 @@
-#include "avcodec.h"
-#include "fourcc.h"
+#include "avutil.h"
-
-/*****************************************************************************
@@ -334 +335 @@
-}
-
-/*****************************************************************************
- *
- *****************************************************************************/
-void LibavcodecCallback( void *p_opaque, int i_level,
-                             const char *psz_format, va_list va )
-{
-    int i_vlc_level;
-    AVCodecContext *p_avctx = (AVCodecContext *)p_opaque;
-    AVClass *p_avc;
-    vlc_object_t *p_this;
-    char *psz_new_format;
-    const char *psz_item_name;
-
-    p_avc = p_avctx ? p_avctx->av_class : 0;
-
-#define cln p_avc->class_name
-    /* Make sure we can get p_this back */
-    if( !p_avctx || !p_avc || !cln ||
-        cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' ||
-        cln[4]!='d' || cln[5]!='e' || cln[6]!='c' )
-    {
-        if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va );
-        return;
-    }
-#undef cln
-
-    p_this = (vlc_object_t *)p_avctx->opaque;
-
-    switch( i_level )
-    {
-    case AV_LOG_QUIET:
-        i_vlc_level = VLC_MSG_ERR;
-        break;
-    case AV_LOG_ERROR:
-        i_vlc_level = VLC_MSG_WARN;
-        break;
-    case AV_LOG_INFO:
-        i_vlc_level = VLC_MSG_DBG;
-        break;
-    case AV_LOG_DEBUG:
-        /* Print debug messages if they were requested */
-        if( p_avctx->debug ) vfprintf( stderr, psz_format, va );
-        return;
-    default:
-        return;
-    }
-
-    psz_item_name = p_avc->item_name(p_opaque);
-    psz_new_format = malloc( strlen(psz_format) + strlen(psz_item_name)
-                              + 18 + 5 );
-    snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
-              + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
-    msg_GenericVa( p_this, i_vlc_level,
-                    MODULE_STRING, psz_new_format, va );
-    free( psz_new_format );
-}
-
-void InitLibavcodec( vlc_object_t *p_object )
-{
@@ -401 +345 @@
-        avcodec_init();
-        avcodec_register_all();
-codec
+util
-        b_ffmpeginit = 1;
-

modules/codec/ffmpeg/avcodec.h

@@ -21 +21 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include <vlc_codecs.h>                               /* BITMAPINFOHEADER */
-
-picture_t * DecodeVideo    ( decoder_t *, block_t ** );

modules/codec/ffmpeg/avformat.c

@@ -35 +35 @@
-
-/* ffmpeg header */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-#endif
-
@@ -71 +64 @@
-#endif
-vlc_module_end();
-
-/*****************************************************************************
- *
- *****************************************************************************/
-void LibavcodecCallback( void *p_opaque, int i_level,
-                             const char *psz_format, va_list va )
-{
-    int i_vlc_level;
-    AVCodecContext *p_avctx = (AVCodecContext *)p_opaque;
-    AVClass *p_avc;
-    vlc_object_t *p_this;
-    char *psz_new_format;
-    const char *psz_item_name;
-
-    p_avc = p_avctx ? p_avctx->av_class : 0;
-
-#define cln p_avc->class_name
-    /* Make sure we can get p_this back */
-    if( !p_avctx || !p_avc || !cln ||
-        cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' ||
-        cln[4]!='d' || cln[5]!='e' || cln[6]!='c' )
-    {
-        if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va );
-        return;
-    }
-#undef cln
-
-    p_this = (vlc_object_t *)p_avctx->opaque;
-
-    switch( i_level )
-    {
-    case AV_LOG_QUIET:
-        i_vlc_level = VLC_MSG_ERR;
-        break;
-    case AV_LOG_ERROR:
-        i_vlc_level = VLC_MSG_WARN;
-        break;
-    case AV_LOG_INFO:
-        i_vlc_level = VLC_MSG_DBG;
-        break;
-    case AV_LOG_DEBUG:
-        /* Print debug messages if they were requested */
-        if( p_avctx->debug ) vfprintf( stderr, psz_format, va );
-        return;
-    default:
-        return;
-    }
-
-    psz_item_name = p_avc->item_name(p_opaque);
-    psz_new_format = malloc( strlen(psz_format) + strlen(psz_item_name)
-                              + 18 + 5 );
-    snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
-              + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
-    msg_GenericVa( p_this, i_vlc_level,
-                    MODULE_STRING, psz_new_format, va );
-    free( psz_new_format );
-}
-
-void InitLibavcodec( vlc_object_t *p_object )
-{
-    static int b_ffmpeginit = 0;
-    vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
-
-    /* *** init ffmpeg library (libavcodec) *** */
-    if( !b_ffmpeginit )
-    {
-        avcodec_init();
-        avcodec_register_all();
-        av_log_set_callback( LibavcodecCallback );
-        b_ffmpeginit = 1;
-
-        msg_Dbg( p_object, "libavcodec initialized (interface %d )",
-                 LIBAVCODEC_VERSION_INT );
-    }
-    else
-    {
-        msg_Dbg( p_object, "libavcodec already initialized" );
-    }
-
-    vlc_mutex_unlock( lock );
-}

modules/codec/ffmpeg/imgresample.c

@@ -1 +1 @@
-/*****************************************************************************
-ffmpeg.c: video decoder using ffmpeg library
+imageresample.c: scaling and chroma conversion using the old libavcodec API
- *****************************************************************************
- * Copyright (C) 1999-2001 the VideoLAN team
@@ -34 +34 @@
-#include <vlc_codec.h>
-
-/* ffmpeg header */
-#define HAVE_MMX 1
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-#   include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-#   include <ffmpeg/avcodec.h>
-#else
-#   include <avcodec.h>
-#endif
-
-#if LIBAVCODEC_BUILD < 5000
-#   error You must have a libavcodec >= 5000 (get CVS)
-#endif
-
-#include "imgresample.h"
-
-/****************************************************************************
- * Local prototypes
- ****************************************************************************/
-static const int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *const ppsz_mode_descriptions[] =
-{ N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"),
-  N_("Experimental"), N_("Nearest neighbour (bad quality)"),
-  N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
-  N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
-
-/*****************************************************************************

modules/codec/ffmpeg/mux.c

@@ -43 +43 @@
-#include "avformat.h"
-#include "fourcc.h"
+#include "avutil.h"
-
-//#define AVFORMAT_DEBUG 1
-
-/* Version checking */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H)
-
-static const char *const ppsz_mux_options[] = {
@@ -96 +94 @@
-    /* Should we call it only once ? */
-    av_register_all();
-codec
+util
-
-    config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg );
@@ -225 +223 @@
-    codec = stream->codec;
-
-codecCallback (ffmpeg.c
+utilCallback (avutil.h
-    codec->opaque = (void*)p_mux;
-
@@ -506 +504 @@
-    return 0;
-}
-
-#endif /* HAVE_FFMPEG_AVFORMAT_H */

modules/codec/ffmpeg/swscale.c

@@ -39 +39 @@
- ****************************************************************************/
-static const int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static 
+
-{ N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"),
-  N_("Experimental"), N_("Nearest neighbour (bad quality)"),

modules/codec/ffmpeg/video.c

@@ -34 +34 @@
-#include <vlc_vout.h>
-#include <vlc_input.h>                  /* hmmm, just for INPUT_RATE_DEFAULT */
+#include <vlc_codecs.h>                               /* BITMAPINFOHEADER */
-
-/* ffmpeg header */