Move of mpegtsparse to mpegdemux
Original commit message from CVS: Move of mpegtsparse to mpegdemux
This commit is contained in:
parent
453b704a09
commit
8aea40af0b
@ -248,9 +248,8 @@ mpegts_parse_reset (MpegTSParse * parse)
|
|||||||
/* PAT */
|
/* PAT */
|
||||||
g_hash_table_insert (parse->psi_pids,
|
g_hash_table_insert (parse->psi_pids,
|
||||||
GINT_TO_POINTER (0), GINT_TO_POINTER (1));
|
GINT_TO_POINTER (0), GINT_TO_POINTER (1));
|
||||||
parse->pat = NULL;
|
|
||||||
/* pmt pids will be added and removed dynamically */
|
|
||||||
|
|
||||||
|
/* pmt pids will be added and removed dynamically */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -291,10 +290,8 @@ mpegts_parse_finalize (GObject * object)
|
|||||||
MpegTSParse *parse = GST_MPEGTS_PARSE (object);
|
MpegTSParse *parse = GST_MPEGTS_PARSE (object);
|
||||||
|
|
||||||
g_free (parse->program_numbers);
|
g_free (parse->program_numbers);
|
||||||
if (parse->pat) {
|
if (parse->pat)
|
||||||
gst_structure_free (parse->pat);
|
gst_structure_free (parse->pat);
|
||||||
parse->pat = NULL;
|
|
||||||
}
|
|
||||||
g_hash_table_destroy (parse->programs);
|
g_hash_table_destroy (parse->programs);
|
||||||
g_hash_table_destroy (parse->psi_pids);
|
g_hash_table_destroy (parse->psi_pids);
|
||||||
|
|
||||||
@ -851,7 +848,7 @@ mpegts_parse_apply_pat (MpegTSParse * parse, GstStructure * pat_info)
|
|||||||
gchar *dbg;
|
gchar *dbg;
|
||||||
|
|
||||||
old_pat = parse->pat;
|
old_pat = parse->pat;
|
||||||
parse->pat = gst_structure_copy (pat_info);
|
parse->pat = pat_info;
|
||||||
|
|
||||||
dbg = gst_structure_to_string (pat_info);
|
dbg = gst_structure_to_string (pat_info);
|
||||||
GST_INFO_OBJECT (parse, "PAT %s", dbg);
|
GST_INFO_OBJECT (parse, "PAT %s", dbg);
|
||||||
@ -975,16 +972,14 @@ mpegts_parse_apply_pmt (MpegTSParse * parse,
|
|||||||
for (i = 0; i < gst_value_list_get_size (old_streams); ++i) {
|
for (i = 0; i < gst_value_list_get_size (old_streams); ++i) {
|
||||||
value = gst_value_list_get_value (old_streams, i);
|
value = gst_value_list_get_value (old_streams, i);
|
||||||
stream = g_value_get_boxed (value);
|
stream = g_value_get_boxed (value);
|
||||||
|
|
||||||
gst_structure_get_uint (stream, "pid", &pid);
|
gst_structure_get_uint (stream, "pid", &pid);
|
||||||
gst_structure_get_uint (stream, "stream-type", &stream_type);
|
gst_structure_get_uint (stream, "stream-type", &stream_type);
|
||||||
mpegts_parse_program_remove_stream (parse, program, (guint16) pid);
|
mpegts_parse_program_remove_stream (parse, program, (guint16) pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* remove pcr stream */
|
/* remove pcr stream */
|
||||||
mpegts_parse_program_remove_stream (parse, program, program->pcr_pid);
|
mpegts_parse_program_remove_stream (parse, program, program->pcr_pid);
|
||||||
|
|
||||||
gst_structure_free (program->pmt_info);
|
gst_structure_free (program->pmt_info);
|
||||||
program->pmt_info = NULL;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* no PAT?? */
|
/* no PAT?? */
|
||||||
@ -994,7 +989,7 @@ mpegts_parse_apply_pmt (MpegTSParse * parse,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* activate new pmt */
|
/* activate new pmt */
|
||||||
program->pmt_info = gst_structure_copy (pmt_info);
|
program->pmt_info = pmt_info;
|
||||||
program->pmt_pid = pmt_pid;
|
program->pmt_pid = pmt_pid;
|
||||||
program->pcr_pid = pcr_pid;
|
program->pcr_pid = pcr_pid;
|
||||||
mpegts_parse_program_add_stream (parse, program, (guint16) pcr_pid, -1);
|
mpegts_parse_program_add_stream (parse, program, (guint16) pcr_pid, -1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user