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

mpegtsmux: Minor fixes

Browse source
This commit is contained in:
Lin YANG 2009-07-22 20:27:36 +08:00 committed by Sebastian Dröge
parent 3ca8288c5b
commit e453e599af
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/mpegtsmux/mpegtsmux.c
View file

@ -467,8 +467,13 @@ mpegtsmux_create_streams (MpegTsMux * mux)
name = GST_PAD_NAME (c_data->pad); name = GST_PAD_NAME (c_data->pad);
if (mux->prog_map != NULL && gst_structure_has_field (mux->prog_map, if (mux->prog_map != NULL && gst_structure_has_field (mux->prog_map,
name)) { name)) {
guint idx = gint idx;
g_value_get_int (gst_structure_get_value (mux->prog_map, name)); gboolean ret = gst_structure_get_int (mux->prog_map, name, &idx);
if (!ret) {
GST_ELEMENT_ERROR (mux, STREAM, MUX,
("Reading program map failed. Assuming default"), (NULL));
idx = DEFAULT_PROG_ID;
}
if (idx < 0 || idx >= MAX_PROG_NUMBER) { if (idx < 0 || idx >= MAX_PROG_NUMBER) {
GST_DEBUG_OBJECT (mux, "Program number %d associate with pad %s out " GST_DEBUG_OBJECT (mux, "Program number %d associate with pad %s out "
"of range (max = %d); DEFAULT_PROGRAM = %d is used instead", "of range (max = %d); DEFAULT_PROGRAM = %d is used instead",
@ -481,8 +486,8 @@ mpegtsmux_create_streams (MpegTsMux * mux)
} }
} }
ts_data->prog = g_array_index (mux->programs, TsMuxProgram *, ts_data->prog =
ts_data->prog_id); (TsMuxProgram *) g_ptr_array_index (mux->programs, ts_data->prog_id);
if (ts_data->prog == NULL) { if (ts_data->prog == NULL) {
ts_data->prog = tsmux_program_new (mux->tsmux); ts_data->prog = tsmux_program_new (mux->tsmux);
if (ts_data->prog == NULL) if (ts_data->prog == NULL)
@ -499,8 +504,8 @@ mpegtsmux_create_streams (MpegTsMux * mux)
return GST_FLOW_OK; return GST_FLOW_OK;
no_program: no_program:
GST_ELEMENT_ERROR (mux, STREAM, MUX, ("tsmux_new_program error"), GST_ELEMENT_ERROR (mux, STREAM, MUX,
("Could not create new program")); ("Could not create new program"), (NULL));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
no_stream: no_stream:
GST_ELEMENT_ERROR (mux, STREAM, MUX, GST_ELEMENT_ERROR (mux, STREAM, MUX,
@ -664,8 +669,7 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
} }
} }
if (prog->pcr_stream == best->stream) { if (prog->pcr_stream == best->stream) {
/* FIXME: is this correct? */ mux->last_ts = best->last_ts;
mux->last_ts = best->last_ts; // how?
} }
} else { } else {
/* FIXME: Drain all remaining streams */ /* FIXME: Drain all remaining streams */