Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
378fa5ee
Commit
378fa5ee
authored
Feb 03, 2012
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/ffmpeg: support all MPD tags
Use the tag_item_names table to look up the names of all MPD tags, and remove the duplicate entries from ffmpeg_tag_maps.
parent
4764daf3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
NEWS
NEWS
+1
-0
ffmpeg_decoder_plugin.c
src/decoder/ffmpeg_decoder_plugin.c
+5
-12
No files found.
NEWS
View file @
378fa5ee
...
...
@@ -3,6 +3,7 @@ ver 0.16.7 (2011/??/??)
- ffmpeg: support libavformat 0.7
* decoder:
- ffmpeg: support libavformat 0.8, libavcodec 0.8
- ffmpeg: support all MPD tags
* output:
- httpd: fix excessive buffering
- openal: force 16 bit playback, as 8 bit doesn't work
...
...
src/decoder/ffmpeg_decoder_plugin.c
View file @
378fa5ee
...
...
@@ -587,24 +587,13 @@ typedef struct ffmpeg_tag_map {
}
ffmpeg_tag_map
;
static
const
ffmpeg_tag_map
ffmpeg_tag_maps
[]
=
{
{
TAG_TITLE
,
"title"
},
#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(50<<8))
{
TAG_ARTIST
,
"artist"
},
{
TAG_DATE
,
"date"
},
#else
#if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8))
{
TAG_ARTIST
,
"author"
},
{
TAG_DATE
,
"year"
},
#endif
{
TAG_ALBUM
,
"album"
},
{
TAG_COMMENT
,
"comment"
},
{
TAG_GENRE
,
"genre"
},
{
TAG_TRACK
,
"track"
},
{
TAG_ARTIST_SORT
,
"author-sort"
},
{
TAG_ALBUM_ARTIST
,
"album_artist"
},
{
TAG_ALBUM_ARTIST_SORT
,
"album_artist-sort"
},
{
TAG_COMPOSER
,
"composer"
},
{
TAG_PERFORMER
,
"performer"
},
{
TAG_DISC
,
"disc"
},
};
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
...
...
@@ -626,6 +615,10 @@ ffmpeg_copy_metadata(struct tag *tag, enum tag_type type,
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
(
unsigned
i
=
0
;
i
<
G_N_ELEMENTS
(
ffmpeg_tag_maps
);
i
++
)
ffmpeg_copy_metadata
(
tag
,
ffmpeg_tag_maps
[
i
].
type
,
dict
,
ffmpeg_tag_maps
[
i
].
name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment