Rename ffmpeg decoder plugin to libav decoder plugin.

5 files changed, 78 insertions, 78 deletions

diff --git a/src/Makefile b/src/Makefile
index 2806667f..7e7b5598 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -169,8 +169,8 @@ OBJS = aiff.o                                               \
        AudioCompress/compress.o                             \
        cue/cue_parser.o                                     \
        db/simple_db_plugin.o                                \
-       decoder/ffmpeg_decoder_plugin.o                      \
-       decoder/ffmpeg_metadata.o                            \
+       decoder/libav_decoder_plugin.o                       \
+       decoder/libav_metadata.o                             \
        dsd2pcm/dsd2pcm.o                                    \
        dsd2pcm/noiseshape.o                                 \
        filter/autoconvert_filter_plugin.o                   \
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/libav_decoder_plugin.c
index a0cce6a2..5e4f4c65 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/libav_decoder_plugin.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "decoder_api.h"
 #include "audio_check.h"
-#include "ffmpeg_metadata.h"
+#include "libav_metadata.h"
 #include "tag_handler.h"
 
 #include <glib.h>
@@ -43,10 +43,10 @@
 #include <libavutil/dict.h>
 
 #undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "ffmpeg"
+#define G_LOG_DOMAIN "libav"
 
 static GLogLevelFlags
-level_ffmpeg_to_glib(int level)
+level_libav_to_glib(int level)
 {
     if (level <= AV_LOG_FATAL)
         return G_LOG_LEVEL_CRITICAL;
@@ -61,7 +61,7 @@ level_ffmpeg_to_glib(int level)
 }
 
 static void
-mpd_ffmpeg_log_callback(G_GNUC_UNUSED void *ptr, int level,
+mpd_libav_log_callback(G_GNUC_UNUSED void *ptr, int level,
             const char *fmt, va_list vl)
 {
     const AVClass * cls = NULL;
@@ -71,12 +71,12 @@ mpd_ffmpeg_log_callback(G_GNUC_UNUSED void *ptr, int level,
 
     if (cls != NULL) {
         char *domain = g_strconcat(G_LOG_DOMAIN, "/", cls->item_name(ptr), NULL);
-        g_logv(domain, level_ffmpeg_to_glib(level), fmt, vl);
+        g_logv(domain, level_libav_to_glib(level), fmt, vl);
         g_free(domain);
     }
 }
 
-struct mpd_ffmpeg_stream {
+struct LibavDecContext {
     struct decoder *decoder;
     struct input_stream *input;
 
@@ -85,18 +85,18 @@ struct mpd_ffmpeg_stream {
 };
 
 static int
-mpd_ffmpeg_stream_read(void *opaque, uint8_t *buf, int size)
+mpd_libav_stream_read(void *opaque, uint8_t *buf, int size)
 {
-    struct mpd_ffmpeg_stream *stream = opaque;
+    struct LibavDecContext *stream = opaque;
 
     return decoder_read(stream->decoder, stream->input,
                 (void *)buf, size);
 }
 
 static int64_t
-mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence)
+mpd_libav_stream_seek(void *opaque, int64_t pos, int whence)
 {
-    struct mpd_ffmpeg_stream *stream = opaque;
+    struct LibavDecContext *stream = opaque;
 
     if (whence == AVSEEK_SIZE)
         return stream->input->size;
@@ -107,17 +107,17 @@ mpd_ffmpeg_stream_seek(void *opaque, int64_t pos, int whence)
     return stream->input->offset;
 }
 
-static struct mpd_ffmpeg_stream *
-mpd_ffmpeg_stream_open(struct decoder *decoder, struct input_stream *input)
+static struct LibavDecContext *
+mpd_libav_stream_open(struct decoder *decoder, struct input_stream *input)
 {
-    struct mpd_ffmpeg_stream *stream = g_new(struct mpd_ffmpeg_stream, 1);
+    struct LibavDecContext *stream = g_new(struct LibavDecContext, 1);
     stream->decoder = decoder;
     stream->input = input;
     stream->io = avio_alloc_context(stream->buffer, sizeof(stream->buffer),
                     false, stream,
-                    mpd_ffmpeg_stream_read, NULL,
+                    mpd_libav_stream_read, NULL,
                     input->seekable
-                    ? mpd_ffmpeg_stream_seek : NULL);
+                    ? mpd_libav_stream_seek : NULL);
     if (stream->io == NULL) {
         g_free(stream);
         return NULL;
@@ -131,7 +131,7 @@ mpd_ffmpeg_stream_open(struct decoder *decoder, struct input_stream *input)
  * avformat_open_input().
  */
 static int
-mpd_ffmpeg_open_input(AVFormatContext **ic_ptr,
+mpd_libav_open_input(AVFormatContext **ic_ptr,
               AVIOContext *pb,
               const char *filename,
               AVInputFormat *fmt)
@@ -146,23 +146,23 @@ mpd_ffmpeg_open_input(AVFormatContext **ic_ptr,
 }
 
 static void
-mpd_ffmpeg_stream_close(struct mpd_ffmpeg_stream *stream)
+mpd_libav_stream_close(struct LibavDecContext *stream)
 {
     av_free(stream->io);
     g_free(stream);
 }
 
 static bool
-ffmpeg_init(G_GNUC_UNUSED const struct config_param *param)
+libav_init(G_GNUC_UNUSED const struct config_param *param)
 {
-    av_log_set_callback(mpd_ffmpeg_log_callback);
+    av_log_set_callback(mpd_libav_log_callback);
 
     av_register_all();
     return true;
 }
 
 static int
-ffmpeg_find_audio_stream(const AVFormatContext *format_context)
+libav_find_audio_stream(const AVFormatContext *format_context)
 {
     for (unsigned i = 0; i < format_context->nb_streams; ++i)
         if (format_context->streams[i]->codec->codec_type ==
@@ -174,7 +174,7 @@ ffmpeg_find_audio_stream(const AVFormatContext *format_context)
 
 G_GNUC_CONST
 static double
-time_from_ffmpeg(int64_t t, const AVRational time_base)
+time_from_libav(int64_t t, const AVRational time_base)
 {
     assert(t != (int64_t)AV_NOPTS_VALUE);
 
@@ -184,7 +184,7 @@ time_from_ffmpeg(int64_t t, const AVRational time_base)
 
 G_GNUC_CONST
 static int64_t
-time_to_ffmpeg(double t, const AVRational time_base)
+time_to_libav(double t, const AVRational time_base)
 {
     return av_rescale_q((int64_t)(t * 1024), (AVRational){1, 1024},
                 time_base);
@@ -223,14 +223,14 @@ copy_interleave_frame(const AVCodecContext *codec_context,
 }
 
 static enum decoder_command
-ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
+libav_send_packet(struct decoder *decoder, struct input_stream *is,
            const AVPacket *packet,
            AVCodecContext *codec_context,
            const AVRational *time_base)
 {
     if (packet->pts != (int64_t)AV_NOPTS_VALUE)
         decoder_timestamp(decoder,
-                  time_from_ffmpeg(packet->pts, *time_base));
+                  time_from_libav(packet->pts, *time_base));
 
     AVPacket packet2 = *packet;
 
@@ -278,7 +278,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
 }
 
 static enum sample_format
-ffmpeg_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context)
+libav_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context)
 {
     switch (codec_context->sample_fmt) {
     case AV_SAMPLE_FMT_S16:
@@ -295,7 +295,7 @@ ffmpeg_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context)
 }
 
 static AVInputFormat *
-ffmpeg_probe(struct decoder *decoder, struct input_stream *is)
+libav_probe(struct decoder *decoder, struct input_stream *is)
 {
     enum {
         BUFFER_SIZE = 16384,
@@ -329,17 +329,17 @@ ffmpeg_probe(struct decoder *decoder, struct input_stream *is)
 }
 
 static void
-ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
+libav_decode(struct decoder *decoder, struct input_stream *input)
 {
-    AVInputFormat *input_format = ffmpeg_probe(decoder, input);
+    AVInputFormat *input_format = libav_probe(decoder, input);
     if (input_format == NULL)
         return;
 
     g_debug("detected input format '%s' (%s)",
         input_format->name, input_format->long_name);
 
-    struct mpd_ffmpeg_stream *stream =
-        mpd_ffmpeg_stream_open(decoder, input);
+    struct LibavDecContext *stream =
+        mpd_libav_stream_open(decoder, input);
     if (stream == NULL) {
         g_warning("Failed to open stream");
         return;
@@ -347,10 +347,10 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
 
     //ffmpeg works with ours "fileops" helper
     AVFormatContext *format_context = NULL;
-    if (mpd_ffmpeg_open_input(&format_context, stream->io, input->uri,
+    if (mpd_libav_open_input(&format_context, stream->io, input->uri,
                   input_format) != 0) {
         g_warning("Open failed\n");
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
@@ -359,15 +359,15 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
     if (find_result < 0) {
         g_warning("Couldn't find stream info\n");
         avformat_close_input(&format_context);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
-    int audio_stream = ffmpeg_find_audio_stream(format_context);
+    int audio_stream = libav_find_audio_stream(format_context);
     if (audio_stream == -1) {
         g_warning("No audio stream inside\n");
         avformat_close_input(&format_context);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
@@ -382,7 +382,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
     if (!codec) {
         g_warning("Unsupported audio codec\n");
         avformat_close_input(&format_context);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
@@ -390,12 +390,12 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
     struct audio_format audio_format;
     if (!audio_format_init_checked(&audio_format,
                        codec_context->sample_rate,
-                       ffmpeg_sample_format(codec_context),
+                       libav_sample_format(codec_context),
                        codec_context->channels, &error)) {
         g_warning("%s", error->message);
         g_error_free(error);
         avformat_close_input(&format_context);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
@@ -408,7 +408,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
     if (open_result < 0) {
         g_warning("Could not open codec\n");
         avformat_close_input(&format_context);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return;
     }
 
@@ -427,7 +427,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
             break;
 
         if (packet.stream_index == audio_stream)
-            cmd = ffmpeg_send_packet(decoder, input,
+            cmd = libav_send_packet(decoder, input,
                          &packet, codec_context,
                          &av_stream->time_base);
         else
@@ -437,7 +437,7 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
 
         if (cmd == DECODE_COMMAND_SEEK) {
             int64_t where =
-                time_to_ffmpeg(decoder_seek_where(decoder),
+                time_to_libav(decoder_seek_where(decoder),
                            av_stream->time_base);
 
             if (av_seek_frame(format_context, audio_stream, where,
@@ -452,26 +452,26 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
 
     avcodec_close(codec_context);
     avformat_close_input(&format_context);
-    mpd_ffmpeg_stream_close(stream);
+    mpd_libav_stream_close(stream);
 }
 
 //no tag reading in ffmpeg, check if playable
 static bool
-ffmpeg_scan_stream(struct input_stream *is,
+libav_scan_stream(struct input_stream *is,
            const struct tag_handler *handler, void *handler_ctx)
 {
-    AVInputFormat *input_format = ffmpeg_probe(NULL, is);
+    AVInputFormat *input_format = libav_probe(NULL, is);
     if (input_format == NULL)
         return false;
 
-    struct mpd_ffmpeg_stream *stream = mpd_ffmpeg_stream_open(NULL, is);
+    struct LibavDecContext *stream = mpd_libav_stream_open(NULL, is);
     if (stream == NULL)
         return false;
 
     AVFormatContext *f = NULL;
-    if (mpd_ffmpeg_open_input(&f, stream->io, is->uri,
+    if (mpd_libav_open_input(&f, stream->io, is->uri,
                   input_format) != 0) {
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return false;
     }
 
@@ -479,7 +479,7 @@ ffmpeg_scan_stream(struct input_stream *is,
         avformat_find_stream_info(f, NULL);
     if (find_result < 0) {
         avformat_close_input(&f);
-        mpd_ffmpeg_stream_close(stream);
+        mpd_libav_stream_close(stream);
         return false;
     }
 
@@ -488,14 +488,14 @@ ffmpeg_scan_stream(struct input_stream *is,
                         f->duration / AV_TIME_BASE);
 
 
-    ffmpeg_scan_dictionary(f->metadata, handler, handler_ctx);
-    int idx = ffmpeg_find_audio_stream(f);
+    libav_scan_dictionary(f->metadata, handler, handler_ctx);
+    int idx = libav_find_audio_stream(f);
     if (idx >= 0)
-        ffmpeg_scan_dictionary(f->streams[idx]->metadata,
+        libav_scan_dictionary(f->streams[idx]->metadata,
                        handler, handler_ctx);
 
     avformat_close_input(&f);
-    mpd_ffmpeg_stream_close(stream);
+    mpd_libav_stream_close(stream);
 
     return true;
 }
@@ -506,7 +506,7 @@ ffmpeg_scan_stream(struct input_stream *is,
  * supported formats, check the ffmpeg changelog since this date for
  * more formats.
  */
-static const char *const ffmpeg_suffixes[] = {
+static const char *const libav_suffixes[] = {
     "16sv", "3g2", "3gp", "4xm", "8svx", "aa3", "aac", "ac3", "afc", "aif",
     "aifc", "aiff", "al", "alaw", "amr", "anim", "apc", "ape", "asf",
     "atrac", "au", "aud", "avi", "avm2", "avs", "bap", "bfi", "c93", "cak",
@@ -527,7 +527,7 @@ static const char *const ffmpeg_suffixes[] = {
     NULL
 };
 
-static const char *const ffmpeg_mime_types[] = {
+static const char *const libav_mime_types[] = {
     "application/m4a",
     "application/mp4",
     "application/octet-stream",
@@ -609,16 +609,16 @@ static const char *const ffmpeg_mime_types[] = {
     /* special value for the "ffmpeg" input plugin: all streams by
        the "ffmpeg" input plugin shall be decoded by this
        plugin */
-    "audio/x-mpd-ffmpeg",
+    "audio/x-mpd-libav",
 
     NULL
 };
 
-const struct decoder_plugin ffmpeg_decoder_plugin = {
-    .name = "ffmpeg",
-    .init = ffmpeg_init,
-    .stream_decode = ffmpeg_decode,
-    .scan_stream = ffmpeg_scan_stream,
-    .suffixes = ffmpeg_suffixes,
-    .mime_types = ffmpeg_mime_types
+const struct decoder_plugin libav_decoder_plugin = {
+    .name = "libav",
+    .init = libav_init,
+    .stream_decode = libav_decode,
+    .scan_stream = libav_scan_stream,
+    .suffixes = libav_suffixes,
+    .mime_types = libav_mime_types
 };
diff --git a/src/decoder/ffmpeg_metadata.c b/src/decoder/libav_metadata.c
index f1b1de59..76f9652a 100644
--- a/src/decoder/ffmpeg_metadata.c
+++ b/src/decoder/libav_metadata.c
@@ -18,14 +18,14 @@
  */
 
 #include "config.h"
-#include "ffmpeg_metadata.h"
+#include "libav_metadata.h"
 #include "tag_table.h"
 #include "tag_handler.h"
 
 #undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "ffmpeg"
+#define G_LOG_DOMAIN "libav"
 
-static const struct tag_table ffmpeg_tags[] = {
+static const struct tag_table libav_tags[] = {
     { "year", TAG_DATE },
     { "author-sort", TAG_ARTIST_SORT },
     { "album_artist", TAG_ALBUM_ARTIST },
@@ -36,7 +36,7 @@ static const struct tag_table ffmpeg_tags[] = {
 };
 
 static void
-ffmpeg_copy_metadata(enum tag_type type,
+libav_copy_metadata(enum tag_type type,
              AVDictionary *m, const char *name,
              const struct tag_handler *handler, void *handler_ctx)
 {
@@ -49,7 +49,7 @@ ffmpeg_copy_metadata(enum tag_type type,
 
 
 static void
-ffmpeg_scan_pairs(AVDictionary *dict,
+libav_scan_pairs(AVDictionary *dict,
           const struct tag_handler *handler, void *handler_ctx)
 {
     AVDictionaryEntry *i = NULL;
@@ -60,18 +60,18 @@ ffmpeg_scan_pairs(AVDictionary *dict,
 }
 
 void
-ffmpeg_scan_dictionary(AVDictionary *dict,
+libav_scan_dictionary(AVDictionary *dict,
                const struct tag_handler *handler, void *handler_ctx)
 {
     for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
-        ffmpeg_copy_metadata(i, dict, tag_item_names[i],
+        libav_copy_metadata(i, dict, tag_item_names[i],
                      handler, handler_ctx);
 
-    for (const struct tag_table *i = ffmpeg_tags;
+    for (const struct tag_table *i = libav_tags;
          i->name != NULL; ++i)
-        ffmpeg_copy_metadata(i->type, dict, i->name,
+        libav_copy_metadata(i->type, dict, i->name,
                      handler, handler_ctx);
 
     if (handler->pair != NULL)
-        ffmpeg_scan_pairs(dict, handler, handler_ctx);
+        libav_scan_pairs(dict, handler, handler_ctx);
 }
diff --git a/src/decoder/ffmpeg_metadata.h b/src/decoder/libav_metadata.h
index a8ea6a6c..440a4ce5 100644
--- a/src/decoder/ffmpeg_metadata.h
+++ b/src/decoder/libav_metadata.h
@@ -27,7 +27,7 @@
 struct tag_handler;
 
 void
-ffmpeg_scan_dictionary(AVDictionary *dict,
-               const struct tag_handler *handler, void *handler_ctx);
+libav_scan_dictionary(AVDictionary *dict, const struct tag_handler *handler,
+                      void *handler_ctx);
 
 #endif
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 7dc4c3be..d9437e86 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -28,10 +28,10 @@
 
 #include <string.h>
 
-extern const struct decoder_plugin ffmpeg_decoder_plugin;
+extern const struct decoder_plugin libav_decoder_plugin;
 
 const struct decoder_plugin *const decoder_plugins[] = {
-	&ffmpeg_decoder_plugin,
+	&libav_decoder_plugin,
 	NULL
 };