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

raop: Merge TCP and UDP code paths + refactoring

Browse source 
TCP and UDP implementation are following two diffrent code path while code
logic is quite the same. This patch merges both code path into a unique one
and, thus, leads to a big refactoring. Major changes include:
  - moving sink implementation to a separate file (raop-sink.c)
  - move raop-sink.c protocol specific code to raop-client.c
  - modernise RTSP session handling in TCP mode
  - reduce code duplications between TCP and UDP modes
  - introduce authentication support
  - TCP mode does not constantly send silent audio anymore

About authentication: OPTIONS is now issued when the sink is preliminary
loaded. Client authentication appends at that time and credential is kept
for the whole sink lifetime. Later RTSP connection will thus look like this:
ANNOUNCE > 200 OK > SETUP > 200 OK > RECORD > 200 OK (no more OPTIONS). This
behaviour is similar to iTunes one.

Also this patch includes file name changes to match Pulseaudio naming
rules, as most of pulseaudio source code files seem to be using '-'
instead of '_' as a word separator.
This commit is contained in:
Martin Blanchard 2016-11-06 12:54:07 -06:00 • committed by Tanu Kaskinen
parent 5ff21c3bdd
commit 8022e56581
16 changed files with 2557 additions and 2783 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/rtp/rtsp_client.c
View file

@ -58,8 +58,8 @@ struct pa_rtsp_client {
void *userdata;
const char *useragent;
pa_rtsp_state state;
pa_rtsp_status status;
pa_rtsp_state_t state;
pa_rtsp_status_t status;
uint8_t waiting;
pa_headerlist* headers;

10
src/modules/rtp/rtsp_client.h
View file

@ -32,7 +32,7 @@
typedef struct pa_rtsp_client pa_rtsp_client;
typedef enum {
typedef enum pa_rtsp_state {
STATE_CONNECT,
STATE_OPTIONS,
STATE_ANNOUNCE,
@ -42,17 +42,17 @@ typedef enum {
STATE_FLUSH,
STATE_TEARDOWN,
STATE_DISCONNECTED
} pa_rtsp_state;
} pa_rtsp_state_t;
typedef enum {
typedef enum pa_rtsp_status {
STATUS_OK = 200,
STATUS_BAD_REQUEST = 400,
STATUS_UNAUTHORIZED = 401,
STATUS_NO_RESPONSE = 444,
STATUS_INTERNAL_ERROR = 500
} pa_rtsp_status;
} pa_rtsp_status_t;
typedef void (*pa_rtsp_cb_t)(pa_rtsp_client *c, pa_rtsp_state state, pa_rtsp_status code, pa_headerlist *headers, void *userdata);
typedef void (*pa_rtsp_cb_t)(pa_rtsp_client *c, pa_rtsp_state_t state, pa_rtsp_status_t code, pa_headerlist *headers, void *userdata);
pa_rtsp_client* pa_rtsp_client_new(pa_mainloop_api *mainloop, const char *hostname, uint16_t port, const char *useragent);
void pa_rtsp_client_free(pa_rtsp_client *c);