Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marc-André Lureau
gst-plugins-good
Commits
0671b232
Commit
0671b232
authored
Apr 21, 2011
by
Tim-Philipp Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quicktime: register 3gppmux element in addition to the misnamed gppmux
parent
42531337
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
gst/quicktime/gstqtmux.c
gst/quicktime/gstqtmux.c
+4
-3
gst/quicktime/gstqtmuxmap.c
gst/quicktime/gstqtmuxmap.c
+20
-1
gst/quicktime/gstqtmuxmap.h
gst/quicktime/gstqtmuxmap.h
+1
-0
No files found.
gst/quicktime/gstqtmux.c
View file @
0671b232
...
...
@@ -249,8 +249,9 @@ gst_qt_mux_base_init (gpointer g_class)
/* construct the element details struct */
longname
=
g_strdup_printf
(
"%s Muxer"
,
params
->
prop
->
long_name
);
description
=
g_strdup_printf
(
"Multiplex audio and video into a %s file"
,
params
->
prop
->
long_name
);
description
=
g_strdup_printf
(
"Multiplex audio and video into a %s file%s"
,
params
->
prop
->
long_name
,
(
params
->
prop
->
rank
==
GST_RANK_NONE
)
?
" (deprecated)"
:
""
);
gst_element_class_set_details_simple
(
element_class
,
longname
,
"Codec/Muxer"
,
description
,
"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
,
&
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
;
i
++
;
...
...
gst/quicktime/gstqtmuxmap.c
View file @
0671b232
...
...
@@ -147,6 +147,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
/* original QuickTime format; see Apple site (e.g. qtff.pdf) */
{
GST_QT_MUX_FORMAT_QT
,
GST_RANK_PRIMARY
,
"qtmux"
,
"QuickTime"
,
"GstQTMux"
,
...
...
@@ -180,6 +181,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
* (supersedes original ISO 144996-1 mp41) */
{
GST_QT_MUX_FORMAT_MP4
,
GST_RANK_PRIMARY
,
"mp4mux"
,
"MP4"
,
"GstMP4Mux"
,
...
...
@@ -193,6 +195,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
/* TODO add WMV/WMA support */
{
GST_QT_MUX_FORMAT_ISML
,
GST_RANK_PRIMARY
,
"ismlmux"
,
"ISML"
,
"GstISMLMux"
,
...
...
@@ -205,6 +208,21 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
* (extended in 3GPP2 File Formats for Multimedia Services) */
{
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"
,
"3GPP"
,
"GstGPPMux"
,
...
...
@@ -213,9 +231,11 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
GST_STATIC_CAPS
(
AMR_CAPS
"; "
MP3_CAPS
"; "
AAC_CAPS
)
}
,
#endif
/* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */
{
GST_QT_MUX_FORMAT_MJ2
,
GST_RANK_PRIMARY
,
"mj2mux"
,
"MJ2"
,
"GstMJ2Mux"
,
...
...
@@ -228,7 +248,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
{
GST_QT_MUX_FORMAT_NONE
,
}
,
};
/* pretty static, but may turn out needed a few times */
...
...
gst/quicktime/gstqtmuxmap.h
View file @
0671b232
...
...
@@ -62,6 +62,7 @@ typedef enum _GstQTMuxFormat
typedef
struct
_GstQTMuxFormatProp
{
GstQTMuxFormat
format
;
GstRank
rank
;
const
gchar
*
name
;
const
gchar
*
long_name
;
const
gchar
*
type_name
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment