generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAP muxer set session name from metadata

Browse Source 
Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP
muxer for correct
session name in SAP SDP announcements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Jernej Virag 2012-12-17 10:04:15 +01:00 committed by Michael Niedermayer
parent 8976ef7aec
commit 2f7465b5bf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/sapenc.c
View File

@ -25,6 +25,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/time.h" #include "libavutil/time.h"
#include "libavutil/dict.h"
#include "internal.h" #include "internal.h"
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
@ -76,6 +77,7 @@ static int sap_write_header(AVFormatContext *s)
struct sockaddr_storage localaddr; struct sockaddr_storage localaddr;
socklen_t addrlen = sizeof(localaddr); socklen_t addrlen = sizeof(localaddr);
int udp_fd; int udp_fd;
AVDictionaryEntry* title = av_dict_get(s->metadata, "title", NULL, 0);
if (!ff_network_init()) if (!ff_network_init())
return AVERROR(EIO); return AVERROR(EIO);
@ -158,6 +160,10 @@ static int sap_write_header(AVFormatContext *s)
av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename)); av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename));
} }
if (s->nb_streams > 0 && title) {
av_dict_set(&contexts[0]->metadata, "title", title->value, 0);
}
ff_url_join(url, sizeof(url), "udp", NULL, announce_addr, port, ff_url_join(url, sizeof(url), "udp", NULL, announce_addr, port,
"?ttl=%d&connect=1", ttl); "?ttl=%d&connect=1", ttl);
ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_WRITE, ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_WRITE,