Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #701 from slouken/master

Browse source 
Fixed NV12 format negotiation
This commit is contained in:
Sam Lantinga 2022-12-06 15:38:29 -08:00 committed by GitHub
commit d5ea069dc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/pipewire.cpp
View file

@ -326,11 +326,6 @@ static void stream_handle_param_changed(void *data, uint32_t id, const struct sp
struct spa_rectangle requested_size = { 0, 0 }; struct spa_rectangle requested_size = { 0, 0 };
int bpp = 4;
if (state->video_info.format == SPA_VIDEO_FORMAT_NV12) {
bpp = 1;
}
int ret = spa_format_video_raw_parse_with_requested_size(param, &state->video_info, &requested_size); int ret = spa_format_video_raw_parse_with_requested_size(param, &state->video_info, &requested_size);
if (ret < 0) { if (ret < 0) {
pwr_log.errorf("spa_format_video_raw_parse failed"); pwr_log.errorf("spa_format_video_raw_parse failed");
@ -340,13 +335,16 @@ static void stream_handle_param_changed(void *data, uint32_t id, const struct sp
s_nRequestedHeight = requested_size.height; s_nRequestedHeight = requested_size.height;
calculate_capture_size(); calculate_capture_size();
int bpp = 4;
if (state->video_info.format == SPA_VIDEO_FORMAT_NV12) {
bpp = 1;
}
state->shm_stride = SPA_ROUND_UP_N(state->video_info.size.width * bpp, 4); state->shm_stride = SPA_ROUND_UP_N(state->video_info.size.width * bpp, 4);
const struct spa_pod_prop *modifier_prop = spa_pod_find_prop(param, nullptr, SPA_FORMAT_VIDEO_modifier); const struct spa_pod_prop *modifier_prop = spa_pod_find_prop(param, nullptr, SPA_FORMAT_VIDEO_modifier);
state->dmabuf = modifier_prop != nullptr; state->dmabuf = modifier_prop != nullptr;
pwr_log.debugf("format changed (size: %dx%d, dmabuf: %d)", state->video_info.size.width, state->video_info.size.height, state->dmabuf);
uint8_t buf[1024]; uint8_t buf[1024];
struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(buf, sizeof(buf)); struct spa_pod_builder builder = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
@ -381,6 +379,11 @@ static void stream_handle_param_changed(void *data, uint32_t id, const struct sp
if (ret != 0) { if (ret != 0) {
pwr_log.errorf("pw_stream_update_params failed"); pwr_log.errorf("pw_stream_update_params failed");
} }
pwr_log.debugf("format changed (size: %dx%d, requested %dx%d, format %d, stride %d, size: %d, dmabuf: %d)",
state->video_info.size.width, state->video_info.size.height,
s_nRequestedWidth, s_nRequestedHeight,
state->video_info.format, state->shm_stride, shm_size, state->dmabuf);
} }
static void randname(char *buf) static void randname(char *buf)
@ -581,7 +584,6 @@ static void run_pipewire(struct pipewire_state *state)
}, },
}; };
state->running = true;
while (state->running) { while (state->running) {
int ret = poll(pollfds, EVENT_COUNT, -1); int ret = poll(pollfds, EVENT_COUNT, -1);
if (ret < 0) { if (ret < 0) {
@ -674,6 +676,7 @@ bool init_pipewire(void)
return false; return false;
} }
state->running = true;
while (state->stream_node_id == SPA_ID_INVALID) { while (state->stream_node_id == SPA_ID_INVALID) {
int ret = pw_loop_iterate(state->loop, -1); int ret = pw_loop_iterate(state->loop, -1);
if (ret < 0) { if (ret < 0) {