mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

structure: fix for api update

Browse source
This commit is contained in:
Wim Taymans 2011-10-29 09:09:25 +02:00
parent e14fbcc070
commit 17a982fe31
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/mpegtsdemux/mpegtspacketizer.c
View file

@ -454,7 +454,7 @@ mpegts_packetizer_parse_pat (MpegTSPacketizer2 * packetizer,
/* skip section_number and last_section_number */ /* skip section_number and last_section_number */
data += 2; data += 2;
pat_info = gst_structure_id_new (QUARK_PAT, pat_info = gst_structure_new_id (QUARK_PAT,
QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id, NULL); QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id, NULL);
g_value_init (&entries, GST_TYPE_LIST); g_value_init (&entries, GST_TYPE_LIST);
@ -469,7 +469,7 @@ mpegts_packetizer_parse_pat (MpegTSPacketizer2 * packetizer,
data += 2; data += 2;
struct_name = g_strdup_printf ("program-%d", program_number); struct_name = g_strdup_printf ("program-%d", program_number);
entry = gst_structure_empty_new (struct_name); entry = gst_structure_new_empty (struct_name);
g_free (struct_name); g_free (struct_name);
gst_structure_id_set (entry, QUARK_PROGRAM_NUMBER, G_TYPE_UINT, gst_structure_id_set (entry, QUARK_PROGRAM_NUMBER, G_TYPE_UINT,
program_number, QUARK_PID, G_TYPE_UINT, pmt_pid, NULL); program_number, QUARK_PID, G_TYPE_UINT, pmt_pid, NULL);
@ -547,7 +547,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
program_info_length = GST_READ_UINT16_BE (data) & 0x0FFF; program_info_length = GST_READ_UINT16_BE (data) & 0x0FFF;
data += 2; data += 2;
pmt = gst_structure_id_new (QUARK_PMT, pmt = gst_structure_new_id (QUARK_PMT,
QUARK_PROGRAM_NUMBER, G_TYPE_UINT, program_number, QUARK_PROGRAM_NUMBER, G_TYPE_UINT, program_number,
QUARK_PCR_PID, G_TYPE_UINT, pcr_pid, QUARK_PCR_PID, G_TYPE_UINT, pcr_pid,
QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number, NULL); QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number, NULL);
@ -593,7 +593,7 @@ mpegts_packetizer_parse_pmt (MpegTSPacketizer2 * packetizer,
} }
struct_name = g_strdup_printf ("pid-%d", pid); struct_name = g_strdup_printf ("pid-%d", pid);
stream_info = gst_structure_empty_new (struct_name); stream_info = gst_structure_new_empty (struct_name);
g_free (struct_name); g_free (struct_name);
gst_structure_id_set (stream_info, gst_structure_id_set (stream_info,
QUARK_PID, G_TYPE_UINT, pid, QUARK_STREAM_TYPE, G_TYPE_UINT, QUARK_PID, G_TYPE_UINT, pid, QUARK_STREAM_TYPE, G_TYPE_UINT,
@ -759,7 +759,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
descriptors_loop_length = GST_READ_UINT16_BE (data) & 0x0FFF; descriptors_loop_length = GST_READ_UINT16_BE (data) & 0x0FFF;
data += 2; data += 2;
nit = gst_structure_id_new (QUARK_NIT, nit = gst_structure_new_id (QUARK_NIT,
QUARK_NETWORK_ID, G_TYPE_UINT, network_id, QUARK_NETWORK_ID, G_TYPE_UINT, network_id,
QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number, QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number,
QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT, QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT,
@ -837,7 +837,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer2 * packetizer,
data += 2; data += 2;
transport_name = g_strdup_printf ("transport-%d", transport_stream_id); transport_name = g_strdup_printf ("transport-%d", transport_stream_id);
transport = gst_structure_empty_new (transport_name); transport = gst_structure_new_empty (transport_name);
g_free (transport_name); g_free (transport_name);
gst_structure_id_set (transport, gst_structure_id_set (transport,
QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id, QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id,
@ -1404,7 +1404,7 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
/* skip reserved byte */ /* skip reserved byte */
data += 1; data += 1;
sdt = gst_structure_id_new (QUARK_SDT, sdt = gst_structure_new_id (QUARK_SDT,
QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id, QUARK_TRANSPORT_STREAM_ID, G_TYPE_UINT, transport_stream_id,
QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number, QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number,
QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT, QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT,
@ -1443,7 +1443,7 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer2 * packetizer,
/* TODO send tag event down relevant pad for channel name and provider */ /* TODO send tag event down relevant pad for channel name and provider */
service_name = g_strdup_printf ("service-%d", service_id); service_name = g_strdup_printf ("service-%d", service_id);
service = gst_structure_empty_new (service_name); service = gst_structure_new_empty (service_name);
g_free (service_name); g_free (service_name);
if (descriptors_loop_length) { if (descriptors_loop_length) {
@ -1618,7 +1618,7 @@ mpegts_packetizer_parse_eit (MpegTSPacketizer2 * packetizer,
last_table_id = *data; last_table_id = *data;
data += 1; data += 1;
eit = gst_structure_id_new (QUARK_EIT, eit = gst_structure_new_id (QUARK_EIT,
QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number, QUARK_VERSION_NUMBER, G_TYPE_UINT, section->version_number,
QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT, QUARK_CURRENT_NEXT_INDICATOR, G_TYPE_UINT,
section->current_next_indicator, QUARK_SERVICE_ID, G_TYPE_UINT, section->current_next_indicator, QUARK_SERVICE_ID, G_TYPE_UINT,

8
gst/mpegtsdemux/tsdemux.c
View file

@ -1824,7 +1824,7 @@ gst_ts_demux_record_pcr (GstTSDemux * demux, TSDemuxStream * stream,
if (G_UNLIKELY (demux->emit_statistics)) { if (G_UNLIKELY (demux->emit_statistics)) {
GstStructure *st; GstStructure *st;
st = gst_structure_id_empty_new (QUARK_TSDEMUX); st = gst_structure_new_id_empty (QUARK_TSDEMUX);
gst_structure_id_set (st, gst_structure_id_set (st,
QUARK_PID, G_TYPE_UINT, bs->pid, QUARK_PID, G_TYPE_UINT, bs->pid,
QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_PCR, G_TYPE_UINT64, pcr, QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_PCR, G_TYPE_UINT64, pcr,
@ -1846,7 +1846,7 @@ gst_ts_demux_record_opcr (GstTSDemux * demux, TSDemuxStream * stream,
if (G_UNLIKELY (demux->emit_statistics)) { if (G_UNLIKELY (demux->emit_statistics)) {
GstStructure *st; GstStructure *st;
st = gst_structure_id_empty_new (QUARK_TSDEMUX); st = gst_structure_new_id_empty (QUARK_TSDEMUX);
gst_structure_id_set (st, gst_structure_id_set (st,
QUARK_PID, G_TYPE_UINT, bs->pid, QUARK_PID, G_TYPE_UINT, bs->pid,
QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_OFFSET, G_TYPE_UINT64, offset,
@ -1868,7 +1868,7 @@ gst_ts_demux_record_pts (GstTSDemux * demux, TSDemuxStream * stream,
if (G_UNLIKELY (demux->emit_statistics)) { if (G_UNLIKELY (demux->emit_statistics)) {
GstStructure *st; GstStructure *st;
st = gst_structure_id_empty_new (QUARK_TSDEMUX); st = gst_structure_new_id_empty (QUARK_TSDEMUX);
gst_structure_id_set (st, gst_structure_id_set (st,
QUARK_PID, G_TYPE_UINT, bs->pid, QUARK_PID, G_TYPE_UINT, bs->pid,
QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_PTS, G_TYPE_UINT64, pts, QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_PTS, G_TYPE_UINT64, pts,
@ -1890,7 +1890,7 @@ gst_ts_demux_record_dts (GstTSDemux * demux, TSDemuxStream * stream,
if (G_UNLIKELY (demux->emit_statistics)) { if (G_UNLIKELY (demux->emit_statistics)) {
GstStructure *st; GstStructure *st;
st = gst_structure_id_empty_new (QUARK_TSDEMUX); st = gst_structure_new_id_empty (QUARK_TSDEMUX);
gst_structure_id_set (st, gst_structure_id_set (st,
QUARK_PID, G_TYPE_UINT, bs->pid, QUARK_PID, G_TYPE_UINT, bs->pid,
QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_DTS, G_TYPE_UINT64, dts, QUARK_OFFSET, G_TYPE_UINT64, offset, QUARK_DTS, G_TYPE_UINT64, dts,

4
sys/dvb/gstdvbsrc.c
View file

@ -921,7 +921,7 @@ gst_dvbsrc_read_device (GstDvbSrc * object, int size)
/* timeout, post element message */ /* timeout, post element message */
gst_element_post_message (GST_ELEMENT_CAST (object), gst_element_post_message (GST_ELEMENT_CAST (object),
gst_message_new_element (GST_OBJECT (object), gst_message_new_element (GST_OBJECT (object),
gst_structure_empty_new ("dvb-read-failure"))); gst_structure_new_empty ("dvb-read-failure")));
} else { } else {
int nread = read (object->fd_dvr, data + count, size - count); int nread = read (object->fd_dvr, data + count, size - count);
@ -932,7 +932,7 @@ gst_dvbsrc_read_device (GstDvbSrc * object, int size)
object->adapter_number, object->frontend_number, errno); object->adapter_number, object->frontend_number, errno);
gst_element_post_message (GST_ELEMENT_CAST (object), gst_element_post_message (GST_ELEMENT_CAST (object),
gst_message_new_element (GST_OBJECT (object), gst_message_new_element (GST_OBJECT (object),
gst_structure_empty_new ("dvb-read-failure"))); gst_structure_new_empty ("dvb-read-failure")));
} else } else
count = count + nread; count = count + nread;
} }