diff mbox

[FFmpeg-devel] Fix spelling in ID3v1 genres and extend the list of Winamp extensions.

Message ID 20191223104310.GB15985@acme.spoerlein.net
State New
Headers show

Commit Message

Ulrich Spörlein Dec. 23, 2019, 10:43 a.m. UTC 
On Sun, 2019-12-22 at 18:44:01 +0100, Michael Niedermayer wrote:
> a reference to a VCS should include the version
> similarly for wikipedia some revission of the page should be mentioned in
> the commit message

Heh, this is already a defunct standard, I doubt it will ever change
again. I've updated the commit message to provide more direct links to
fixed versions in time, hth, please see attached.

Comments

Michael Niedermayer Dec. 23, 2019, 11:42 p.m. UTC | #1 
On Mon, Dec 23, 2019 at 11:43:10AM +0100, Ulrich Spörlein wrote:
> On Sun, 2019-12-22 at 18:44:01 +0100, Michael Niedermayer wrote:
> > a reference to a VCS should include the version
> > similarly for wikipedia some revission of the page should be mentioned in
> > the commit message
> 
> Heh, this is already a defunct standard, I doubt it will ever change
> again. I've updated the commit message to provide more direct links to
> fixed versions in time, hth, please see attached.
> 
> 

>  id3v1.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
>  id3v1.h |    2 +-
>  2 files changed, 52 insertions(+), 8 deletions(-)
> 18bb5fc86701a138c90c9bc95737d5a18299c6ea  0001-libavformat-fix-spelling-in-ID3v1-genres-and-extend-.patch
> From 55601483bdc8c002f3b8c19f830ab6ebbf4586cd Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uspoerlein@gmail.com>
> Date: Thu, 19 Dec 2019 16:12:46 +0100
> Subject: [PATCH] libavformat: fix spelling in ID3v1 genres and extend the list
>  of Winamp extensions.
> 
> Sources include various lists on the Internet, as well as the current
> Wikipedia page at
> https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343
> but most importantly the list as used by taglib at
> https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde
> 
> Further patches to harmonize the spelling have been sent to taglib and
> libid3tag. See also https://github.com/taglib/taglib/pull/942/
> ---
>  libavformat/id3v1.c | 58 +++++++++++++++++++++++++++++++++++++++------
>  libavformat/id3v1.h |  2 +-
>  2 files changed, 52 insertions(+), 8 deletions(-)

patch may be ok, but spelling is not my strong side ;)

[...]
Ulrich Spörlein Dec. 25, 2019, 3:44 p.m. UTC | #2 
On Tue, 24 Dec 2019, 00:42 Michael Niedermayer, <michael@niedermayer.cc>
wrote:

> On Mon, Dec 23, 2019 at 11:43:10AM +0100, Ulrich Spörlein wrote:
> > On Sun, 2019-12-22 at 18:44:01 +0100, Michael Niedermayer wrote:
> > > a reference to a VCS should include the version
> > > similarly for wikipedia some revission of the page should be mentioned
> in
> > > the commit message
> >
> > Heh, this is already a defunct standard, I doubt it will ever change
> > again. I've updated the commit message to provide more direct links to
> > fixed versions in time, hth, please see attached.
> >
> >
>
> >  id3v1.c |   58
> +++++++++++++++++++++++++++++++++++++++++++++++++++-------
> >  id3v1.h |    2 +-
> >  2 files changed, 52 insertions(+), 8 deletions(-)
> > 18bb5fc86701a138c90c9bc95737d5a18299c6ea
> 0001-libavformat-fix-spelling-in-ID3v1-genres-and-extend-.patch
> > From 55601483bdc8c002f3b8c19f830ab6ebbf4586cd Mon Sep 17 00:00:00 2001
> > From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uspoerlein@gmail.com>
> > Date: Thu, 19 Dec 2019 16:12:46 +0100
> > Subject: [PATCH] libavformat: fix spelling in ID3v1 genres and extend
> the list
> >  of Winamp extensions.
> >
> > Sources include various lists on the Internet, as well as the current
> > Wikipedia page at
> >
> https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343
> > but most importantly the list as used by taglib at
> >
> https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde
> >
> > Further patches to harmonize the spelling have been sent to taglib and
> > libid3tag. See also https://github.com/taglib/taglib/pull/942/
> > ---
> >  libavformat/id3v1.c | 58 +++++++++++++++++++++++++++++++++++++++------
> >  libavformat/id3v1.h |  2 +-
> >  2 files changed, 52 insertions(+), 8 deletions(-)
>
> patch may be ok, but spelling is not my strong side ;)
>

Heh ;)
The main thing really is the extension of the genre list. So where do we go
from here, who can commit this? Is there anything else for me to do?

Happy holidays!
Uli
Michael Niedermayer Dec. 25, 2019, 8:45 p.m. UTC | #3 
On Wed, Dec 25, 2019 at 04:44:51PM +0100, Ulrich Spörlein wrote:
> On Tue, 24 Dec 2019, 00:42 Michael Niedermayer, <michael@niedermayer.cc>
> wrote:
> 
> > On Mon, Dec 23, 2019 at 11:43:10AM +0100, Ulrich Spörlein wrote:
> > > On Sun, 2019-12-22 at 18:44:01 +0100, Michael Niedermayer wrote:
> > > > a reference to a VCS should include the version
> > > > similarly for wikipedia some revission of the page should be mentioned
> > in
> > > > the commit message
> > >
> > > Heh, this is already a defunct standard, I doubt it will ever change
> > > again. I've updated the commit message to provide more direct links to
> > > fixed versions in time, hth, please see attached.
> > >
> > >
> >
> > >  id3v1.c |   58
> > +++++++++++++++++++++++++++++++++++++++++++++++++++-------
> > >  id3v1.h |    2 +-
> > >  2 files changed, 52 insertions(+), 8 deletions(-)
> > > 18bb5fc86701a138c90c9bc95737d5a18299c6ea
> > 0001-libavformat-fix-spelling-in-ID3v1-genres-and-extend-.patch
> > > From 55601483bdc8c002f3b8c19f830ab6ebbf4586cd Mon Sep 17 00:00:00 2001
> > > From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uspoerlein@gmail.com>
> > > Date: Thu, 19 Dec 2019 16:12:46 +0100
> > > Subject: [PATCH] libavformat: fix spelling in ID3v1 genres and extend
> > the list
> > >  of Winamp extensions.
> > >
> > > Sources include various lists on the Internet, as well as the current
> > > Wikipedia page at
> > >
> > https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343
> > > but most importantly the list as used by taglib at
> > >
> > https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde
> > >
> > > Further patches to harmonize the spelling have been sent to taglib and
> > > libid3tag. See also https://github.com/taglib/taglib/pull/942/
> > > ---
> > >  libavformat/id3v1.c | 58 +++++++++++++++++++++++++++++++++++++++------
> > >  libavformat/id3v1.h |  2 +-
> > >  2 files changed, 52 insertions(+), 8 deletions(-)
> >
> > patch may be ok, but spelling is not my strong side ;)
> >
> 
> Heh ;)
> The main thing really is the extension of the genre list. So where do we go
> from here, who can commit this? Is there anything else for me to do?

i guess, ping it in a 1-2 weeks and ill apply it if noone else commented

thanks

[...]
Michael Niedermayer Jan. 4, 2020, 11:27 p.m. UTC | #4 
On Wed, Dec 25, 2019 at 09:45:47PM +0100, Michael Niedermayer wrote:
> On Wed, Dec 25, 2019 at 04:44:51PM +0100, Ulrich Spörlein wrote:
> > On Tue, 24 Dec 2019, 00:42 Michael Niedermayer, <michael@niedermayer.cc>
> > wrote:
> > 
> > > On Mon, Dec 23, 2019 at 11:43:10AM +0100, Ulrich Spörlein wrote:
> > > > On Sun, 2019-12-22 at 18:44:01 +0100, Michael Niedermayer wrote:
> > > > > a reference to a VCS should include the version
> > > > > similarly for wikipedia some revission of the page should be mentioned
> > > in
> > > > > the commit message
> > > >
> > > > Heh, this is already a defunct standard, I doubt it will ever change
> > > > again. I've updated the commit message to provide more direct links to
> > > > fixed versions in time, hth, please see attached.
> > > >
> > > >
> > >
> > > >  id3v1.c |   58
> > > +++++++++++++++++++++++++++++++++++++++++++++++++++-------
> > > >  id3v1.h |    2 +-
> > > >  2 files changed, 52 insertions(+), 8 deletions(-)
> > > > 18bb5fc86701a138c90c9bc95737d5a18299c6ea
> > > 0001-libavformat-fix-spelling-in-ID3v1-genres-and-extend-.patch
> > > > From 55601483bdc8c002f3b8c19f830ab6ebbf4586cd Mon Sep 17 00:00:00 2001
> > > > From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uspoerlein@gmail.com>
> > > > Date: Thu, 19 Dec 2019 16:12:46 +0100
> > > > Subject: [PATCH] libavformat: fix spelling in ID3v1 genres and extend
> > > the list
> > > >  of Winamp extensions.
> > > >
> > > > Sources include various lists on the Internet, as well as the current
> > > > Wikipedia page at
> > > >
> > > https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343
> > > > but most importantly the list as used by taglib at
> > > >
> > > https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde
> > > >
> > > > Further patches to harmonize the spelling have been sent to taglib and
> > > > libid3tag. See also https://github.com/taglib/taglib/pull/942/
> > > > ---
> > > >  libavformat/id3v1.c | 58 +++++++++++++++++++++++++++++++++++++++------
> > > >  libavformat/id3v1.h |  2 +-
> > > >  2 files changed, 52 insertions(+), 8 deletions(-)
> > >
> > > patch may be ok, but spelling is not my strong side ;)
> > >
> > 
> > Heh ;)
> > The main thing really is the extension of the genre list. So where do we go
> > from here, who can commit this? Is there anything else for me to do?
> 
> i guess, ping it in a 1-2 weeks and ill apply it if noone else commented

a week passed, will apply this soon

thx

[...]
diff mbox

Patch

From 55601483bdc8c002f3b8c19f830ab6ebbf4586cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uspoerlein@gmail.com>
Date: Thu, 19 Dec 2019 16:12:46 +0100
Subject: [PATCH] libavformat: fix spelling in ID3v1 genres and extend the list
 of Winamp extensions.

Sources include various lists on the Internet, as well as the current
Wikipedia page at
https://en.wikipedia.org/w/index.php?title=List_of_ID3v1_Genres&oldid=896774343
but most importantly the list as used by taglib at
https://github.com/taglib/taglib/commit/3e60e339a4bc46e2a1a7aea782502480561a8acf#diff-f86455366624350770f41b4940925dde

Further patches to harmonize the spelling have been sent to taglib and
libid3tag. See also https://github.com/taglib/taglib/pull/942/
---
 libavformat/id3v1.c | 58 +++++++++++++++++++++++++++++++++++++++------
 libavformat/id3v1.h |  2 +-
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c
index 19be42121d..eb66098f51 100644
--- a/libavformat/id3v1.c
+++ b/libavformat/id3v1.c
@@ -92,7 +92,7 @@  const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
      [64] = "Native American",
      [65] = "Cabaret",
      [66] = "New Wave",
-     [67] = "Psychadelic", /* sic, the misspelling is used in the specification */
+     [67] = "Psychedelic",
      [68] = "Rave",
      [69] = "Showtunes",
      [70] = "Trailer",
@@ -110,7 +110,7 @@  const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
      [82] = "National Folk",
      [83] = "Swing",
      [84] = "Fast Fusion",
-     [85] = "Bebob",
+     [85] = "Bebop",
      [86] = "Latin",
      [87] = "Revival",
      [88] = "Celtic",
@@ -148,20 +148,20 @@  const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
     [120] = "Duet",
     [121] = "Punk Rock",
     [122] = "Drum Solo",
-    [123] = "A capella",
+    [123] = "A Cappella",
     [124] = "Euro-House",
     [125] = "Dance Hall",
     [126] = "Goa",
     [127] = "Drum & Bass",
     [128] = "Club-House",
-    [129] = "Hardcore",
+    [129] = "Hardcore Techno",
     [130] = "Terror",
     [131] = "Indie",
     [132] = "BritPop",
     [133] = "Negerpunk",
     [134] = "Polsk Punk",
     [135] = "Beat",
-    [136] = "Christian Gangsta",
+    [136] = "Christian Gangsta Rap",
     [137] = "Heavy Metal",
     [138] = "Black Metal",
     [139] = "Crossover",
@@ -171,8 +171,52 @@  const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
     [143] = "Salsa",
     [144] = "Thrash Metal",
     [145] = "Anime",
-    [146] = "JPop",
-    [147] = "SynthPop",
+    [146] = "Jpop",
+    [147] = "Synthpop",
+    [148] = "Abstract",
+    [149] = "Art Rock",
+    [150] = "Baroque",
+    [151] = "Bhangra",
+    [152] = "Big Beat",
+    [153] = "Breakbeat",
+    [154] = "Chillout",
+    [155] = "Downtempo",
+    [156] = "Dub",
+    [157] = "EBM",
+    [158] = "Eclectic",
+    [159] = "Electro",
+    [160] = "Electroclash",
+    [161] = "Emo",
+    [162] = "Experimental",
+    [163] = "Garage",
+    [164] = "Global",
+    [165] = "IDM",
+    [166] = "Illbient",
+    [167] = "Industro-Goth",
+    [168] = "Jam Band",
+    [169] = "Krautrock",
+    [170] = "Leftfield",
+    [171] = "Lounge",
+    [172] = "Math Rock",
+    [173] = "New Romantic",
+    [174] = "Nu-Breakz",
+    [175] = "Post-Punk",
+    [176] = "Post-Rock",
+    [177] = "Psytrance",
+    [178] = "Shoegaze",
+    [179] = "Space Rock",
+    [180] = "Trop Rock",
+    [181] = "World Music",
+    [182] = "Neoclassical",
+    [183] = "Audiobook",
+    [184] = "Audio Theatre",
+    [185] = "Neue Deutsche Welle",
+    [186] = "Podcast",
+    [187] = "Indie Rock",
+    [188] = "G-Funk",
+    [189] = "Dubstep",
+    [190] = "Garage Rock",
+    [191] = "Psybient"
 };
 
 static void get_string(AVFormatContext *s, const char *key,
diff --git a/libavformat/id3v1.h b/libavformat/id3v1.h
index d5dca35873..b3ad16df6c 100644
--- a/libavformat/id3v1.h
+++ b/libavformat/id3v1.h
@@ -26,7 +26,7 @@ 
 
 #define ID3v1_TAG_SIZE 128
 
-#define ID3v1_GENRE_MAX 147
+#define ID3v1_GENRE_MAX 191
 
 /**
  * ID3v1 genres
-- 
2.24.0