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

v4l2: map all jpeg formats to video/mjpeg

Browse source
This commit is contained in:
Wim Taymans 2019-04-10 17:10:34 +02:00
parent 0db5817ed7
commit 787900e8bf
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/param/format.h
View file

@ -73,10 +73,10 @@ enum spa_media_subtype {
SPA_MEDIA_SUBTYPE_vc1, SPA_MEDIA_SUBTYPE_vc1,
SPA_MEDIA_SUBTYPE_vp8, SPA_MEDIA_SUBTYPE_vp8,
SPA_MEDIA_SUBTYPE_vp9, SPA_MEDIA_SUBTYPE_vp9,
SPA_MEDIA_SUBTYPE_jpeg,
SPA_MEDIA_SUBTYPE_bayer, SPA_MEDIA_SUBTYPE_bayer,
SPA_MEDIA_SUBTYPE_START_Image = 0x30000, SPA_MEDIA_SUBTYPE_START_Image = 0x30000,
SPA_MEDIA_SUBTYPE_jpeg,
SPA_MEDIA_SUBTYPE_START_Binary = 0x40000, SPA_MEDIA_SUBTYPE_START_Binary = 0x40000,

5
spa/include/spa/param/type-info.h
View file

@ -183,9 +183,10 @@ static const struct spa_type_info spa_type_media_subtype[] = {
{ SPA_MEDIA_SUBTYPE_vc1, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vc1", NULL }, { SPA_MEDIA_SUBTYPE_vc1, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vc1", NULL },
{ SPA_MEDIA_SUBTYPE_vp8, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp8", NULL }, { SPA_MEDIA_SUBTYPE_vp8, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp8", NULL },
{ SPA_MEDIA_SUBTYPE_vp9, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp9", NULL }, { SPA_MEDIA_SUBTYPE_vp9, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp9", NULL },
{ SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", NULL },
{ SPA_MEDIA_SUBTYPE_bayer, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "bayer", NULL }, { SPA_MEDIA_SUBTYPE_bayer, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "bayer", NULL },
/* image subtypes */
{ SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", NULL },
/* stream subtypes */
{ SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "midi", NULL }, { SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "midi", NULL },
{ 0, 0, NULL, NULL }, { 0, 0, NULL, NULL },
}; };

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

@ -329,8 +329,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

@ -45,6 +45,7 @@ static const struct media_type media_type_map[] = {
{ "video/x-raw", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_raw }, { "video/x-raw", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_raw },
{ "audio/x-raw", SPA_MEDIA_TYPE_audio, SPA_MEDIA_SUBTYPE_raw }, { "audio/x-raw", SPA_MEDIA_TYPE_audio, SPA_MEDIA_SUBTYPE_raw },
{ "image/jpeg", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_mjpg }, { "image/jpeg", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_mjpg },
{ "video/x-jpeg", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_mjpg },
{ "video/x-h264", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_h264 }, { "video/x-h264", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_h264 },
{ NULL, } { NULL, }
}; };