mp4: include codec information in ~format instead of defaulting to AA…

…C. Closes issue #1505.

quodlibet/quodlibet/formats/mp4.py

@@ -15,7 +15,7 @@
 
 
 class MP4File(AudioFile):
-    format = "MPEG-4 AAC"
+    format = "MPEG-4"
     mimes = ["audio/mp4", "audio/x-m4a", "audio/mpeg4", "audio/aac"]
 
     __translate = {
@@ -60,6 +60,8 @@ class MP4File(AudioFile):
 
     def __init__(self, filename):
         audio = MP4(filename)
+        self["~format"] = "%s %s" % (
+            self.format, getattr(audio.info, "codec_description", "AAC"))
         self["~#length"] = int(audio.info.length)
         self["~#bitrate"] = int(audio.info.bitrate / 1000)
         for key, values in audio.items():

quodlibet/tests/test_formats_mp4.py

@@ -8,6 +8,7 @@
 import os
 import shutil
 import StringIO
+import mutagen
 
 from tests import TestCase, DATA_DIR, mkstemp
 from quodlibet.formats.mp4 import MP4File
@@ -27,6 +28,12 @@ def setUp(self):
     def tearDown(self):
         os.unlink(self.f)
 
+    def test_format(self):
+        if mutagen.version >= (1, 27):
+            self.assertEqual(self.song("~format"), "MPEG-4 AAC LC")
+        else:
+            self.assertEqual(self.song("~format"), "MPEG-4 AAC")
+
     def test_basic(self):
         self.song["title"] = u"SomeTestValue"
         self.song.write()