mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

quicktime: register 3gppmux element in addition to the misnamed gppmux

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-04-21 22:51:52 +01:00
parent 42531337f5
commit 0671b2325e
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/quicktime/gstqtmux.c
View file

@ -249,8 +249,9 @@ gst_qt_mux_base_init (gpointer g_class)
/* construct the element details struct */ /* construct the element details struct */
longname = g_strdup_printf ("%s Muxer", params->prop->long_name); longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
description = g_strdup_printf ("Multiplex audio and video into a %s file", description = g_strdup_printf ("Multiplex audio and video into a %s file%s",
params->prop->long_name); params->prop->long_name,
(params->prop->rank == GST_RANK_NONE) ? " (deprecated)" : "");
gst_element_class_set_details_simple (element_class, longname, gst_element_class_set_details_simple (element_class, longname,
"Codec/Muxer", description, "Codec/Muxer", description,
"Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>"); "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>");
@ -3501,7 +3502,7 @@ gst_qt_mux_register (GstPlugin * plugin)
g_type_add_interface_static (type, GST_TYPE_TAG_XMP_WRITER, g_type_add_interface_static (type, GST_TYPE_TAG_XMP_WRITER,
&tag_xmp_writer_info); &tag_xmp_writer_info);
if (!gst_element_register (plugin, prop->name, GST_RANK_PRIMARY, type)) if (!gst_element_register (plugin, prop->name, prop->rank, type))
return FALSE; return FALSE;
i++; i++;

21
gst/quicktime/gstqtmuxmap.c
View file

@ -147,6 +147,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
/* original QuickTime format; see Apple site (e.g. qtff.pdf) */ /* original QuickTime format; see Apple site (e.g. qtff.pdf) */
{ {
GST_QT_MUX_FORMAT_QT, GST_QT_MUX_FORMAT_QT,
GST_RANK_PRIMARY,
"qtmux", "qtmux",
"QuickTime", "QuickTime",
"GstQTMux", "GstQTMux",
@ -180,6 +181,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
* (supersedes original ISO 144996-1 mp41) */ * (supersedes original ISO 144996-1 mp41) */
{ {
GST_QT_MUX_FORMAT_MP4, GST_QT_MUX_FORMAT_MP4,
GST_RANK_PRIMARY,
"mp4mux", "mp4mux",
"MP4", "MP4",
"GstMP4Mux", "GstMP4Mux",
@ -193,6 +195,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
/* TODO add WMV/WMA support */ /* TODO add WMV/WMA support */
{ {
GST_QT_MUX_FORMAT_ISML, GST_QT_MUX_FORMAT_ISML,
GST_RANK_PRIMARY,
"ismlmux", "ismlmux",
"ISML", "ISML",
"GstISMLMux", "GstISMLMux",
@ -205,6 +208,21 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
* (extended in 3GPP2 File Formats for Multimedia Services) */ * (extended in 3GPP2 File Formats for Multimedia Services) */
{ {
GST_QT_MUX_FORMAT_3GP, GST_QT_MUX_FORMAT_3GP,
GST_RANK_PRIMARY,
"3gppmux",
"3GPP",
"Gst3GPPMux",
GST_STATIC_CAPS ("video/quicktime, variant = (string) 3gpp"),
GST_STATIC_CAPS (H263_CAPS "; " MPEG4V_CAPS "; " H264_CAPS),
GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
}
,
#ifndef GST_REMOVE_DEPRECATED
/* 3GPP Technical Specification 26.244 V7.3.0
* (extended in 3GPP2 File Formats for Multimedia Services) */
{
GST_QT_MUX_FORMAT_3GP,
GST_RANK_NONE,
"gppmux", "gppmux",
"3GPP", "3GPP",
"GstGPPMux", "GstGPPMux",
@ -213,9 +231,11 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS) GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
} }
, ,
#endif
/* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */ /* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */
{ {
GST_QT_MUX_FORMAT_MJ2, GST_QT_MUX_FORMAT_MJ2,
GST_RANK_PRIMARY,
"mj2mux", "mj2mux",
"MJ2", "MJ2",
"GstMJ2Mux", "GstMJ2Mux",
@ -228,7 +248,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
{ {
GST_QT_MUX_FORMAT_NONE, GST_QT_MUX_FORMAT_NONE,
} }
,
}; };
/* pretty static, but may turn out needed a few times */ /* pretty static, but may turn out needed a few times */

1
gst/quicktime/gstqtmuxmap.h
View file

@ -62,6 +62,7 @@ typedef enum _GstQTMuxFormat
typedef struct _GstQTMuxFormatProp typedef struct _GstQTMuxFormatProp
{ {
GstQTMuxFormat format; GstQTMuxFormat format;
GstRank rank;
const gchar *name; const gchar *name;
const gchar *long_name; const gchar *long_name;
const gchar *type_name; const gchar *type_name;