mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Correct satellite delivery descriptor parsing.

Browse source 
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
This commit is contained in:
Tony Houghton 2011-07-13 19:25:08 +01:00 committed by Sebastian Dröge
parent b8f32811ca
commit a996d2f01a
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/mpegtsdemux/gstmpegdesc.h
View file

@ -293,7 +293,7 @@
#define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_orbital_position(desc) (desc + 6) #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_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_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_symbol_rate(desc) (desc + 9)
#define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_fec_inner(desc) (desc[12] & 0x0F) #define DESC_DVB_SATELLITE_DELIVERY_SYSTEM_fec_inner(desc) (desc[12] & 0x0F)

17
gst/mpegtsdemux/mpegtspacketizer.c
View file

@ -1086,25 +1086,20 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
} }
switch (modulation) { switch (modulation) {
case 0x00: case 0x00:
modulation_str = "undefined"; modulation_str = "auto";
break; break;
case 0x01: case 0x01:
modulation_str = "QAM16"; modulation_str = "QPSK";
break; break;
case 0x02: case 0x02:
modulation_str = "QAM32"; modulation_str = "8PSK";
break; break;
case 0x03: case 0x03:
modulation_str = "QAM64"; modulation_str = "QAM16";
break;
case 0x04:
modulation_str = "QAM128";
break;
case 0x05:
modulation_str = "QAM256";
break; break;
default: default:
modulation_str = "reserved"; modulation_str = "";
break;
} }
delivery_structure = gst_structure_new ("satellite", delivery_structure = gst_structure_new ("satellite",
"orbital", G_TYPE_FLOAT, orbital, "orbital", G_TYPE_FLOAT, orbital,

1
sys/dvb/gstdvbsrc.c
View file

@ -155,6 +155,7 @@ gst_dvbsrc_modulation_get_type (void)
{QAM_AUTO, "AUTO", "auto"}, {QAM_AUTO, "AUTO", "auto"},
{VSB_8, "8VSB", "8vsb"}, {VSB_8, "8VSB", "8vsb"},
{VSB_16, "16VSB", "16vsb"}, {VSB_16, "16VSB", "16vsb"},
{PSK_8, "8PSK", "8psk"},
{0, NULL, NULL}, {0, NULL, NULL},
}; };