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

qtmux: restrict h264 some more to only accept AU-aligned AVC

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=606662
This commit is contained in:
Thiago Santos 2011-04-13 16:37:07 +01:00 committed by Tim-Philipp Müller
parent 4250ff5994
commit c385a46438
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/quicktime/gstqtmux.c
View file

@ -2973,6 +2973,28 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
"output might not play in Apple QuickTime (try global-headers?)"); "output might not play in Apple QuickTime (try global-headers?)");
} }
} else if (strcmp (mimetype, "video/x-h264") == 0) { } else if (strcmp (mimetype, "video/x-h264") == 0) {
/* check if we accept these caps */
if (gst_structure_has_field (structure, "stream-format")) {
const gchar *format;
const gchar *alignment;
format = gst_structure_get_string (structure, "stream-format");
alignment = gst_structure_get_string (structure, "alignment");
if (strcmp (format, "avc") != 0 || alignment == NULL ||
strcmp (alignment, "au") != 0) {
GST_WARNING_OBJECT (qtmux, "Rejecting h264 caps, qtmux only accepts "
"avc format with AU aligned samples");
goto refuse_caps;
}
} else {
GST_WARNING_OBJECT (qtmux, "no stream-format field in h264 caps");
}
if (!codec_data) {
GST_WARNING_OBJECT (qtmux, "no codec_data in h264 caps");
}
entry.fourcc = FOURCC_avc1; entry.fourcc = FOURCC_avc1;
if (qtpad->avg_bitrate == 0) { if (qtpad->avg_bitrate == 0) {
gint avg_bitrate = 0; gint avg_bitrate = 0;
@ -2982,8 +3004,6 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
ext_atom = build_btrt_extension (0, qtpad->avg_bitrate, qtpad->max_bitrate); ext_atom = build_btrt_extension (0, qtpad->avg_bitrate, qtpad->max_bitrate);
if (ext_atom != NULL) if (ext_atom != NULL)
ext_atom_list = g_list_prepend (ext_atom_list, ext_atom); ext_atom_list = g_list_prepend (ext_atom_list, ext_atom);
if (!codec_data)
GST_WARNING_OBJECT (qtmux, "no codec_data in h264 caps");
ext_atom = build_codec_data_extension (FOURCC_avcC, codec_data); ext_atom = build_codec_data_extension (FOURCC_avcC, codec_data);
if (ext_atom != NULL) if (ext_atom != NULL)
ext_atom_list = g_list_prepend (ext_atom_list, ext_atom); ext_atom_list = g_list_prepend (ext_atom_list, ext_atom);

1
gst/quicktime/gstqtmuxmap.c
View file

@ -63,6 +63,7 @@
#define H264_CAPS \ #define H264_CAPS \
"video/x-h264, " \ "video/x-h264, " \
"stream-format = (string) avc, " \ "stream-format = (string) avc, " \
"alignment = (string) au, " \
COMMON_VIDEO_CAPS COMMON_VIDEO_CAPS
#define MPEG4V_CAPS \ #define MPEG4V_CAPS \