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

module-raop/rtsp-client: Pass content to reply function

Browse source
This commit is contained in:
Christian Glombek 2023-07-12 22:28:58 +02:00 • committed by Wim Taymans
parent 6368b8cb87
commit d8dc89ad1a
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-raop-sink.c
View file

@ -827,7 +827,7 @@ error:
static int rtsp_send(struct impl *impl, const char *method, static int rtsp_send(struct impl *impl, const char *method,
const char *content_type, const char *content, const char *content_type, const char *content,
int (*reply) (void *data, int status, const struct spa_dict *headers)) int (*reply) (void *data, int status, const struct spa_dict *headers, const struct pw_array *content))
{ {
int res; int res;
@ -838,7 +838,7 @@ static int rtsp_send(struct impl *impl, const char *method,
return res; return res;
} }
static int rtsp_log_reply_status(void *data, int status, const struct spa_dict *headers) static int rtsp_log_reply_status(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
pw_log_info("reply status: %d", status); pw_log_info("reply status: %d", status);
return 0; return 0;
@ -876,7 +876,7 @@ static int rtsp_send_volume(struct impl *impl)
return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, rtsp_log_reply_status); return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, rtsp_log_reply_status);
} }
static int rtsp_record_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_record_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
const char *str; const char *str;
@ -966,7 +966,7 @@ error:
pw_loop_update_io(impl->loop, impl->server_source, 0); pw_loop_update_io(impl->loop, impl->server_source, 0);
} }
static int rtsp_setup_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_setup_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
const char *str, *state = NULL, *s; const char *str, *state = NULL, *s;
@ -1105,7 +1105,7 @@ error:
return -EIO; return -EIO;
} }
static int rtsp_announce_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_announce_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -1294,7 +1294,7 @@ static int rtsp_do_announce(struct impl *impl)
return rtsp_send(impl, "ANNOUNCE", "application/sdp", sdp, rtsp_announce_reply); return rtsp_send(impl, "ANNOUNCE", "application/sdp", sdp, rtsp_announce_reply);
} }
static int rtsp_auth_setup_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_auth_setup_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -1315,7 +1315,7 @@ static int rtsp_do_auth_setup(struct impl *impl)
rtsp_auth_setup_reply, impl); rtsp_auth_setup_reply, impl);
} }
static int rtsp_auth_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_auth_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
int res = 0; int res = 0;
@ -1385,7 +1385,7 @@ static int rtsp_do_auth(struct impl *impl, const struct spa_dict *headers)
return rtsp_send(impl, "OPTIONS", NULL, NULL, rtsp_auth_reply); return rtsp_send(impl, "OPTIONS", NULL, NULL, rtsp_auth_reply);
} }
static int rtsp_options_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_options_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
int res = 0; int res = 0;
@ -1547,7 +1547,7 @@ static int rtsp_do_connect(struct impl *impl)
return pw_rtsp_client_connect(impl->rtsp, hostname, atoi(port), impl->session_id); return pw_rtsp_client_connect(impl->rtsp, hostname, atoi(port), impl->session_id);
} }
static int rtsp_teardown_reply(void *data, int status, const struct spa_dict *headers) static int rtsp_teardown_reply(void *data, int status, const struct spa_dict *headers, const struct pw_array *content)
{ {
struct impl *impl = data; struct impl *impl = data;
const char *str; const char *str;

18
src/modules/module-raop/rtsp-client.c
View file

@ -25,7 +25,7 @@ struct message {
size_t len; size_t len;
size_t offset; size_t offset;
uint32_t cseq; uint32_t cseq;
int (*reply) (void *user_data, int status, const struct spa_dict *headers); int (*reply) (void *user_data, int status, const struct spa_dict *headers, const struct pw_array *content);
void *user_data; void *user_data;
}; };
@ -60,6 +60,7 @@ struct pw_rtsp_client {
char line_buf[1024]; char line_buf[1024];
size_t line_pos; size_t line_pos;
struct pw_properties *headers; struct pw_properties *headers;
struct pw_array content;
size_t content_length; size_t content_length;
uint32_t cseq; uint32_t cseq;
@ -89,6 +90,7 @@ struct pw_rtsp_client *pw_rtsp_client_new(struct pw_loop *main_loop,
spa_list_init(&client->pending); spa_list_init(&client->pending);
spa_hook_list_init(&client->listener_list); spa_hook_list_init(&client->listener_list);
client->headers = pw_properties_new(NULL, NULL); client->headers = pw_properties_new(NULL, NULL);
pw_array_init(&client->content, 4096);
client->recv_state = CLIENT_RECV_NONE; client->recv_state = CLIENT_RECV_NONE;
pw_log_info("new client %p", client); pw_log_info("new client %p", client);
@ -105,6 +107,7 @@ void pw_rtsp_client_destroy(struct pw_rtsp_client *client)
pw_properties_free(client->headers); pw_properties_free(client->headers);
pw_properties_free(client->props); pw_properties_free(client->props);
spa_hook_list_clean(&client->listener_list); spa_hook_list_clean(&client->listener_list);
pw_array_clear(&client->content);
free(client); free(client);
} }
@ -277,7 +280,7 @@ static void dispatch_handler(struct pw_rtsp_client *client)
msg = find_pending(client, cseq); msg = find_pending(client, cseq);
if (msg) { if (msg) {
res = msg->reply(msg->user_data, client->status, &client->headers->dict); res = msg->reply(msg->user_data, client->status, &client->headers->dict, &client->content);
spa_list_remove(&msg->link); spa_list_remove(&msg->link);
free(msg); free(msg);
@ -288,6 +291,8 @@ static void dispatch_handler(struct pw_rtsp_client *client)
else { else {
pw_rtsp_client_emit_message(client, client->status, &client->headers->dict); pw_rtsp_client_emit_message(client, client->status, &client->headers->dict);
} }
pw_array_reset(&client->content);
} }
static void process_received_message(struct pw_rtsp_client *client) static void process_received_message(struct pw_rtsp_client *client)
@ -328,7 +333,7 @@ static int process_header(struct pw_rtsp_client *client, char *buf)
static int process_content(struct pw_rtsp_client *client) static int process_content(struct pw_rtsp_client *client)
{ {
char buf[1024]; uint8_t buf[4096];
while (client->content_length > 0) { while (client->content_length > 0) {
const size_t max_recv = SPA_MIN(sizeof(buf), client->content_length); const size_t max_recv = SPA_MIN(sizeof(buf), client->content_length);
@ -345,6 +350,9 @@ static int process_content(struct pw_rtsp_client *client)
return res; return res;
} }
void *p = pw_array_add(&client->content, res);
memcpy(p, buf, res);
spa_assert((size_t) res <= client->content_length); spa_assert((size_t) res <= client->content_length);
client->content_length -= res; client->content_length -= res;
} }
@ -556,7 +564,7 @@ int pw_rtsp_client_disconnect(struct pw_rtsp_client *client)
int pw_rtsp_client_url_send(struct pw_rtsp_client *client, const char *url, int pw_rtsp_client_url_send(struct pw_rtsp_client *client, const char *url,
const char *cmd, const struct spa_dict *headers, const char *cmd, const struct spa_dict *headers,
const char *content_type, const void *content, size_t content_length, const char *content_type, const void *content, size_t content_length,
int (*reply) (void *user_data, int status, const struct spa_dict *headers), int (*reply) (void *user_data, int status, const struct spa_dict *headers, const struct pw_array *content),
void *user_data) void *user_data)
{ {
FILE *f; FILE *f;
@ -610,7 +618,7 @@ int pw_rtsp_client_url_send(struct pw_rtsp_client *client, const char *url,
int pw_rtsp_client_send(struct pw_rtsp_client *client, int pw_rtsp_client_send(struct pw_rtsp_client *client,
const char *cmd, const struct spa_dict *headers, const char *cmd, const struct spa_dict *headers,
const char *content_type, const char *content, const char *content_type, const char *content,
int (*reply) (void *user_data, int status, const struct spa_dict *headers), int (*reply) (void *user_data, int status, const struct spa_dict *headers, const struct pw_array *content),
void *user_data) void *user_data)
{ {
const size_t content_length = content ? strlen(content) : 0; const size_t content_length = content ? strlen(content) : 0;

4
src/modules/module-raop/rtsp-client.h
View file

@ -55,13 +55,13 @@ int pw_rtsp_client_get_local_ip(struct pw_rtsp_client *client,
int pw_rtsp_client_url_send(struct pw_rtsp_client *client, const char *url, int pw_rtsp_client_url_send(struct pw_rtsp_client *client, const char *url,
const char *cmd, const struct spa_dict *headers, const char *cmd, const struct spa_dict *headers,
const char *content_type, const void *content, size_t content_length, const char *content_type, const void *content, size_t content_length,
int (*reply) (void *user_data, int status, const struct spa_dict *headers), int (*reply) (void *user_data, int status, const struct spa_dict *headers, const struct pw_array *content),
void *user_data); void *user_data);
int pw_rtsp_client_send(struct pw_rtsp_client *client, int pw_rtsp_client_send(struct pw_rtsp_client *client,
const char *cmd, const struct spa_dict *headers, const char *cmd, const struct spa_dict *headers,
const char *content_type, const char *content, const char *content_type, const char *content,
int (*reply) (void *user_data, int status, const struct spa_dict *headers), int (*reply) (void *user_data, int status, const struct spa_dict *headers, const struct pw_array *content),
void *user_data); void *user_data);