gst/mpegtsparse/mpegtspacketizer.c: Cable delivery subsystem descriptors' frequency...

Original commit message from CVS:
* gst/mpegtsparse/mpegtspacketizer.c:
Cable delivery subsystem descriptors' frequency's bcd
is measured in 100Hz units so adjust multiplier accordingly.

diff --git a/ChangeLog b/ChangeLog
index 06530a7d5e2a15ce0050dd3b6201df35c38870eb..aae05ca3b2cd54a7674284db00cf91c6ae1b1302 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-01  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       * gst/mpegtsparse/mpegtspacketizer.c:
+       Cable delivery subsystem descriptors' frequency's bcd
+       is measured in 100Hz units so adjust multiplier accordingly.
+
 2008-04-01  Thijs Vermeir  <thijsvermeir@gmail.com>
 
        * configure.ac:

diff --git a/gst/mpegtsparse/mpegtspacketizer.c b/gst/mpegtsparse/mpegtspacketizer.c
index 6e80f0513c63ab36ca10c968d55ff0d840cecd43..526a25dfdaf3f78cc4240554dd2a38404446f90a 100644 (file)
--- a/gst/mpegtsparse/mpegtspacketizer.c
+++ b/gst/mpegtsparse/mpegtspacketizer.c
@@ -941,8 +941,11 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
 
         guint8 *frequency_bcd =
             DESC_DVB_CABLE_DELIVERY_SYSTEM_frequency (delivery);
-        guint32 frequency =
-            10 * ((frequency_bcd[3] & 0x0F) +
+        /* see en 300 468 section 6.2.13.1 least significant bcd digit
+         * is measured in 100Hz units so multiplier needs to be 100 to get
+         * into Hz */
+        guint32 frequency = 100 *
+            ((frequency_bcd[3] & 0x0F) +
             10 * ((frequency_bcd[3] & 0xF0) >> 4) +
             100 * (frequency_bcd[2] & 0x0F) +
             1000 * ((frequency_bcd[2] & 0xF0) >> 4) +