decoder/ffmpeg: move code to ffmpeg_metadata.c
This commit is contained in:
parent
f791065a98
commit
43b7b98949
@ -576,7 +576,10 @@ libdecoder_plugins_a_SOURCES += src/decoder/wildmidi_decoder_plugin.c
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_FFMPEG
|
if HAVE_FFMPEG
|
||||||
libdecoder_plugins_a_SOURCES += src/decoder/ffmpeg_decoder_plugin.c
|
libdecoder_plugins_a_SOURCES += \
|
||||||
|
src/decoder/ffmpeg_metadata.c \
|
||||||
|
src/decoder/ffmpeg_metadata.h \
|
||||||
|
src/decoder/ffmpeg_decoder_plugin.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ENABLE_SNDFILE
|
if ENABLE_SNDFILE
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "decoder_api.h"
|
#include "decoder_api.h"
|
||||||
#include "audio_check.h"
|
#include "audio_check.h"
|
||||||
|
#include "ffmpeg_metadata.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
@ -568,52 +569,6 @@ ffmpeg_decode(struct decoder *decoder, struct input_stream *input)
|
|||||||
mpd_ffmpeg_stream_close(stream);
|
mpd_ffmpeg_stream_close(stream);
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct ffmpeg_tag_map {
|
|
||||||
enum tag_type type;
|
|
||||||
const char *name;
|
|
||||||
} ffmpeg_tag_map;
|
|
||||||
|
|
||||||
static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
|
|
||||||
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8))
|
|
||||||
{ TAG_ARTIST, "author" },
|
|
||||||
{ TAG_DATE, "year" },
|
|
||||||
#endif
|
|
||||||
{ TAG_ARTIST_SORT, "author-sort" },
|
|
||||||
{ TAG_ALBUM_ARTIST, "album_artist" },
|
|
||||||
{ TAG_ALBUM_ARTIST_SORT, "album_artist-sort" },
|
|
||||||
|
|
||||||
/* sentinel */
|
|
||||||
{ TAG_NUM_OF_ITEM_TYPES, NULL }
|
|
||||||
};
|
|
||||||
|
|
||||||
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
|
|
||||||
#define AVDictionary AVMetadata
|
|
||||||
#define AVDictionaryEntry AVMetadataTag
|
|
||||||
#define av_dict_get av_metadata_get
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void
|
|
||||||
ffmpeg_copy_metadata(struct tag *tag, enum tag_type type,
|
|
||||||
AVDictionary *m, const char *name)
|
|
||||||
{
|
|
||||||
AVDictionaryEntry *mt = NULL;
|
|
||||||
|
|
||||||
while ((mt = av_dict_get(m, name, mt, 0)) != NULL)
|
|
||||||
tag_add_item(tag, type, mt->value);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
ffmpeg_copy_dictionary(struct tag *tag, AVDictionary *dict)
|
|
||||||
{
|
|
||||||
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
|
|
||||||
ffmpeg_copy_metadata(tag, i,
|
|
||||||
dict, tag_item_names[i]);
|
|
||||||
|
|
||||||
for (const struct ffmpeg_tag_map *i = ffmpeg_tag_maps;
|
|
||||||
i->name != NULL; ++i)
|
|
||||||
ffmpeg_copy_metadata(tag, i->type, dict, i->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
//no tag reading in ffmpeg, check if playable
|
//no tag reading in ffmpeg, check if playable
|
||||||
static struct tag *
|
static struct tag *
|
||||||
ffmpeg_stream_tag(struct input_stream *is)
|
ffmpeg_stream_tag(struct input_stream *is)
|
||||||
|
65
src/decoder/ffmpeg_metadata.c
Normal file
65
src/decoder/ffmpeg_metadata.c
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2012 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "ffmpeg_metadata.h"
|
||||||
|
#include "tag.h"
|
||||||
|
|
||||||
|
#undef G_LOG_DOMAIN
|
||||||
|
#define G_LOG_DOMAIN "ffmpeg"
|
||||||
|
|
||||||
|
typedef struct ffmpeg_tag_map {
|
||||||
|
enum tag_type type;
|
||||||
|
const char *name;
|
||||||
|
} ffmpeg_tag_map;
|
||||||
|
|
||||||
|
static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
|
||||||
|
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8))
|
||||||
|
{ TAG_ARTIST, "author" },
|
||||||
|
{ TAG_DATE, "year" },
|
||||||
|
#endif
|
||||||
|
{ TAG_ARTIST_SORT, "author-sort" },
|
||||||
|
{ TAG_ALBUM_ARTIST, "album_artist" },
|
||||||
|
{ TAG_ALBUM_ARTIST_SORT, "album_artist-sort" },
|
||||||
|
|
||||||
|
/* sentinel */
|
||||||
|
{ TAG_NUM_OF_ITEM_TYPES, NULL }
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
ffmpeg_copy_metadata(struct tag *tag, enum tag_type type,
|
||||||
|
AVDictionary *m, const char *name)
|
||||||
|
{
|
||||||
|
AVDictionaryEntry *mt = NULL;
|
||||||
|
|
||||||
|
while ((mt = av_dict_get(m, name, mt, 0)) != NULL)
|
||||||
|
tag_add_item(tag, type, mt->value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ffmpeg_copy_dictionary(struct tag *tag, AVDictionary *dict)
|
||||||
|
{
|
||||||
|
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
|
||||||
|
ffmpeg_copy_metadata(tag, i,
|
||||||
|
dict, tag_item_names[i]);
|
||||||
|
|
||||||
|
for (const struct ffmpeg_tag_map *i = ffmpeg_tag_maps;
|
||||||
|
i->name != NULL; ++i)
|
||||||
|
ffmpeg_copy_metadata(tag, i->type, dict, i->name);
|
||||||
|
}
|
40
src/decoder/ffmpeg_metadata.h
Normal file
40
src/decoder/ffmpeg_metadata.h
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2003-2012 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef MPD_FFMPEG_METADATA_H
|
||||||
|
#define MPD_FFMPEG_METADATA_H
|
||||||
|
|
||||||
|
#include <libavformat/avformat.h>
|
||||||
|
#include <libavutil/avutil.h>
|
||||||
|
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
|
||||||
|
#include <libavutil/dict.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
|
||||||
|
#define AVDictionary AVMetadata
|
||||||
|
#define AVDictionaryEntry AVMetadataTag
|
||||||
|
#define av_dict_get av_metadata_get
|
||||||
|
#endif
|
||||||
|
|
||||||
|
struct tag;
|
||||||
|
|
||||||
|
void
|
||||||
|
ffmpeg_copy_dictionary(struct tag *tag, AVDictionary *dict);
|
||||||
|
|
||||||
|
#endif
|
Loading…
x
Reference in New Issue
Block a user