diff options
| author | Tony Houghton <h@realh.co.uk> | 2011-07-13 19:25:08 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-06-21 11:37:21 +0100 |
| commit | a996d2f01a894e3d7a6cba94edc5db44aa1ef959 (patch) | |
| tree | fbdae243d4732cd3c0b41ef1e5c654219d814970 /gst/mpegtsdemux/gstmpegdesc.h | |
| parent | b8f32811ca1dbc50b31cedac7e13b373191b48d1 (diff) | |
| download | gstreamer-plugins-bad-a996d2f01a894e3d7a6cba94edc5db44aa1ef959.tar.gz | |
Correct satellite delivery descriptor parsing.
Original code to parse satellite delivery descriptors to generate
"satellite" structures appeared to be copy & pasted from cable's code
without amending for satellite.
Also added 8PSK to dvbsrc's enum for modulation.
https://bugzilla.gnome.org/show_bug.cgi?id=654485
Conflicts:
gst/mpegdemux/gstmpegdesc.h
gst/mpegdemux/mpegtspacketizer.c
Diffstat (limited to 'gst/mpegtsdemux/gstmpegdesc.h')
| -rw-r--r-- | gst/mpegtsdemux/gstmpegdesc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/mpegtsdemux/gstmpegdesc.h b/gst/mpegtsdemux/gstmpegdesc.h index d773f81e9..2e98a8776 100644 --- a/gst/mpegtsdemux/gstmpegdesc.h +++ b/gst/mpegtsdemux/gstmpegdesc.h @@ -293,7 +293,7 @@ #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_orbital_position(desc) (desc + 6) #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_west_east_flag(desc) ((desc[8] & 0x80) == 0x80) #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_polarization(desc) ((desc[8] >> 5) & 0x3) -#define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_modulation(desc) (desc[8] & 0x1F) +#define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_modulation(desc) (desc[8] & 0x3) #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_symbol_rate(desc) (desc + 9) #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_fec_inner(desc) (desc[12] & 0x0F) |