summaryrefslogtreecommitdiffstats
path: root/gst/mpegdemux
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2009-01-05 17:26:00 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2009-01-05 17:26:00 +0000
commit6decc6f3c15d5c1300d6d7976e2080f84a82b30d (patch)
treec7fdf16e6bbbde7e623a0ada3de0cc2478c3b597 /gst/mpegdemux
parent7dad262671187956c64a892d13c8eb89bad0a936 (diff)
downloadgst-plugins-bad-6decc6f3c15d5c1300d6d7976e2080f84a82b30d.tar.gz
gst-plugins-bad-6decc6f3c15d5c1300d6d7976e2080f84a82b30d.tar.bz2
gst-plugins-bad-6decc6f3c15d5c1300d6d7976e2080f84a82b30d.zip
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.
Diffstat (limited to 'gst/mpegdemux')
-rw-r--r--gst/mpegdemux/gstmpegdesc.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/gst/mpegdemux/gstmpegdesc.h b/gst/mpegdemux/gstmpegdesc.h
index 12b8377d..dc6851bd 100644
--- 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 */