mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-28 03:00:35 +00:00
qtmux: Allow MPEG layer 1/2, AC3 and Opus in qtmux
qtmux is supposed to be the muxer that allows all formats, with others (mp4mux and friends) being profile-restricted.
This commit is contained in:
parent
6f9cb1716a
commit
d191584531
2 changed files with 7 additions and 4 deletions
|
@ -4774,10 +4774,12 @@ gst_qt_mux_audio_sink_set_caps (GstQTPad * qtpad, GstCaps * caps)
|
|||
qtpad->max_bitrate);
|
||||
}
|
||||
if (layer == 1) {
|
||||
g_warn_if_fail (format == GST_QT_MUX_FORMAT_MP4);
|
||||
g_warn_if_fail (format == GST_QT_MUX_FORMAT_MP4
|
||||
|| format == GST_QT_MUX_FORMAT_QT);
|
||||
entry.samples_per_packet = 384;
|
||||
} else if (layer == 2) {
|
||||
g_warn_if_fail (format == GST_QT_MUX_FORMAT_MP4);
|
||||
g_warn_if_fail (format == GST_QT_MUX_FORMAT_MP4
|
||||
|| format == GST_QT_MUX_FORMAT_QT);
|
||||
entry.samples_per_packet = 1152;
|
||||
} else {
|
||||
g_warn_if_fail (layer == 3);
|
||||
|
|
|
@ -200,12 +200,13 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
|
|||
COMMON_VIDEO_CAPS "; " "video/x-qt-part, " COMMON_VIDEO_CAPS),
|
||||
GST_STATIC_CAPS (PCM_CAPS_FULL "; "
|
||||
PCM_CAPS_UNPOSITIONED " ; "
|
||||
MP3_CAPS " ; "
|
||||
MP123_CAPS " ; "
|
||||
AAC_CAPS " ; "
|
||||
AC3_CAPS " ; "
|
||||
ADPCM_CAPS " ; "
|
||||
"audio/x-alaw, " COMMON_AUDIO_CAPS (2, MAX) "; "
|
||||
"audio/x-mulaw, " COMMON_AUDIO_CAPS (2, MAX) "; "
|
||||
AMR_CAPS " ; " ALAC_CAPS),
|
||||
AMR_CAPS " ; " ALAC_CAPS " ; " OPUS_CAPS),
|
||||
GST_STATIC_CAPS (TEXT_UTF8)}
|
||||
,
|
||||
/* ISO 14496-14: mp42 as ISO base media extension
|
||||
|
|
Loading…
Reference in a new issue