Commit e49c0699 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

Rename everything from gst-ffmpeg to gst-libav

Also change elements factory names to avenc_*, avdec_*,
avmux_* and avdemux_*. The actual filenames, type names,
function/variable names are not touched to make merging
with 0.10 easier at this point. Once 0.10 is not supported
anymore everything should be renamed.
parent 4964bd75
......@@ -5,7 +5,7 @@ dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AC_INIT(GStreamer Libav, 0.11.89.1,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-ffmpeg)
gst-libav)
AG_GST_INIT
......@@ -208,42 +208,42 @@ if test "x$have_bz2" = "xno"; then
fi
AC_ARG_ENABLE(lgpl,
[AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-ffmpeg])])
AM_CONDITIONAL(GST_FFMPEG_ENABLE_LGPL, test "x$enable_lgpl" = "xyes")
[AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-libav])])
AM_CONDITIONAL(GST_LIBAV_ENABLE_LGPL, test "x$enable_lgpl" = "xyes")
if test "x$enable_lgpl" = "xyes"; then
AC_DEFINE([GST_FFMPEG_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-ffmpeg])
AC_DEFINE([GST_LIBAV_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-libav])
fi
dnl *** configure external libs ***
HAVE_FFMPEG_UNINSTALLED=1
HAVE_LIBAV_UNINSTALLED=1
AC_ARG_WITH(system-ffmpeg,
[AC_HELP_STRING([--with-system-ffmpeg], [use system Libav libraries])])
AC_ARG_WITH(system-libav,
[AC_HELP_STRING([--with-system-libav], [use system Libav libraries])])
if test "x$with_system_ffmpeg" = "xyes"; then
PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec libavutil)
if test "x$with_system_libav" = "xyes"; then
PKG_CHECK_MODULES(LIBAV, libavformat libavcodec libavutil)
if test "x$enable_lgpl" != "xyes"; then
PKG_CHECK_MODULES(POSTPROC, libpostproc libavcodec libavutil)
fi
PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
CPPFLAGS="$CPPFLAGS $LIBAV_CFLAGS"
AC_CHECK_HEADERS([avi.h])
CPPFLAGS="$saved_CPPFLAGS"
AC_DEFINE([FFMPEG_SOURCE], ["system install"], [Describes where the Libav libraries come from.])
HAVE_FFMPEG_UNINSTALLED=0
AC_DEFINE([LIBAV_SOURCE], ["system install"], [Describes where the Libav libraries come from.])
HAVE_LIBAV_UNINSTALLED=0
AC_MSG_NOTICE([Using system-installed FFMpeg code])
AC_MSG_WARN([
======================================================================
WARNING: you have chosen to build gst-ffmpeg against a random
WARNING: you have chosen to build gst-libav against a random
external version of Libav instead of building it against the tested
internal Libav snapshot that is included with gst-ffmpeg.
internal Libav snapshot that is included with gst-libav.
This is a very bad idea. So bad in fact that words cannot express
just how bad it is. Suffice to say that it is BAD.
The GStreamer developers cannot and will not support a gst-ffmpeg
The GStreamer developers cannot and will not support a gst-libav
built this way. Any bug reports that indicate there is an external
version of Libav involved will be closed immediately without further
investigation.
......@@ -251,15 +251,15 @@ if test "x$with_system_ffmpeg" = "xyes"; then
The reason such a setup can't be supported is that the Libav API
and ABI is in constant flux, yet there aren't any official releases
of the Libav library to develop against. This makes it impossible
to guarantee that gst-ffmpeg will work reliably, or even compile,
with a randomly picked version Libav. Even if gst-ffmpeg compiles
to guarantee that gst-libav will work reliably, or even compile,
with a randomly picked version Libav. Even if gst-libav compiles
and superficially appears to work fine against your chosen external
Libav version, that might just not be the case on other systems, or
even the same system at a later time, or when using decoders,
encoders, demuxers or muxers that have not been tested.
Please do not create or distribute binary packages of gst-Libav
that link against an external ffmpeg. Thank you!
that link against an external libav. Thank you!
======================================================================
])
......@@ -269,16 +269,16 @@ else
AC_MSG_NOTICE([Using local Libav snapshot])
dnl libgstffmpeg.la: include dirs
FFMPEG_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libavutil \
dnl libgstlibav.la: include dirs
LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libavutil \
-I \$(top_srcdir)/gst-libs/ext/libav/libavformat \
-I \$(top_srcdir)/gst-libs/ext/libav/libavcodec \
-I \$(top_srcdir)/gst-libs/ext/libav \
-I \$(top_builddir)/gst-libs/ext/libav \
-Wno-deprecated-declarations"
dnl libgstffmpeg.la: libs to statically link to
FFMPEG_LIBS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
dnl libgstlibav.la: libs to statically link to
LIBAV_LIBS="\$(top_builddir)/gst-libs/ext/libav/libavformat/libavformat.a \
\$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \
\$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
dnl
......@@ -304,47 +304,47 @@ else
SWSCALE_LIBS="\$(top_builddir)/gst-libs/ext/libav/libswscale/libswscale.a \
\$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
FFMPEG_SUBDIRS=gst-libs
LIBAV_SUBDIRS=gst-libs
AC_DEFINE(HAVE_AVI_H)
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
AC_DEFINE([LIBAV_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
AC_ARG_WITH(ffmpeg-extra-configure,
AC_HELP_STRING([--with-ffmpeg-extra-configure="xxx"],
[extra configure options for internal ffmpeg ./configure script]),,
with_ffmpeg_extra_configure=no)
AC_ARG_WITH(libav-extra-configure,
AC_HELP_STRING([--with-libav-extra-configure="xxx"],
[extra configure options for internal libav ./configure script]),,
with_libav=no)
# basic arguments
embffmpeg_configure_args="--prefix=$prefix"
emblibav_configure_args="--prefix=$prefix"
# Enable pic and static so that we get .a files, but with PIC code.
embffmpeg_configure_args="$embffmpeg_configure_args --disable-avserver --disable-avplay\
emblibav_configure_args="$emblibav_configure_args --disable-avserver --disable-avplay\
--disable-ffmpeg --disable-avprobe --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
--disable-network --disable-hwaccels --disable-filters --disable-doc\
--enable-optimizations"
if test "x$enable_lgpl" != "xyes"; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-postproc \
emblibav_configure_args="$emblibav_configure_args --enable-postproc \
--enable-gpl"
fi
# if we are cross-compiling, tell ffmpeg so
# if we are cross-compiling, tell libav so
target_os=`echo $host_os | sed 's/-gnu//'`
if test "x$cross_compiling" = xyes; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-cross-compile \
emblibav_configure_args="$emblibav_configure_args --enable-cross-compile \
--target-os=$target_os --arch=$host_cpu --cross-prefix=$host_alias-"
fi
case $host_os in
# Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds
# Unfortunately, in Mac OS 10.5 the current rev of libav builds
# some non-PIC code into the .a file. See
# http://trac.macosforge.org/projects/macports/ticket/13725 for more
# info.
darwin*)
embffmpeg_configure_args="$embffmpeg_configure_args --disable-mmx --disable-altivec"
emblibav_configure_args="$emblibav_configure_args --disable-mmx --disable-altivec"
;;
mingw32*)
embffmpeg_configure_args="$embffmpeg_configure_args --enable-memalign-hack"
emblibav_configure_args="$emblibav_configure_args --enable-memalign-hack"
WIN32_LIBS="-lws2_32"
;;
*)
......@@ -353,29 +353,29 @@ else
esac
dnl checks for extra enable/disable flags
FFMPEG_OPTS="(cd $srcdir/gst-libs/ext/libav && ./configure --help)"
# Let's check if we can disable the building of the ffmpeg binary
can_disable=`echo "$FFMPEG_OPTS" | grep 'disable-ffmpeg'`
LIBAV_OPTS="(cd $srcdir/gst-libs/ext/libav && ./configure --help)"
# Let's check if we can disable the building of the libav binary
can_disable=`echo "$LIBAV_OPTS" | grep 'disable-ffmpeg'`
if test "$can_disable" != ""; then
embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffmpeg"
emblibav_configure_args="$emblibav_configure_args --disable-ffmpeg"
fi
dnl check if libswscale needs enabling explicitly
can_enable=`echo "$FFMPEG_OPTS" | grep 'enable-swscale'`
can_enable=`echo "$LIBAV_OPTS" | grep 'enable-swscale'`
if test "$can_enable" != ""; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-swscale"
emblibav_configure_args="$emblibav_configure_args --enable-swscale"
fi
# append extra configure options to embffmpeg_configure_args if needed
if test "x$with_ffmpeg_extra_configure" != "xno"; then
embffmpeg_configure_args="$embffmpeg_configure_args $with_ffmpeg_extra_configure"
# append extra configure options to emblibav_configure_args if needed
if test "x$with_libav_extra_configure" != "xno"; then
emblibav_configure_args="$emblibav_configure_args $with_libav_extra_configure"
fi
AC_SUBST(FFMPEG_CO_DIR)
AC_SUBST(FFMPEG_SVN)
AC_SUBST(FFMPEG_REVISION)
AC_SUBST(FFMPEG_EXTERNALS_REVISION)
AC_CONFIG_COMMANDS([configure-embedded-ffmpeg],
[echo "Configuring included Libav instance with args $embffmpeg_configure_args"
AC_SUBST(LIBAV_CO_DIR)
AC_SUBST(LIBAV_SVN)
AC_SUBST(LIBAV_REVISION)
AC_SUBST(LIBAV_EXTERNALS_REVISION)
AC_CONFIG_COMMANDS([configure-embedded-libav],
[echo "Configuring included Libav instance with args $emblibav_configure_args"
origdir=`pwd`
dnl Don't put path on the configure call when not needed, as FFmpeg's configure relies on it
dnl to detect out-of-tree builds
......@@ -387,33 +387,33 @@ else
AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav])
cd "$ac_top_build_prefix"gst-libs/ext/libav &&
eval "$confcmd $embffmpeg_configure_args" ||
eval "$confcmd $emblibav_configure_args" ||
AC_MSG_ERROR([Failed to configure embedded Libav tree])
cd "$origdir"
],
[embffmpeg_configure_args="$embffmpeg_configure_args"])
[emblibav_configure_args="$emblibav_configure_args"])
AC_MSG_NOTICE([Using included Libav code])
fi
AC_SUBST(FFMPEG_CFLAGS)
AC_SUBST(FFMPEG_LIBS)
AC_SUBST(FFMPEG_SUBDIRS)
AC_SUBST(LIBAV_CFLAGS)
AC_SUBST(LIBAV_LIBS)
AC_SUBST(LIBAV_SUBDIRS)
AC_SUBST(POSTPROC_CFLAGS)
AC_SUBST(POSTPROC_LIBS)
AC_SUBST(SWSCALE_CFLAGS)
AC_SUBST(SWSCALE_LIBS)
AC_SUBST(WIN32_LIBS)
if test x$HAVE_FFMPEG_UNINSTALLED = x1; then
AC_DEFINE(HAVE_FFMPEG_UNINSTALLED, [], [Defined if building against uninstalled Libav source])
if test x$HAVE_LIBAV_UNINSTALLED = x1; then
AC_DEFINE(HAVE_LIBAV_UNINSTALLED, [], [Defined if building against uninstalled Libav source])
fi
AM_CONDITIONAL(HAVE_FFMPEG_UNINSTALLED, test x$HAVE_FFMPEG_UNINSTALLED = x1)
AM_CONDITIONAL(HAVE_LIBAV_UNINSTALLED, test x$HAVE_LIBAV_UNINSTALLED = x1)
AC_CONFIG_FILES(
Makefile
common/Makefile
common/m4/Makefile
gst-ffmpeg.spec
gst-libav.spec
ext/Makefile
ext/ffmpeg/Makefile
ext/libpostproc/Makefile
......
......@@ -4,7 +4,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
# The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
MODULE=gst-ffmpeg
MODULE=gst-libav
DOC_MODULE=$(MODULE)-plugins
# for upload-doc.mak
......
This diff is collapsed.
SUBDIRS = ffmpeg libswscale
if !GST_FFMPEG_ENABLE_LGPL
if !GST_LIBAV_ENABLE_LGPL
SUBDIRS += libpostproc
endif
plugin_LTLIBRARIES = libgstffmpeg.la
plugin_LTLIBRARIES = libgstlibav.la
if HAVE_BZ2
BZ2_LIBS = -lbz2
......@@ -6,7 +6,7 @@ else
BZ2_LIBS =
endif
libgstffmpeg_la_SOURCES = gstffmpeg.c \
libgstlibav_la_SOURCES = gstffmpeg.c \
gstffmpegprotocol.c \
gstffmpegcodecmap.c \
gstffmpegutils.c \
......@@ -21,16 +21,16 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
# \
# gstffmpegscale.c
libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_PLUGINS_BASE_LIBS) \
libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static
libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstlibav_la_LIBTOOLFLAGS = --tag=disable-static
if HAVE_FFMPEG_UNINSTALLED
libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS)
if HAVE_LIBAV_UNINSTALLED
libgstlibav_la_DEPENDENCIES = $(LIBAV_LIBS)
endif
......
......@@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>
#include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#include <avformat.h>
#else
......@@ -128,7 +128,7 @@ gboolean _shut_up_I_am_probing = FALSE;
static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "ffmpeg", 0, "FFmpeg elements");
GST_DEBUG_CATEGORY_INIT (ffmpeg_debug, "libav", 0, "libav elements");
#ifndef GST_DISABLE_GST_DEBUG
av_log_set_callback (gst_ffmpeg_log_callback);
......@@ -160,12 +160,12 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
ffmpeg,
"All FFmpeg codecs and formats (" FFMPEG_SOURCE ")",
libav,
"All libav codecs and formats (" LIBAV_SOURCE ")",
plugin_init, PACKAGE_VERSION,
#ifdef GST_FFMPEG_ENABLE_LGPL
#ifdef GST_LIBAV_ENABLE_LGPL
"LGPL",
#else
"GPL",
#endif
"FFmpeg", "http://ffmpeg.org/")
"libav", "http://www.libav.org")
......@@ -24,7 +24,7 @@
#ifndef __GST_FFMPEG_H__
#define __GST_FFMPEG_H__
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#include <avformat.h>
#else
......
......@@ -24,7 +24,7 @@
#include "config.h"
#endif
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#else
#include <libavcodec/avcodec.h>
......@@ -110,7 +110,7 @@ gst_ffmpegaudioresample_base_init (gpointer g_class)
gst_element_class_add_static_pad_template (element_class, &src_factory);
gst_element_class_add_static_pad_template (element_class, &sink_factory);
gst_element_class_set_static_metadata (element_class,
"FFMPEG Audio resampling element", "Filter/Converter/Audio",
"libav Audio resampling element", "Filter/Converter/Audio",
"Converts audio from one samplerate to another",
"Edward Hervey <bilboed@bilboed.com>");
}
......@@ -306,6 +306,6 @@ gst_ffmpegaudioresample_transform (GstBaseTransform * trans, GstBuffer * inbuf,
gboolean
gst_ffmpegaudioresample_register (GstPlugin * plugin)
{
return gst_element_register (plugin, "ffaudioresample",
return gst_element_register (plugin, "avaudioresample",
GST_RANK_NONE, GST_TYPE_FFMPEGAUDIORESAMPLE);
}
......@@ -49,7 +49,7 @@ gst_ffmpeg_pass_get_type (void)
};
ffmpeg_pass_type =
g_enum_register_static ("GstFFMpegEncPass", ffmpeg_passes);
g_enum_register_static ("GstLibAVEncPass", ffmpeg_passes);
}
return ffmpeg_pass_type;
......@@ -71,7 +71,7 @@ gst_ffmpeg_lim_pass_get_type (void)
};
ffmpeg_lim_pass_type =
g_enum_register_static ("GstFFMpegEncLimPass", ffmpeg_lim_passes);
g_enum_register_static ("GstLibAVEncLimPass", ffmpeg_lim_passes);
}
return ffmpeg_lim_pass_type;
......@@ -94,7 +94,7 @@ gst_ffmpeg_mb_decision_get_type (void)
};
ffmpeg_mb_decision_type =
g_enum_register_static ("GstFFMpegEncMBDecision", ffmpeg_mb_decisions);
g_enum_register_static ("GstLibAVEncMBDecision", ffmpeg_mb_decisions);
}
return ffmpeg_mb_decision_type;
......@@ -129,7 +129,7 @@ gst_ffmpeg_mb_cmp_get_type (void)
};
ffmpeg_mb_cmp_type =
g_enum_register_static ("GstFFMpegCMPFunction", ffmpeg_mb_cmps);
g_enum_register_static ("GstLibAVCMPFunction", ffmpeg_mb_cmps);
}
return ffmpeg_mb_cmp_type;
......@@ -154,7 +154,7 @@ gst_ffmpeg_dct_algo_get_type (void)
};
ffmpeg_dct_algo_type =
g_enum_register_static ("GstFFMpegDCTAlgo", ffmpeg_dct_algos);
g_enum_register_static ("GstLibAVDCTAlgo", ffmpeg_dct_algos);
}
return ffmpeg_dct_algo_type;
......@@ -187,7 +187,7 @@ gst_ffmpeg_idct_algo_get_type (void)
};
ffmpeg_idct_algo_type =
g_enum_register_static ("GstFFMpegIDCTAlgo", ffmpeg_idct_algos);
g_enum_register_static ("GstLibAVIDCTAlgo", ffmpeg_idct_algos);
}
return ffmpeg_idct_algo_type;
......@@ -207,7 +207,7 @@ gst_ffmpeg_quant_type_get_type (void)
};
ffmpeg_quant_type_type =
g_enum_register_static ("GstFFMpegEncQuantTypes", ffmpeg_quant_types);
g_enum_register_static ("GstLibAVEncQuantTypes", ffmpeg_quant_types);
}
return ffmpeg_quant_type_type;
......@@ -228,7 +228,7 @@ gst_ffmpeg_pre_me_get_type (void)
};
ffmpeg_pre_me_type =
g_enum_register_static ("GstFFMpegEncPreME", ffmpeg_pre_mes);
g_enum_register_static ("GstLibAVEncPreME", ffmpeg_pre_mes);
}
return ffmpeg_pre_me_type;
......@@ -249,7 +249,7 @@ gst_ffmpeg_pred_method_get_type (void)
};
ffmpeg_pred_method =
g_enum_register_static ("GstFFMpegEncPredMethod", ffmpeg_pred_methods);
g_enum_register_static ("GstLibAVEncPredMethod", ffmpeg_pred_methods);
}
return ffmpeg_pred_method;
......@@ -293,8 +293,7 @@ gst_ffmpeg_flags_get_type (void)
{0, NULL, NULL},
};
ffmpeg_flags_type =
g_flags_register_static ("GstFFMpegFlags", ffmpeg_flags);
ffmpeg_flags_type = g_flags_register_static ("GstLibAVFlags", ffmpeg_flags);
}
return ffmpeg_flags_type;
......
......@@ -23,7 +23,7 @@
#include "config.h"
#endif
#include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#else
#include <libavcodec/avcodec.h>
......
......@@ -20,7 +20,7 @@
#ifndef __GST_FFMPEG_CODECMAP_H__
#define __GST_FFMPEG_CODECMAP_H__
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#else
#include <libavcodec/avcodec.h>
......
......@@ -24,7 +24,7 @@
#include <assert.h>
#include <string.h>
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#else
#include <libavcodec/avcodec.h>
......@@ -261,7 +261,7 @@ static void gst_ffmpegdec_release_buffer (AVCodecContext * context,
static void gst_ffmpegdec_drain (GstFFMpegDec * ffmpegdec);
#define GST_FFDEC_PARAMS_QDATA g_quark_from_static_string("ffdec-params")
#define GST_FFDEC_PARAMS_QDATA g_quark_from_static_string("avdec-params")
static GstElementClass *parent_class = NULL;
......@@ -280,7 +280,7 @@ gst_ffmpegdec_lowres_get_type (void)
};
ffmpegdec_lowres_type =
g_enum_register_static ("GstFFMpegDecLowres", ffmpegdec_lowres);
g_enum_register_static ("GstLibAVDecLowres", ffmpegdec_lowres);
}
return ffmpegdec_lowres_type;
......@@ -302,7 +302,7 @@ gst_ffmpegdec_skipframe_get_type (void)
};
ffmpegdec_skipframe_type =
g_enum_register_static ("GstFFMpegDecSkipFrame", ffmpegdec_skipframe);
g_enum_register_static ("GstLibAVDecSkipFrame", ffmpegdec_skipframe);
}
return ffmpegdec_skipframe_type;
......@@ -323,10 +323,10 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass)
g_assert (in_plugin != NULL);
/* construct the element details struct */
longname = g_strdup_printf ("FFmpeg %s decoder", in_plugin->long_name);
longname = g_strdup_printf ("libav %s decoder", in_plugin->long_name);
classification = g_strdup_printf ("Codec/Decoder/%s",
(in_plugin->type == AVMEDIA_TYPE_VIDEO) ? "Video" : "Audio");
description = g_strdup_printf ("FFmpeg %s decoder", in_plugin->name);
description = g_strdup_printf ("libav %s decoder", in_plugin->name);
gst_element_class_set_metadata (element_class, longname,
classification, description,
"Wim Taymans <wim.taymans@gmail.com>, "
......@@ -714,7 +714,7 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec)
could_not_open:
{
gst_ffmpegdec_close (ffmpegdec);
GST_DEBUG_OBJECT (ffmpegdec, "ffdec_%s: Failed to open FFMPEG codec",
GST_DEBUG_OBJECT (ffmpegdec, "avdec_%s: Failed to open FFMPEG codec",
oclass->in_plugin->name);
return FALSE;
}
......@@ -1353,19 +1353,19 @@ gst_ffmpegdec_video_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
/* ERRORS */
unknown_format:
{
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
/* using internal ffmpeg snapshot */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION,
("Could not find GStreamer caps mapping for FFmpeg pixfmt %d.",
("Could not find GStreamer caps mapping for libav pixfmt %d.",
ffmpegdec->ctx_pix_fmt), (NULL));
#else
/* using external ffmpeg */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION,
("Could not find GStreamer caps mapping for FFmpeg codec '%s', and "
("Could not find GStreamer caps mapping for libav codec '%s', and "
"you are using an external libavcodec. This is most likely due to "
"a packaging problem and/or libavcodec having been upgraded to a "
"version that is not compatible with this version of "
"gstreamer-ffmpeg. Make sure your gstreamer-ffmpeg and libavcodec "
"gstreamer-libav. Make sure your gstreamer-libav and libavcodec "
"packages come from the same source/repository.",
oclass->in_plugin->name), (NULL));
#endif
......@@ -1374,7 +1374,7 @@ unknown_format:
caps_failed:
{
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL),
("Could not set caps for ffmpeg decoder (%s), not fixed?",
("Could not set caps for libav decoder (%s), not fixed?",
oclass->in_plugin->name));
gst_caps_unref (caps);
......@@ -1461,19 +1461,19 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
/* ERRORS */
no_caps:
{
#ifdef HAVE_FFMPEG_UNINSTALLED
#ifdef HAVE_LIBAV_UNINSTALLED
/* using internal ffmpeg snapshot */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION,
("Could not find GStreamer caps mapping for FFmpeg codec '%s'.",
("Could not find GStreamer caps mapping for libav codec '%s'.",
oclass->in_plugin->name), (NULL));
#else
/* using external ffmpeg */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION,
("Could not find GStreamer caps mapping for FFmpeg codec '%s', and "
("Could not find GStreamer caps mapping for libav codec '%s', and "
"you are using an external libavcodec. This is most likely due to "
"a packaging problem and/or libavcodec having been upgraded to a "
"version that is not compatible with this version of "
"gstreamer-ffmpeg. Make sure your gstreamer-ffmpeg and libavcodec "
"gstreamer-libav. Make sure your gstreamer-libav and libavcodec "
"packages come from the same source/repository.",
oclass->in_plugin->name), (NULL));
#endif
......@@ -1482,7 +1482,7 @@ no_caps:
caps_failed:
{
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL),
("Could not set caps for ffmpeg decoder (%s), not fixed?",
("Could not set caps for libav decoder (%s), not fixed?",
oclass->in_plugin->name));
gst_caps_unref (caps);
......@@ -2361,7 +2361,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
if (len == -1 && (in_plugin->id == CODEC_ID_AAC
|| in_plugin->id == CODEC_ID_AAC_LATM)) {
GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, (NULL),
("Decoding of AAC stream by FFMPEG failed."));
("Decoding of AAC stream by libav failed."));
*ret = GST_FLOW_ERROR;
}
......@@ -2444,7 +2444,7 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
if (len < 0 || have_data < 0) {
GST_WARNING_OBJECT (ffmpegdec,
"ffdec_%s: decoding error (len: %d, have_data: %d)",
"avdec_%s: decoding error (len: %d, have_data: %d)",