MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run two passes for gathering metadata 

The extra md_map needs to be used before the generic md_map because
the extra md_map needs to be used before av_metadata_conv while the
generic md_map needs to be used after av_metadata_conv. This allows
handling of things like ID3v2 track fields which get mapped to the
generic track field by av_metadata_conv but actually contain both
track number and the total number of tracks on the disc.

Note: modified from Dustin's original patch.
This commit is contained in:
Dustin King 2010-04-08 08:10:15 -07:00 committed by Julien BLACHE
parent b8b205e7f2
commit 61f5b6d833
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/filescanner_ffmpeg.c
View File

@ -216,22 +216,35 @@ extract_metadata_core(struct media_file_info *mfi, AVMetadata *md, const struct
} }
static int static int
extract_metadata(struct media_file_info *mfi, AVMetadata *md, const struct metadata_map *extra_md_map) extract_metadata(struct media_file_info *mfi, AVFormatContext *ctx, AVStream *audio_stream, AVStream *video_stream, const struct metadata_map *md_map)
{ {
int mdcount; int mdcount;
int extra; int ret;
mdcount = extract_metadata_core(mfi, md, md_map_generic); mdcount = 0;
DPRINTF(E_DBG, L_SCAN, "Picked up %d metadata with generic map\n", mdcount); if (ctx->metadata)
if (extra_md_map)
{ {
extra = extract_metadata_core(mfi, md, extra_md_map); ret = extract_metadata_core(mfi, ctx->metadata, md_map);
mdcount += ret;
DPRINTF(E_DBG, L_SCAN, "Picked up %d metadata with extra map\n", extra); DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from file metadata\n", ret);
}
mdcount += extra; if (audio_stream->metadata)
{
ret = extract_metadata_core(mfi, audio_stream->metadata, md_map);
mdcount += ret;
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from audio stream metadata\n", ret);
}
if (video_stream && video_stream->metadata)
{
ret = extract_metadata_core(mfi, video_stream->metadata, md_map);
mdcount += ret;
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from video stream metadata\n", ret);
} }
return mdcount; return mdcount;
@ -476,34 +489,20 @@ scan_metadata_ffmpeg(char *file, struct media_file_info *mfi)
goto skip_extract; goto skip_extract;
} }
if (extra_md_map)
{
ret = extract_metadata(mfi, ctx, audio_stream, video_stream, extra_md_map);
mdcount += ret;
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags with extra md_map\n", ret);
}
av_metadata_conv(ctx, NULL, ctx->iformat->metadata_conv); av_metadata_conv(ctx, NULL, ctx->iformat->metadata_conv);
if (ctx->metadata) ret = extract_metadata(mfi, ctx, audio_stream, video_stream, md_map_generic);
{
ret = extract_metadata(mfi, ctx->metadata, extra_md_map);
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from file metadata\n", ret);
mdcount += ret; mdcount += ret;
}
if (audio_stream->metadata) DPRINTF(E_DBG, L_SCAN, "Picked up %d tags with generic md_map, %d tags total\n", ret, mdcount);
{
ret = extract_metadata(mfi, audio_stream->metadata, extra_md_map);
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from audio stream metadata\n", ret);
mdcount += ret;
}
if (video_stream && video_stream->metadata)
{
ret = extract_metadata(mfi, video_stream->metadata, extra_md_map);
DPRINTF(E_DBG, L_SCAN, "Picked up %d tags from video stream metadata\n", ret);
mdcount += ret;
}
/* fix up TV metadata */ /* fix up TV metadata */
if (mfi->media_kind == 10) if (mfi->media_kind == 10)