Update Id3v2.php

src/Modules/Id3v2.php

@@ -160,18 +160,16 @@ private function parseItem(&$frames)
 
         switch ($encoding) {
             case self::HAS_BOM:
+                $value = Bom::removeBom($value);
                 break;
             case self::UTF_16:
                 $value = "\xFE\xFF" . $value;
                 break;
             case self::UTF_8:
                 break;
             default:
-                $value = utf8_encode($value);
         }
 
-        $value = Bom::removeBom($value);
-
         # Strings are unreliably terminated with nulls, so just strip any that are present
         $value = rtrim($value, "\0");
 

tests/Modules/Id3v2Test.php

@@ -70,6 +70,13 @@ public function testUtf16WithBom()
         $module = $this->getEncoded();
         assertSame("To Speak, to Listen", $module->getAlbum());
     }
+    public function testWin1251()
+    {
+        $file = new File(__DIR__ . "/../data/cp1251.mp3");
+        $module = new Id3v2();
+        $module->open($file);
+        assertSame("Аквариум", iconv("cp1251", "utf-8", $module->getArtist()));
+    }
     public function testUtf16WithoutBom()
     {
         $module = $this->getEncoded();