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

Replace module-raop-sink.c

Browse source
This commit is contained in:
Tycho Haemers 2022-10-09 18:04:10 +00:00
parent aed56719f2
commit 2ef10cefa9
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,7 +157,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define DEFAULT_CHANNELS 2 #define DEFAULT_CHANNELS 2
#define DEFAULT_POSITION "[ FL FR ]" #define DEFAULT_POSITION "[ FL FR ]"
#define DEFAULT_LATENCY (DEFAULT_RATE*2) #define DEFAULT_LATENCY 22050
#define MODULE_USAGE "[ raop.hostname=<name of host> ] " \ #define MODULE_USAGE "[ raop.hostname=<name of host> ] " \
"[ raop.port=<remote port> ] " \ "[ raop.port=<remote port> ] " \
@ -429,7 +429,7 @@ static int flush_to_udp_packet(struct impl *impl)
memset(dst, 0, len); memset(dst, 0, len);
break; break;
} }
if (impl->encryption != CRYPTO_NONE) if (impl->encryption == CRYPTO_RSA)
aes_encrypt(impl, dst, len); aes_encrypt(impl, dst, len);
impl->rtptime += n_frames; impl->rtptime += n_frames;
@ -472,7 +472,7 @@ static int flush_to_tcp_packet(struct impl *impl)
memset(dst, 0, len); memset(dst, 0, len);
break; break;
} }
if (impl->encryption != CRYPTO_NONE) if (impl->encryption == CRYPTO_RSA)
aes_encrypt(impl, dst, len); aes_encrypt(impl, dst, len);
pkt[0] |= htonl((uint32_t) len + 12); pkt[0] |= htonl((uint32_t) len + 12);
@ -784,6 +784,12 @@ static void rtsp_record_reply(void *data, int status, const struct spa_dict *hea
impl->sync = 0; impl->sync = 0;
impl->sync_period = impl->info.rate / (impl->block_size / impl->frame_size); impl->sync_period = impl->info.rate / (impl->block_size / impl->frame_size);
impl->recording = true; impl->recording = true;
int res;
char *progress;
asprintf(&progress,"progress: %s/%s/%s\r\n", "0","0","0");
res = pw_rtsp_client_send(impl->rtsp, "SET_PARAMETER", NULL,
"text/parameters", progress, NULL, NULL);
} }
static int rtsp_do_record(struct impl *impl) static int rtsp_do_record(struct impl *impl)
@ -1087,6 +1093,20 @@ static int rtsp_do_announce(struct impl *impl)
impl->session_id, ip_version, local_ip, impl->session_id, ip_version, local_ip,
ip_version, host, frames); ip_version, host, frames);
break; break;
case CRYPTO_AUTH_SETUP:
int min_latency = DEFAULT_LATENCY;
asprintf(&sdp, "v=0\r\n"
"o=iTunes %s 0 IN IP%d %s\r\n"
"s=iTunes\r\n"
"c=IN IP%d %s\r\n"
"t=0 0\r\n"
"m=audio 0 RTP/AVP 96\r\n"
"a=rtpmap:96 AppleLossless\r\n"
"a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 44100\r\n"
"a=min-latency:%d",
impl->session_id, ip_version, local_ip,
ip_version, host, frames,min_latency);
break;
case CRYPTO_RSA: case CRYPTO_RSA:
pw_getrandom(impl->key, sizeof(impl->key), 0); pw_getrandom(impl->key, sizeof(impl->key), 0);
@ -1126,7 +1146,7 @@ static void rtsp_auth_setup_reply(void *data, int status, const struct spa_dict
pw_log_info("reply %d", status); pw_log_info("reply %d", status);
impl->encryption = CRYPTO_NONE;
rtsp_do_announce(impl); rtsp_do_announce(impl);
} }