people: Show more codec information for calls in the past

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/talk.py b/src/backend/talk.py
index a739231241384e29f3969739c3b41d78b99319b3..4f692f041bd25731bca496841c0ad3d11629a7b0 100644 (file)
--- a/src/backend/talk.py
+++ b/src/backend/talk.py
@@ -162,19 +162,7 @@ class Channel(object):
        @property
        def codec(self):
                # We always assume a symmetric codec
-               s = [
-                       self.data.write_codec,
-               ]
-
-               if self.data.write_rate:
-                       s.append("%.0f kHz" % (int(self.data.write_rate) / 1000.0))
-
-               if self.data.write_bit_rate == "0":
-                       s.append("VBR")
-               else:
-                       s.append("%.0f kBit/s" % (int(self.data.write_bit_rate) / 1000.0))
-
-               return " ".join(s)
+               return format_codec(self.data.write_codec, int(self.data.write_rate or 0), int(self.data.write_bit_rate or 0))
 
        def is_secure(self):
                if self.data.secure:
@@ -257,7 +245,7 @@ class CDR(object):
 
        @property
        def codec(self):
-               return self.data.write_codec
+               return format_codec(self.data.write_codec, int(self.data.write_rate or 0), int(self.data.write_bit_rate or 0))
 
        @property
        def user_agent(self):
@@ -324,3 +312,19 @@ class Conference(Object):
                        self._participants = self.backend.talk.get_ongoing_calls(sip_id=self.sip_id)
 
                return self._participants
+
+
+def format_codec(name, bit_rate, bandwidth):
+       s = [
+               name,
+       ]
+
+       if bit_rate:
+               s.append("%.0f kHz" % (bit_rate / 1000.0))
+
+       if bandwidth:
+               s.append("%.0f kBit/s" % (bandwidth / 1000.0))
+       else:
+               s.append("VBR")
+
+       return " ".join(s)