gst/mpegdemux/gstmpegdesc.h: Fix up terrestrial delivery system descriptor defs.

Original commit message from CVS:
* gst/mpegdemux/gstmpegdesc.h:
Fix up terrestrial delivery system descriptor defs.
They should be shifted otherwise wrong values are seen.

diff --git a/ChangeLog b/ChangeLog
index ae4ea1e710591519959c5dfa7ba2b9b94e81358c..351505aa48d34b985f595fc8d5c10cd544923569 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-05  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       * gst/mpegdemux/gstmpegdesc.h:
+       Fix up terrestrial delivery system descriptor defs.
+       They should be shifted otherwise wrong values are seen.
+
 2009-01-05  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * gst/mxf/Makefile.am:

diff --git a/gst/mpegdemux/gstmpegdesc.h b/gst/mpegdemux/gstmpegdesc.h
index 12b8377d966491b2d018d6999a4b250d09ca8d38..dc6851bdbcb160785d5caee68da765dc4b771b06 100644 (file)
--- a/gst/mpegdemux/gstmpegdesc.h
+++ b/gst/mpegdemux/gstmpegdesc.h
@@ -286,13 +286,13 @@
 
 /* DVB Terrestrial Delivery System Descriptor */
 #define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_frequency(desc)   (GST_READ_UINT32_BE((desc) + 2))
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_bandwidth(desc)   (desc[6] & 0xE0)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_constellation(desc)       (desc[7] & 0xC0)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_hierarchy(desc)   (desc[7] & 0x38)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_code_rate_hp(desc)        (desc[7] & 0x07)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_code_rate_lp(desc)        (desc[8] & 0xE0)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_guard_interval(desc)      (desc[8] & 0x18)
-#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_transmission_mode(desc)   (desc[8] & 0x06)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_bandwidth(desc)   ((desc[6] >> 5) & 0x7)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_constellation(desc)       ((desc[7] >> 6) & 0x3)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_hierarchy(desc)   ((desc[7] >> 3) & 0x7)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_code_rate_hp(desc)        (desc[7] & 0x7)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_code_rate_lp(desc)        ((desc[8] >> 5) & 0x7)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_guard_interval(desc)      ((desc[8] >> 3) & 0x3)
+#define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_transmission_mode(desc)   ((desc[8] >> 1) & 0x3)
 #define DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM_other_frequency(desc)     ((desc[8] & 0x01) == 0x01)
 
 /* DVB Cable Delivery System Descriptor */