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

gst: handle interlace mode

Browse source 
If the peer announces an interlace mode then use it. Otherwise assume
that the video is not interlaced.

This also fixes a problem with caps negotiation:
If downstream reports caps with not fixated interlace mode, e.g.
"interlace-mode=(string){ progressive, interleaved, mixed }"
then without this, the caps handle_format_change() (in the pipewiresrc)
are not fixed and the source waits forever for the negotiation to
finish.
This commit is contained in:
Michael Olbrich 2024-11-14 15:25:06 +01:00
parent 6cf320e387
commit 687075f2bd
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/gst/gstpipewireformat.c
View file

@ -131,6 +131,13 @@ static const uint32_t video_format_map[] = {
SPA_VIDEO_FORMAT_Y444_12LE, SPA_VIDEO_FORMAT_Y444_12LE,
}; };
static const uint32_t interlace_mode_map[] = {
SPA_VIDEO_INTERLACE_MODE_PROGRESSIVE,
SPA_VIDEO_INTERLACE_MODE_INTERLEAVED,
SPA_VIDEO_INTERLACE_MODE_MIXED,
SPA_VIDEO_INTERLACE_MODE_FIELDS,
};
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
#define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE #define _FORMAT_LE(fmt) SPA_AUDIO_FORMAT_ ## fmt ## _OE
#define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt #define _FORMAT_BE(fmt) SPA_AUDIO_FORMAT_ ## fmt
@ -825,6 +832,14 @@ static char *video_id_to_dma_drm_fourcc(uint32_t id, uint64_t mod)
} }
#endif #endif
static const char *interlace_mode_id_to_string(uint32_t id)
{
int idx;
if ((idx = find_index(interlace_mode_map, SPA_N_ELEMENTS(interlace_mode_map), id)) == -1)
return NULL;
return gst_video_interlace_mode_to_string(idx);
}
static const char *audio_id_to_string(uint32_t id) static const char *audio_id_to_string(uint32_t id)
{ {
int idx; int idx;
@ -1149,6 +1164,11 @@ gst_caps_from_format (const struct spa_pod *format)
handle_id_prop (prop, "format", video_id_to_string, res); handle_id_prop (prop, "format", video_id_to_string, res);
} }
} }
if ((prop = spa_pod_object_find_prop (obj, prop, SPA_FORMAT_VIDEO_interlaceMode))) {
handle_id_prop (prop, "interlace-mode", interlace_mode_id_to_string, res);
} else {
gst_caps_set_simple(res, "interlace-mode", G_TYPE_STRING, "progressive", NULL);
}
} }
else if (media_subtype == SPA_MEDIA_SUBTYPE_mjpg) { else if (media_subtype == SPA_MEDIA_SUBTYPE_mjpg) {
res = gst_caps_new_empty_simple ("image/jpeg"); res = gst_caps_new_empty_simple ("image/jpeg");