#include "libavutil/parseutils.h"
#include "libavutil/random_seed.h"
#include "libavutil/avstring.h"
+#include "libavutil/dict.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/time.h"
#include "internal.h"
#include "network.h"
#include "os_support.h"
struct sockaddr_storage localaddr;
socklen_t addrlen = sizeof(localaddr);
int udp_fd;
+ AVDictionaryEntry* title = av_dict_get(s->metadata, "title", NULL, 0);
if (!ff_network_init())
return AVERROR(EIO);
}
if (!announce_addr[0]) {
- struct addrinfo hints, *ai = NULL;
- memset(&hints, 0, sizeof(hints));
+ struct addrinfo hints = { 0 }, *ai = NULL;
hints.ai_family = AF_UNSPEC;
if (getaddrinfo(host, NULL, &hints, &ai)) {
av_log(s, AV_LOG_ERROR, "Unable to resolve %s\n", host);
"?ttl=%d", ttl);
if (!same_port)
base_port += 2;
- ret = ffurl_open(&fd, url, AVIO_FLAG_WRITE);
+ ret = ffurl_open(&fd, url, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL);
if (ret) {
ret = AVERROR(EIO);
goto fail;
}
- s->streams[i]->priv_data = contexts[i] =
- ff_rtp_chain_mux_open(s, s->streams[i], fd, 0);
+ ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0, i);
+ if (ret < 0)
+ goto fail;
+ s->streams[i]->priv_data = contexts[i];
+ s->streams[i]->time_base = contexts[i]->streams[0]->time_base;
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,
"?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,
+ &s->interrupt_callback, NULL);
if (ret) {
ret = AVERROR(EIO);
goto fail;
pos += strlen(&sap->ann[pos]) + 1;
if (av_sdp_create(contexts, s->nb_streams, &sap->ann[pos],
- sap->ann_size - pos)) {
+ sap->ann_size - pos)) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
{
AVFormatContext *rtpctx;
struct SAPState *sap = s->priv_data;
- int64_t now = av_gettime();
+ int64_t now = av_gettime_relative();
if (!sap->last_time || now - sap->last_time > 5000000) {
int ret = ffurl_write(sap->ann_fd, sap->ann, sap->ann_size);
}
AVOutputFormat ff_sap_muxer = {
- "sap",
- NULL_IF_CONFIG_SMALL("SAP output format"),
- NULL,
- NULL,
- sizeof(struct SAPState),
- CODEC_ID_AAC,
- CODEC_ID_MPEG4,
- sap_write_header,
- sap_write_packet,
- sap_write_close,
- .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
+ .name = "sap",
+ .long_name = NULL_IF_CONFIG_SMALL("SAP output"),
+ .priv_data_size = sizeof(struct SAPState),
+ .audio_codec = AV_CODEC_ID_AAC,
+ .video_codec = AV_CODEC_ID_MPEG4,
+ .write_header = sap_write_header,
+ .write_packet = sap_write_packet,
+ .write_trailer = sap_write_close,
+ .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
};
-