kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[FFmpeg Decoder] Better handle Matroska tags 

Matroska files use the "TITLE" field for the album when there are
chapters. Also, Matroska container uses shorter gain field names for
album and track gain, differentiating them by either being global or
specific to each chapter.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
lastfm
Christopher Snowhill 2022-07-05 17:40:57 -07:00
parent fadebd39ea
commit a8b13748d6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plugins/FFMPEG/FFMPEGDecoder.m
View File

@ -585,7 +585,12 @@ static uint8_t reverse_bits[0x100];
} else if(!strcasecmp(tag->key, "artist")) { } else if(!strcasecmp(tag->key, "artist")) {
_artist = guess_encoding_of_string(tag->value); _artist = guess_encoding_of_string(tag->value);
} else if(!strcasecmp(tag->key, "title")) { } else if(!strcasecmp(tag->key, "title")) {
_title = guess_encoding_of_string(tag->value); NSString *_tag = guess_encoding_of_string(tag->value);
if(i == 0 && formatCtx->nb_chapters > 1) {
_album = _tag;
} else {
_title = _tag;
}
} else if(!strcasecmp(tag->key, "date")) { } else if(!strcasecmp(tag->key, "date")) {
NSString *dateString = guess_encoding_of_string(tag->value); NSString *dateString = guess_encoding_of_string(tag->value);
_year = @([dateString intValue]); _year = @([dateString intValue]);
@ -607,6 +612,16 @@ static uint8_t reverse_bits[0x100];
} else if(!strcasecmp(tag->key, "replaygain_track_peak")) { } else if(!strcasecmp(tag->key, "replaygain_track_peak")) {
NSString *rgValue = guess_encoding_of_string(tag->value); NSString *rgValue = guess_encoding_of_string(tag->value);
_replayGainTrackPeak = [rgValue floatValue]; _replayGainTrackPeak = [rgValue floatValue];
} else if(!strcasecmp(tag->key, "replaygain_gain")) {
// global or chapter gain
NSString *rgValue = guess_encoding_of_string(tag->value);
if(i == 0) _replayGainAlbumGain = [rgValue floatValue];
else _replayGainTrackGain = [rgValue floatValue];
} else if(!strcasecmp(tag->key, "replaygain_peak")) {
// global or chapter peak
NSString *rgValue = guess_encoding_of_string(tag->value);
if(i == 0) _replayGainAlbumPeak = [rgValue floatValue];
else _replayGainTrackPeak = [rgValue floatValue];
} else if(!strcasecmp(tag->key, "iTunNORM")) { } else if(!strcasecmp(tag->key, "iTunNORM")) {
NSString *tagString = guess_encoding_of_string(tag->value); NSString *tagString = guess_encoding_of_string(tag->value);
NSArray *tag = [tagString componentsSeparatedByString:@" "]; NSArray *tag = [tagString componentsSeparatedByString:@" "];