mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 23:28:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroskamux: Consistently use gst_matroska_mux_set_codec_id() for setting the codec id

Browse source
This commit is contained in:
Sebastian Dröge 2016-07-07 18:14:43 +03:00
parent a06152c40a
commit cc636760b6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/matroska/matroska-mux.c
View file

@ -1216,7 +1216,8 @@ skip_details:
} else if (!strcmp (mimetype, "video/x-msmpeg")) { } else if (!strcmp (mimetype, "video/x-msmpeg")) {
msmpeg43: msmpeg43:
/* can only make it here if preceding case verified it was version 3 */ /* can only make it here if preceding case verified it was version 3 */
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MSMPEG4V3); gst_matroska_mux_set_codec_id (context,
GST_MATROSKA_CODEC_ID_VIDEO_MSMPEG4V3);
} else if (!strcmp (mimetype, "video/x-pn-realvideo")) { } else if (!strcmp (mimetype, "video/x-pn-realvideo")) {
gint rmversion; gint rmversion;
const GValue *mdpr_data; const GValue *mdpr_data;
@ -1854,7 +1855,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
} }
if (buf) { if (buf) {
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_AAC); gst_matroska_mux_set_codec_id (context,
GST_MATROSKA_CODEC_ID_AUDIO_AAC);
context->codec_priv_size = gst_buffer_get_size (buf); context->codec_priv_size = gst_buffer_get_size (buf);
context->codec_priv = g_malloc (context->codec_priv_size); context->codec_priv = g_malloc (context->codec_priv_size);
gst_buffer_extract (buf, 0, context->codec_priv, gst_buffer_extract (buf, 0, context->codec_priv,
@ -2290,7 +2292,7 @@ gst_matroska_mux_request_new_pad (GstElement * element,
GstMatroskaTrackContext *context = NULL; GstMatroskaTrackContext *context = NULL;
gint pad_id; gint pad_id;
gboolean locked = TRUE; gboolean locked = TRUE;
gchar *id = NULL; const gchar *id = NULL;
if (templ == gst_element_class_get_pad_template (klass, "audio_%u")) { if (templ == gst_element_class_get_pad_template (klass, "audio_%u")) {
/* don't mix named and unnamed pads, if the pad already exists we fail when /* don't mix named and unnamed pads, if the pad already exists we fail when
@ -2335,7 +2337,7 @@ gst_matroska_mux_request_new_pad (GstElement * element,
context->type = GST_MATROSKA_TRACK_TYPE_SUBTITLE; context->type = GST_MATROSKA_TRACK_TYPE_SUBTITLE;
context->name = g_strdup ("Subtitle"); context->name = g_strdup ("Subtitle");
/* setcaps may only provide proper one a lot later */ /* setcaps may only provide proper one a lot later */
id = g_strdup ("S_SUB_UNKNOWN"); id = "S_SUB_UNKNOWN";
locked = FALSE; locked = FALSE;
} else { } else {
GST_WARNING_OBJECT (mux, "This is not our template!"); GST_WARNING_OBJECT (mux, "This is not our template!");
@ -2354,7 +2356,8 @@ gst_matroska_mux_request_new_pad (GstElement * element,
collect_pad->mux = mux; collect_pad->mux = mux;
collect_pad->track = context; collect_pad->track = context;
gst_matroska_pad_reset (collect_pad, FALSE); gst_matroska_pad_reset (collect_pad, FALSE);
collect_pad->track->codec_id = id; if (id)
gst_matroska_mux_set_codec_id (collect_pad->track, id);
collect_pad->track->dts_only = FALSE; collect_pad->track->dts_only = FALSE;
collect_pad->capsfunc = capsfunc; collect_pad->capsfunc = capsfunc;