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

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
This diff is collapsed.
...@@ -4,7 +4,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj ...@@ -4,7 +4,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
# The name of the module, e.g. 'glib'. # The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@ #DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
MODULE=gst-ffmpeg MODULE=gst-libav
DOC_MODULE=$(MODULE)-plugins DOC_MODULE=$(MODULE)-plugins
# for upload-doc.mak # for upload-doc.mak
......
This diff is collapsed.
SUBDIRS = ffmpeg libswscale SUBDIRS = ffmpeg libswscale
if !GST_FFMPEG_ENABLE_LGPL if !GST_LIBAV_ENABLE_LGPL
SUBDIRS += libpostproc SUBDIRS += libpostproc
endif endif
plugin_LTLIBRARIES = libgstffmpeg.la plugin_LTLIBRARIES = libgstlibav.la
if HAVE_BZ2 if HAVE_BZ2
BZ2_LIBS = -lbz2 BZ2_LIBS = -lbz2
...@@ -6,7 +6,7 @@ else ...@@ -6,7 +6,7 @@ else
BZ2_LIBS = BZ2_LIBS =
endif endif
libgstffmpeg_la_SOURCES = gstffmpeg.c \ libgstlibav_la_SOURCES = gstffmpeg.c \
gstffmpegprotocol.c \ gstffmpegprotocol.c \
gstffmpegcodecmap.c \ gstffmpegcodecmap.c \
gstffmpegutils.c \ gstffmpegutils.c \
...@@ -21,16 +21,16 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ ...@@ -21,16 +21,16 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
# \ # \
# gstffmpegscale.c # gstffmpegscale.c
libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_PLUGINS_BASE_LIBS) \ libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \ -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
$(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static libgstlibav_la_LIBTOOLFLAGS = --tag=disable-static
if HAVE_FFMPEG_UNINSTALLED if HAVE_LIBAV_UNINSTALLED
libgstffmpeg_la_DEPENDENCIES = $(FFMPEG_LIBS) libgstlibav_la_DEPENDENCIES = $(LIBAV_LIBS)
endif endif
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#include <avformat.h> #include <avformat.h>
#else #else
...@@ -128,7 +128,7 @@ gboolean _shut_up_I_am_probing = FALSE; ...@@ -128,7 +128,7 @@ gboolean _shut_up_I_am_probing = FALSE;
static gboolean static gboolean
plugin_init (GstPlugin * plugin) 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 #ifndef GST_DISABLE_GST_DEBUG
av_log_set_callback (gst_ffmpeg_log_callback); av_log_set_callback (gst_ffmpeg_log_callback);
...@@ -160,12 +160,12 @@ plugin_init (GstPlugin * plugin) ...@@ -160,12 +160,12 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
ffmpeg, libav,
"All FFmpeg codecs and formats (" FFMPEG_SOURCE ")", "All libav codecs and formats (" LIBAV_SOURCE ")",
plugin_init, PACKAGE_VERSION, plugin_init, PACKAGE_VERSION,
#ifdef GST_FFMPEG_ENABLE_LGPL #ifdef GST_LIBAV_ENABLE_LGPL
"LGPL", "LGPL",
#else #else
"GPL", "GPL",
#endif #endif
"FFmpeg", "http://ffmpeg.org/") "libav", "http://www.libav.org")
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef __GST_FFMPEG_H__ #ifndef __GST_FFMPEG_H__
#define __GST_FFMPEG_H__ #define __GST_FFMPEG_H__
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#include <avformat.h> #include <avformat.h>
#else #else
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "config.h" #include "config.h"
#endif #endif
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#else #else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
...@@ -110,7 +110,7 @@ gst_ffmpegaudioresample_base_init (gpointer g_class) ...@@ -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, &src_factory);
gst_element_class_add_static_pad_template (element_class, &sink_factory); gst_element_class_add_static_pad_template (element_class, &sink_factory);
gst_element_class_set_static_metadata (element_class, 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", "Converts audio from one samplerate to another",
"Edward Hervey <bilboed@bilboed.com>"); "Edward Hervey <bilboed@bilboed.com>");
} }
...@@ -306,6 +306,6 @@ gst_ffmpegaudioresample_transform (GstBaseTransform * trans, GstBuffer * inbuf, ...@@ -306,6 +306,6 @@ gst_ffmpegaudioresample_transform (GstBaseTransform * trans, GstBuffer * inbuf,
gboolean gboolean
gst_ffmpegaudioresample_register (GstPlugin * plugin) gst_ffmpegaudioresample_register (GstPlugin * plugin)
{ {
return gst_element_register (plugin, "ffaudioresample", return gst_element_register (plugin, "avaudioresample",
GST_RANK_NONE, GST_TYPE_FFMPEGAUDIORESAMPLE); GST_RANK_NONE, GST_TYPE_FFMPEGAUDIORESAMPLE);
} }
...@@ -49,7 +49,7 @@ gst_ffmpeg_pass_get_type (void) ...@@ -49,7 +49,7 @@ gst_ffmpeg_pass_get_type (void)
}; };
ffmpeg_pass_type = ffmpeg_pass_type =
g_enum_register_static ("GstFFMpegEncPass", ffmpeg_passes); g_enum_register_static ("GstLibAVEncPass", ffmpeg_passes);
} }
return ffmpeg_pass_type; return ffmpeg_pass_type;
...@@ -71,7 +71,7 @@ gst_ffmpeg_lim_pass_get_type (void) ...@@ -71,7 +71,7 @@ gst_ffmpeg_lim_pass_get_type (void)
}; };
ffmpeg_lim_pass_type = 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; return ffmpeg_lim_pass_type;
...@@ -94,7 +94,7 @@ gst_ffmpeg_mb_decision_get_type (void) ...@@ -94,7 +94,7 @@ gst_ffmpeg_mb_decision_get_type (void)
}; };
ffmpeg_mb_decision_type = 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; return ffmpeg_mb_decision_type;
...@@ -129,7 +129,7 @@ gst_ffmpeg_mb_cmp_get_type (void) ...@@ -129,7 +129,7 @@ gst_ffmpeg_mb_cmp_get_type (void)
}; };
ffmpeg_mb_cmp_type = 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; return ffmpeg_mb_cmp_type;
...@@ -154,7 +154,7 @@ gst_ffmpeg_dct_algo_get_type (void) ...@@ -154,7 +154,7 @@ gst_ffmpeg_dct_algo_get_type (void)
}; };
ffmpeg_dct_algo_type = 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; return ffmpeg_dct_algo_type;
...@@ -187,7 +187,7 @@ gst_ffmpeg_idct_algo_get_type (void) ...@@ -187,7 +187,7 @@ gst_ffmpeg_idct_algo_get_type (void)
}; };
ffmpeg_idct_algo_type = 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; return ffmpeg_idct_algo_type;
...@@ -207,7 +207,7 @@ gst_ffmpeg_quant_type_get_type (void) ...@@ -207,7 +207,7 @@ gst_ffmpeg_quant_type_get_type (void)
}; };
ffmpeg_quant_type_type = 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; return ffmpeg_quant_type_type;
...@@ -228,7 +228,7 @@ gst_ffmpeg_pre_me_get_type (void) ...@@ -228,7 +228,7 @@ gst_ffmpeg_pre_me_get_type (void)
}; };
ffmpeg_pre_me_type = 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; return ffmpeg_pre_me_type;
...@@ -249,7 +249,7 @@ gst_ffmpeg_pred_method_get_type (void) ...@@ -249,7 +249,7 @@ gst_ffmpeg_pred_method_get_type (void)
}; };
ffmpeg_pred_method = ffmpeg_pred_method =
g_enum_register_static ("GstFFMpegEncPredMethod", ffmpeg_pred_methods); g_enum_register_static ("GstLibAVEncPredMethod", ffmpeg_pred_methods);
} }
return ffmpeg_pred_method; return ffmpeg_pred_method;
...@@ -293,8 +293,7 @@ gst_ffmpeg_flags_get_type (void) ...@@ -293,8 +293,7 @@ gst_ffmpeg_flags_get_type (void)
{0, NULL, NULL}, {0, NULL, NULL},
}; };
ffmpeg_flags_type = ffmpeg_flags_type = g_flags_register_static ("GstLibAVFlags", ffmpeg_flags);
g_flags_register_static ("GstFFMpegFlags", ffmpeg_flags);
} }
return ffmpeg_flags_type; return ffmpeg_flags_type;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#else #else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __GST_FFMPEG_CODECMAP_H__ #ifndef __GST_FFMPEG_CODECMAP_H__
#define __GST_FFMPEG_CODECMAP_H__ #define __GST_FFMPEG_CODECMAP_H__
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#else #else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
#else #else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
...@@ -261,7 +261,7 @@ static void gst_ffmpegdec_release_buffer (AVCodecContext * context, ...@@ -261,7 +261,7 @@ static void gst_ffmpegdec_release_buffer (AVCodecContext * context,
static void gst_ffmpegdec_drain (GstFFMpegDec * ffmpegdec); 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; static GstElementClass *parent_class = NULL;
...@@ -280,7 +280,7 @@ gst_ffmpegdec_lowres_get_type (void) ...@@ -280,7 +280,7 @@ gst_ffmpegdec_lowres_get_type (void)
}; };
ffmpegdec_lowres_type = ffmpegdec_lowres_type =
g_enum_register_static ("GstFFMpegDecLowres", ffmpegdec_lowres); g_enum_register_static ("GstLibAVDecLowres", ffmpegdec_lowres);
} }
return ffmpegdec_lowres_type; return ffmpegdec_lowres_type;
...@@ -302,7 +302,7 @@ gst_ffmpegdec_skipframe_get_type (void) ...@@ -302,7 +302,7 @@ gst_ffmpegdec_skipframe_get_type (void)
}; };
ffmpegdec_skipframe_type = ffmpegdec_skipframe_type =
g_enum_register_static ("GstFFMpegDecSkipFrame", ffmpegdec_skipframe); g_enum_register_static ("GstLibAVDecSkipFrame", ffmpegdec_skipframe);
} }
return ffmpegdec_skipframe_type; return ffmpegdec_skipframe_type;
...@@ -323,10 +323,10 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass) ...@@ -323,10 +323,10 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass)
g_assert (in_plugin != NULL); g_assert (in_plugin != NULL);
/* construct the element details struct */ /* 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", classification = g_strdup_printf ("Codec/Decoder/%s",
(in_plugin->type == AVMEDIA_TYPE_VIDEO) ? "Video" : "Audio"); (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, gst_element_class_set_metadata (element_class, longname,
classification, description, classification, description,
"Wim Taymans <wim.taymans@gmail.com>, " "Wim Taymans <wim.taymans@gmail.com>, "
...@@ -714,7 +714,7 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec) ...@@ -714,7 +714,7 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec)
could_not_open: could_not_open:
{ {
gst_ffmpegdec_close (ffmpegdec); 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); oclass->in_plugin->name);
return FALSE; return FALSE;
} }
...@@ -1353,19 +1353,19 @@ gst_ffmpegdec_video_negotiate (GstFFMpegDec * ffmpegdec, gboolean force) ...@@ -1353,19 +1353,19 @@ gst_ffmpegdec_video_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
/* ERRORS */ /* ERRORS */
unknown_format: unknown_format:
{ {
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
/* using internal ffmpeg snapshot */ /* using internal ffmpeg snapshot */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, 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)); ffmpegdec->ctx_pix_fmt), (NULL));
#else #else
/* using external ffmpeg */ /* using external ffmpeg */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, 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 " "you are using an external libavcodec. This is most likely due to "
"a packaging problem and/or libavcodec having been upgraded to a " "a packaging problem and/or libavcodec having been upgraded to a "
"version that is not compatible with this version of " "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.", "packages come from the same source/repository.",
oclass->in_plugin->name), (NULL)); oclass->in_plugin->name), (NULL));
#endif #endif
...@@ -1374,7 +1374,7 @@ unknown_format: ...@@ -1374,7 +1374,7 @@ unknown_format:
caps_failed: caps_failed:
{ {
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL), 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)); oclass->in_plugin->name));
gst_caps_unref (caps); gst_caps_unref (caps);
...@@ -1461,19 +1461,19 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force) ...@@ -1461,19 +1461,19 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
/* ERRORS */ /* ERRORS */
no_caps: no_caps:
{ {
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
/* using internal ffmpeg snapshot */ /* using internal ffmpeg snapshot */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, 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)); oclass->in_plugin->name), (NULL));
#else #else
/* using external ffmpeg */ /* using external ffmpeg */
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, 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 " "you are using an external libavcodec. This is most likely due to "
"a packaging problem and/or libavcodec having been upgraded to a " "a packaging problem and/or libavcodec having been upgraded to a "
"version that is not compatible with this version of " "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.", "packages come from the same source/repository.",
oclass->in_plugin->name), (NULL)); oclass->in_plugin->name), (NULL));
#endif #endif
...@@ -1482,7 +1482,7 @@ no_caps: ...@@ -1482,7 +1482,7 @@ no_caps:
caps_failed: caps_failed:
{ {
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL), 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)); oclass->in_plugin->name));
gst_caps_unref (caps); gst_caps_unref (caps);
...@@ -2361,7 +2361,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec, ...@@ -2361,7 +2361,7 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
if (len == -1 && (in_plugin->id == CODEC_ID_AAC if (len == -1 && (in_plugin->id == CODEC_ID_AAC
|| in_plugin->id == CODEC_ID_AAC_LATM)) { || in_plugin->id == CODEC_ID_AAC_LATM)) {
GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, (NULL), 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; *ret = GST_FLOW_ERROR;
} }
...@@ -2444,7 +2444,7 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec, ...@@ -2444,7 +2444,7 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
if (len < 0 || have_data < 0) { if (len < 0 || have_data < 0) {
GST_WARNING_OBJECT (ffmpegdec, GST_WARNING_OBJECT (ffmpegdec,
"ffdec_%s: decoding error (len: %d, have_data: %d)", "avdec_%s: decoding error (len: %d, have_data: %d)",
oclass->in_plugin->name, len, have_data); oclass->in_plugin->name, len, have_data);
*got_data = 0; *got_data = 0;
goto beach; goto beach;
...@@ -2504,7 +2504,7 @@ gst_ffmpegdec_drain (GstFFMpegDec * ffmpegdec) ...@@ -2504,7 +2504,7 @@ gst_ffmpegdec_drain (GstFFMpegDec * ffmpegdec)
gint have_data, len, try = 0; gint have_data, len, try = 0;
GST_LOG_OBJECT (ffmpegdec, GST_LOG_OBJECT (ffmpegdec,
"codec has delay capabilities, calling until ffmpeg has drained everything"); "codec has delay capabilities, calling until libav has drained everything");
do { do {
GstFlowReturn ret; GstFlowReturn ret;
...@@ -3021,7 +3021,7 @@ not_negotiated: ...@@ -3021,7 +3021,7 @@ not_negotiated:
{ {
oclass = (GstFFMpegDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (ffmpegdec, CORE, NEGOTIATION, (NULL),
("ffdec_%s: input format was not set before data start", ("avdec_%s: input format was not set before data start",
oclass->in_plugin->name)); oclass->in_plugin->name));
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
...@@ -3177,14 +3177,14 @@ gst_ffmpegdec_register (GstPlugin * plugin) ...@@ -3177,14 +3177,14 @@ gst_ffmpegdec_register (GstPlugin * plugin)
* outside of ffmpeg. */ * outside of ffmpeg. */
if (g_str_has_suffix (in_plugin->name, "_vdpau")) { if (g_str_has_suffix (in_plugin->name, "_vdpau")) {
GST_DEBUG GST_DEBUG
("Ignoring VDPAU decoder %s. We can't handle this outside of ffmpeg", ("Ignoring VDPAU decoder %s. We can't handle this outside of libav",
in_plugin->name); in_plugin->name);
goto next; goto next;
} }
if (g_str_has_suffix (in_plugin->name, "_xvmc")) { if (g_str_has_suffix (in_plugin->name, "_xvmc")) {
GST_DEBUG GST_DEBUG
("Ignoring XVMC decoder %s. We can't handle this outside of ffmpeg", ("Ignoring XVMC decoder %s. We can't handle this outside of libav",
in_plugin->name); in_plugin->name);
goto next; goto next;
} }
...@@ -3217,7 +3217,7 @@ gst_ffmpegdec_register (GstPlugin * plugin) ...@@ -3217,7 +3217,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
/* construct the type */ /* construct the type */
plugin_name = g_strdup ((gchar *) in_plugin->name); plugin_name = g_strdup ((gchar *) in_plugin->name);
g_strdelimit (plugin_name, NULL, '_'); g_strdelimit (plugin_name, NULL, '_');
type_name = g_strdup_printf ("ffdec_%s", plugin_name); type_name = g_strdup_printf ("avdec_%s", plugin_name);
g_free (plugin_name); g_free (plugin_name);
type = g_type_from_name (type_name); type = g_type_from_name (type_name);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
# include <avcodec.h> # include <avcodec.h>
#else #else
# include <libavcodec/avcodec.h> # include <libavcodec/avcodec.h>
...@@ -73,7 +73,7 @@ gst_ffmpegdeinterlace_modes_get_type (void) ...@@ -73,7 +73,7 @@ gst_ffmpegdeinterlace_modes_get_type (void)
if (!deinterlace_modes_type) { if (!deinterlace_modes_type) {
deinterlace_modes_type = deinterlace_modes_type =
g_enum_register_static ("GstFFMpegDeinterlaceModes", modes_types); g_enum_register_static ("GstLibAVDeinterlaceModes", modes_types);
} }
return deinterlace_modes_type; return deinterlace_modes_type;
} }
...@@ -169,7 +169,7 @@ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass) ...@@ -169,7 +169,7 @@ gst_ffmpegdeinterlace_class_init (GstFFMpegDeinterlaceClass * klass)
gst_static_pad_template_get (&sink_factory)); gst_static_pad_template_get (&sink_factory));
gst_element_class_set_static_metadata (element_class, gst_element_class_set_static_metadata (element_class,
"FFMPEG Deinterlace element", "Filter/Effect/Video/Deinterlace", "libav Deinterlace element", "Filter/Effect/Video/Deinterlace",
"Deinterlace video", "Luca Ognibene <luogni@tin.it>"); "Deinterlace video", "Luca Ognibene <luogni@tin.it>");
} }
...@@ -335,7 +335,7 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstObject * parent, ...@@ -335,7 +335,7 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstObject * parent,
gboolean gboolean
gst_ffmpegdeinterlace_register (GstPlugin * plugin) gst_ffmpegdeinterlace_register (GstPlugin * plugin)
{ {
return gst_element_register (plugin, "ffdeinterlace", return gst_element_register (plugin, "avdeinterlace",
GST_RANK_NONE, GST_TYPE_FFMPEGDEINTERLACE); GST_RANK_NONE, GST_TYPE_FFMPEGDEINTERLACE);
} }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#endif #endif
#include <string.h> #include <string.h>
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_LIBAV_UNINSTALLED
#include <avformat.h> #include <avformat.h>
#ifdef HAVE_AVI_H #ifdef HAVE_AVI_H
#include <avi.h>