FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

audiocdsrc: Don't consider trailing data tracks for MusicBrainz disc id calculation

Browse Source 
MusicBrainz removes trailing data tracks from releases on the server
and also for the calculation of the MusicBrainz Disc ID.

https://bugzilla.gnome.org/show_bug.cgi?id=708991
This commit is contained in:
Johannes Dewender 2013-09-28 13:19:02 +02:00 committed by Sebastian Dröge
parent 09d628f8f1
commit 019ef0747d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gst-libs/gst/audio/gstaudiocdsrc.c
View File

@ -1189,13 +1189,23 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
gchar *ptr; gchar *ptr;
gchar tmp[9]; gchar tmp[9];
gulong i; gulong i;
unsigned int last_audio_track;
guint leadout_sector; guint leadout_sector;
gsize digest_len; gsize digest_len;
s = g_string_new (NULL); s = g_string_new (NULL);
/* MusicBrainz doesn't consider trailing data tracks
* data tracks up front stay, since the disc has to start with 1 */
last_audio_track = 0;
for (i = 0; i < src->priv->num_tracks; i++) {
if (src->priv->tracks[i].is_audio) {
last_audio_track = src->priv->tracks[i].num;
}
}
leadout_sector = leadout_sector =
src->priv->tracks[src->priv->num_tracks - 1].end + 1 + CD_MSF_OFFSET; src->priv->tracks[last_audio_track - 1].end + 1 + CD_MSF_OFFSET;
/* generate SHA digest */ /* generate SHA digest */
sha = g_checksum_new (G_CHECKSUM_SHA1); sha = g_checksum_new (G_CHECKSUM_SHA1);
@ -1203,10 +1213,8 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
g_string_append_printf (s, "%02X", src->priv->tracks[0].num); g_string_append_printf (s, "%02X", src->priv->tracks[0].num);
g_checksum_update (sha, (guchar *) tmp, 2); g_checksum_update (sha, (guchar *) tmp, 2);
g_snprintf (tmp, sizeof (tmp), "%02X", g_snprintf (tmp, sizeof (tmp), "%02X", last_audio_track);
src->priv->tracks[src->priv->num_tracks - 1].num); g_string_append_printf (s, " %02X", last_audio_track);
g_string_append_printf (s, " %02X",
src->priv->tracks[src->priv->num_tracks - 1].num);
g_checksum_update (sha, (guchar *) tmp, 2); g_checksum_update (sha, (guchar *) tmp, 2);
g_snprintf (tmp, sizeof (tmp), "%08X", leadout_sector); g_snprintf (tmp, sizeof (tmp), "%08X", leadout_sector);
@ -1214,7 +1222,7 @@ gst_audio_cd_src_calculate_musicbrainz_discid (GstAudioCdSrc * src)
g_checksum_update (sha, (guchar *) tmp, 8); g_checksum_update (sha, (guchar *) tmp, 8);
for (i = 0; i < 99; i++) { for (i = 0; i < 99; i++) {
if (i < src->priv->num_tracks) { if (i < last_audio_track) {
guint frame_offset = src->priv->tracks[i].start + CD_MSF_OFFSET; guint frame_offset = src->priv->tracks[i].start + CD_MSF_OFFSET;
g_snprintf (tmp, sizeof (tmp), "%08X", frame_offset); g_snprintf (tmp, sizeof (tmp), "%08X", frame_offset);