mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

format: map all mjpeg formats to video/mjpeg

Browse source 
Fixes #139
This commit is contained in:
Wim Taymans 2019-04-10 17:03:14 +02:00
parent 9f2cfe1cd6
commit 9f7c9022cf
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/v4l2/v4l2-utils.c
View file

@ -330,8 +330,8 @@ static const struct format_info format_info[] = {
/* compressed formats */ /* compressed formats */
{V4L2_PIX_FMT_MJPEG, FORMAT_ENCODED, VIDEO, MJPG}, {V4L2_PIX_FMT_MJPEG, FORMAT_ENCODED, VIDEO, MJPG},
{V4L2_PIX_FMT_JPEG, FORMAT_ENCODED, IMAGE, JPEG}, {V4L2_PIX_FMT_JPEG, FORMAT_ENCODED, VIDEO, MJPG},
{V4L2_PIX_FMT_PJPG, FORMAT_UNKNOWN, VIDEO, RAW}, {V4L2_PIX_FMT_PJPG, FORMAT_ENCODED, VIDEO, MJPG},
{V4L2_PIX_FMT_DV, FORMAT_ENCODED, VIDEO, DV}, {V4L2_PIX_FMT_DV, FORMAT_ENCODED, VIDEO, DV},
{V4L2_PIX_FMT_MPEG, FORMAT_ENCODED, VIDEO, MPEGTS}, {V4L2_PIX_FMT_MPEG, FORMAT_ENCODED, VIDEO, MPEGTS},
{V4L2_PIX_FMT_H264, FORMAT_ENCODED, VIDEO, H264}, {V4L2_PIX_FMT_H264, FORMAT_ENCODED, VIDEO, H264},

1
src/gst/gstpipewireformat.c
View file

@ -69,6 +69,7 @@ static const struct media_type media_type_map[] = {
{ "video/x-raw", &type.media_type.video, &type.media_subtype.raw }, { "video/x-raw", &type.media_type.video, &type.media_subtype.raw },
{ "audio/x-raw", &type.media_type.audio, &type.media_subtype.raw }, { "audio/x-raw", &type.media_type.audio, &type.media_subtype.raw },
{ "image/jpeg", &type.media_type.video, &type.media_subtype_video.mjpg }, { "image/jpeg", &type.media_type.video, &type.media_subtype_video.mjpg },
{ "video/x-jpeg", &type.media_type.video, &type.media_subtype_video.mjpg },
{ "video/x-h264", &type.media_type.video, &type.media_subtype_video.h264 }, { "video/x-h264", &type.media_type.video, &type.media_subtype_video.h264 },
{ NULL, } { NULL, }
}; };