pbutils: Add mjpg to MIME codecs

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1270>
This commit is contained in:
Ludvig Rappe 2021-09-02 11:55:09 +02:00 committed by GStreamer Marge Bot
parent f5cdb2d002
commit 92338e3d80
2 changed files with 11 additions and 0 deletions

View file

@ -2348,6 +2348,8 @@ done:
* Useful for providing the 'codecs' field inside the 'Content-Type' HTTP
* header for containerized formats, such as mp4 or matroska.
*
* Registered codecs can be found at http://mp4ra.org/#/codecs
*
* Returns: (transfer full): a RFC 6381 compatible codec string or %NULL
*
* Since: 1.20
@ -2410,6 +2412,8 @@ gst_codec_utils_caps_get_mime_codec (GstCaps * caps)
* available in the mime codec for vp9. This is documented in
* https://www.webmproject.org/vp9/mp4/ */
mime_codec = g_strdup ("vp09");
} else if (g_strcmp0 (media_type, "image/jpeg") == 0) {
mime_codec = g_strdup ("mjpg");
} else if (g_strcmp0 (media_type, "audio/mpeg") == 0) {
guint8 audio_object_type = 0;
if (aac_caps_structure_get_audio_object_type (caps_st, &audio_object_type)) {

View file

@ -1406,6 +1406,13 @@ GST_START_TEST (test_pb_utils_caps_get_mime_codec)
g_free (mime_codec);
gst_caps_unref (caps);
/* mjpeg */
caps = gst_caps_new_empty_simple ("image/jpeg");
mime_codec = gst_codec_utils_caps_get_mime_codec (caps);
fail_unless_equals_string (mime_codec, "mjpg");
g_free (mime_codec);
gst_caps_unref (caps);
/* aac without codec data */
caps = gst_caps_new_empty_simple ("audio/mpeg");
mime_codec = gst_codec_utils_caps_get_mime_codec (caps);