mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 18:23:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: Remove arbitrary constraint on prog-map program ids

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=746765
This commit is contained in:
Yanko Kaneti 2015-03-25 19:27:42 +02:00 committed by Jan Schmidt
parent e8a97877b4
commit fa9fa5d460
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/mpegtsmux/mpegtsmux.c
View file

@ -390,7 +390,10 @@ mpegtsmux_reset (MpegTsMux * mux, gboolean alloc)
mux->tsmux = NULL; mux->tsmux = NULL;
} }
memset (mux->programs, 0, sizeof (mux->programs)); if (mux->programs) {
g_hash_table_destroy (mux->programs);
}
mux->programs = g_hash_table_new (g_direct_hash, g_direct_equal);
if (mux->streamheader) { if (mux->streamheader) {
GstBuffer *buf; GstBuffer *buf;
@ -445,6 +448,10 @@ mpegtsmux_dispose (GObject * object)
gst_structure_free (mux->prog_map); gst_structure_free (mux->prog_map);
mux->prog_map = NULL; mux->prog_map = NULL;
} }
if (mux->programs) {
g_hash_table_destroy (mux->programs);
mux->programs = NULL;
}
GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object)); GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
} }
@ -750,10 +757,10 @@ mpegtsmux_create_streams (MpegTsMux * mux)
("Reading program map failed. Assuming default"), (NULL)); ("Reading program map failed. Assuming default"), (NULL));
idx = DEFAULT_PROG_ID; idx = DEFAULT_PROG_ID;
} }
if (idx < 0 || idx >= MAX_PROG_NUMBER) { if (idx < 0) {
GST_DEBUG_OBJECT (mux, "Program number %d associate with pad %s out " GST_DEBUG_OBJECT (mux, "Program number %d associate with pad %s less "
"of range (max = %d); DEFAULT_PROGRAM = %d is used instead", "than zero; DEFAULT_PROGRAM = %d is used instead",
idx, name, MAX_PROG_NUMBER, DEFAULT_PROG_ID); idx, name, DEFAULT_PROG_ID);
idx = DEFAULT_PROG_ID; idx = DEFAULT_PROG_ID;
} }
ts_data->prog_id = idx; ts_data->prog_id = idx;
@ -762,13 +769,15 @@ mpegtsmux_create_streams (MpegTsMux * mux)
} }
} }
ts_data->prog = mux->programs[ts_data->prog_id]; ts_data->prog =
g_hash_table_lookup (mux->programs, GINT_TO_POINTER (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_id); ts_data->prog = tsmux_program_new (mux->tsmux, ts_data->prog_id);
if (ts_data->prog == NULL) if (ts_data->prog == NULL)
goto no_program; goto no_program;
tsmux_set_pmt_interval (ts_data->prog, mux->pmt_interval); tsmux_set_pmt_interval (ts_data->prog, mux->pmt_interval);
mux->programs[ts_data->prog_id] = ts_data->prog; g_hash_table_insert (mux->programs,
GINT_TO_POINTER (ts_data->prog_id), ts_data->prog);
} }
if (ts_data->stream == NULL) { if (ts_data->stream == NULL) {

7
gst/mpegtsmux/mpegtsmux.h
View file

@ -112,7 +112,6 @@ G_BEGIN_DECLS
#define NORMAL_TS_PACKET_LENGTH 188 #define NORMAL_TS_PACKET_LENGTH 188
#define M2TS_PACKET_LENGTH 192 #define M2TS_PACKET_LENGTH 192
#define MAX_PROG_NUMBER 32
#define DEFAULT_PROG_ID 0 #define DEFAULT_PROG_ID 0
typedef struct MpegTsMux MpegTsMux; typedef struct MpegTsMux MpegTsMux;
@ -132,7 +131,7 @@ struct MpegTsMux {
GstCollectPads *collect; GstCollectPads *collect;
TsMux *tsmux; TsMux *tsmux;
TsMuxProgram *programs[MAX_PROG_NUMBER]; GHashTable *programs;
/* properties */ /* properties */
gboolean m2ts_mode; gboolean m2ts_mode;
@ -205,9 +204,9 @@ struct MpegTsPadData {
/* handler to free the private data */ /* handler to free the private data */
MpegTsPadDataFreePrepareDataFunction free_func; MpegTsPadDataFreePrepareDataFunction free_func;
/* program id == idx to which it is attached to (not program pid) */ /* program id to which it is attached to (not program pid) */
gint prog_id; gint prog_id;
/* program this stream belongs to == mux->programs[prog_id] */ /* program this stream belongs to */
TsMuxProgram *prog; TsMuxProgram *prog;
gchar *language; gchar *language;