Skip to content
Snippets Groups Projects
Commit 91cd7eb6 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Rename functions in sdp.c for consistency's sake.

Originally committed as revision 15953 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 10ba7404
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ struct sdp_session_level { ...@@ -43,7 +43,7 @@ struct sdp_session_level {
const char *name; /**< session name (can be an empty string) */ const char *name; /**< session name (can be an empty string) */
}; };
static void dest_write(char *buff, int size, const char *dest_addr, int ttl) static void sdp_write_address(char *buff, int size, const char *dest_addr, int ttl)
{ {
if (dest_addr) { if (dest_addr) {
if (ttl > 0) { if (ttl > 0) {
...@@ -65,10 +65,10 @@ static void sdp_write_header(char *buff, int size, struct sdp_session_level *s) ...@@ -65,10 +65,10 @@ static void sdp_write_header(char *buff, int size, struct sdp_session_level *s)
s->id, s->version, s->src_addr, s->id, s->version, s->src_addr,
s->start_time, s->end_time, s->start_time, s->end_time,
s->name[0] ? s->name : "No Name"); s->name[0] ? s->name : "No Name");
dest_write(buff, size, s->dst_addr, s->ttl); sdp_write_address(buff, size, s->dst_addr, s->ttl);
} }
static int get_address(char *dest_addr, int size, int *ttl, const char *url) static int sdp_get_address(char *dest_addr, int size, int *ttl, const char *url)
{ {
int port; int port;
const char *p; const char *p;
...@@ -157,7 +157,7 @@ static char *extradata2config(AVCodecContext *c) ...@@ -157,7 +157,7 @@ static char *extradata2config(AVCodecContext *c)
return config; return config;
} }
static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int payload_type) static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, int payload_type)
{ {
char *config = NULL; char *config = NULL;
...@@ -246,12 +246,12 @@ static void sdp_write_media(char *buff, int size, AVCodecContext *c, const char ...@@ -246,12 +246,12 @@ static void sdp_write_media(char *buff, int size, AVCodecContext *c, const char
} }
av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type); av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type);
dest_write(buff, size, dest_addr, ttl); sdp_write_address(buff, size, dest_addr, ttl);
if (c->bit_rate) { if (c->bit_rate) {
av_strlcatf(buff, size, "b=AS:%d\r\n", c->bit_rate / 1000); av_strlcatf(buff, size, "b=AS:%d\r\n", c->bit_rate / 1000);
} }
sdp_media_attributes(buff, size, c, payload_type); sdp_write_media_attributes(buff, size, c, payload_type);
} }
int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
...@@ -269,7 +269,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) ...@@ -269,7 +269,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
port = 0; port = 0;
ttl = 0; ttl = 0;
if (n_files == 1) { if (n_files == 1) {
port = get_address(dst, sizeof(dst), &ttl, ac[0]->filename); port = sdp_get_address(dst, sizeof(dst), &ttl, ac[0]->filename);
if (port > 0) { if (port > 0) {
s.dst_addr = dst; s.dst_addr = dst;
s.ttl = ttl; s.ttl = ttl;
...@@ -280,7 +280,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) ...@@ -280,7 +280,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
dst[0] = 0; dst[0] = 0;
for (i = 0; i < n_files; i++) { for (i = 0; i < n_files; i++) {
if (n_files != 1) { if (n_files != 1) {
port = get_address(dst, sizeof(dst), &ttl, ac[i]->filename); port = sdp_get_address(dst, sizeof(dst), &ttl, ac[i]->filename);
} }
for (j = 0; j < ac[i]->nb_streams; j++) { for (j = 0; j < ac[i]->nb_streams; j++) {
sdp_write_media(buff, size, sdp_write_media(buff, size,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment