Move buffer information from pwr_on_event to pwr_handle_stream_add_bu…

…ffer
emersion · Nov 6, 2020 · 03bc8d6 · 03bc8d6
1 parent 4c51e3c
commit 03bc8d6
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c
@@ -43,25 +43,17 @@ static void pwr_on_event(void *data, uint64_t expirations) {
 
 	spa_buf = pw_buf->buffer;
 	d = spa_buf->datas;
-	if ((d[0].data) == NULL) {
-		logprint(TRACE, "pipewire: data pointer undefined");
-		return;
-	}
 	if ((h = spa_buffer_find_meta_data(spa_buf, SPA_META_Header, sizeof(*h)))) {
 		h->pts = -1;
 		h->flags = 0;
 		h->seq = cast->seq++;
 		h->dts_offset = 0;
 	}
 
-	d[0].type = SPA_DATA_MemPtr;
-	d[0].maxsize = cast->simple_frame.size;
-	d[0].mapoffset = 0;
-	d[0].chunk->size = cast->simple_frame.size;
-	d[0].chunk->stride = cast->simple_frame.stride;
-	d[0].chunk->offset = 0;
-	d[0].flags = 0;
-	d[0].fd = -1;
+	if ((d[0].data) == NULL) {
+		logprint(TRACE, "pipewire: data pointer undefined");
+		return;
+	}
 
 	writeFrameData(d[0].data, cast->simple_frame.data, cast->simple_frame.height,
 		cast->simple_frame.stride, cast->simple_frame.y_invert);
@@ -151,6 +143,18 @@ static void pwr_handle_stream_add_buffer(void *data, struct pw_buffer *buffer) {
 	} else {
 		logprint(ERROR, "pipewire: unsupported buffer type");
 		cast->err = 1;
+		return;
+	}
+
+	// Prepare buffer for choosen type
+	if (d[0].type == SPA_DATA_MemPtr) {
+		d[0].maxsize = cast->simple_frame.size;
+		d[0].mapoffset = 0;
+		d[0].chunk->size = cast->simple_frame.size;
+		d[0].chunk->stride = cast->simple_frame.stride;
+		d[0].chunk->offset = 0;
+		d[0].flags = 0;
+		d[0].fd = -1;
 	}
 }