#include "os_support.h"
#include "internal.h"
#include "avio_internal.h"
+#include "url.h"
#if HAVE_POLL_H
#include <poll.h>
#endif
{
struct SAPState *sap = s->priv_data;
if (sap->sdp_ctx)
- av_close_input_stream(sap->sdp_ctx);
+ av_close_input_file(sap->sdp_ctx);
if (sap->ann_fd)
- url_close(sap->ann_fd);
+ ffurl_close(sap->ann_fd);
av_freep(&sap->sdp);
ff_network_close();
return 0;
ff_url_join(url, sizeof(url), "udp", NULL, host, port, "?localport=%d",
port);
- ret = url_open(&sap->ann_fd, url, URL_RDONLY);
+ ret = ffurl_open(&sap->ann_fd, url, AVIO_FLAG_READ);
if (ret)
goto fail;
int addr_type, auth_len;
int pos;
- ret = url_read(sap->ann_fd, recvbuf, sizeof(recvbuf) - 1);
+ ret = ffurl_read(sap->ann_fd, recvbuf, sizeof(recvbuf) - 1);
if (ret == AVERROR(EAGAIN))
continue;
if (ret < 0)
goto fail;
}
sap->sdp_ctx->max_delay = s->max_delay;
- ap->prealloced_context = 1;
- ret = av_open_input_stream(&sap->sdp_ctx, &sap->sdp_pb, "temp.sdp",
- infmt, ap);
+ sap->sdp_ctx->pb = &sap->sdp_pb;
+ ret = avformat_open_input(&sap->sdp_ctx, "temp.sdp", infmt, NULL);
if (ret < 0)
goto fail;
if (sap->sdp_ctx->ctx_flags & AVFMTCTX_NOHEADER)
static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt)
{
struct SAPState *sap = s->priv_data;
- int fd = url_get_file_handle(sap->ann_fd);
+ int fd = ffurl_get_file_handle(sap->ann_fd);
int n, ret;
struct pollfd p = {fd, POLLIN, 0};
uint8_t recvbuf[1500];
n = poll(&p, 1, 0);
if (n <= 0 || !(p.revents & POLLIN))
break;
- ret = url_read(sap->ann_fd, recvbuf, sizeof(recvbuf));
+ ret = ffurl_read(sap->ann_fd, recvbuf, sizeof(recvbuf));
if (ret >= 8) {
uint16_t hash = AV_RB16(&recvbuf[2]);
/* Should ideally check the source IP address, too */
}
AVInputFormat ff_sap_demuxer = {
- "sap",
- NULL_IF_CONFIG_SMALL("SAP input format"),
- sizeof(struct SAPState),
- sap_probe,
- sap_read_header,
- sap_fetch_packet,
- sap_read_close,
+ .name = "sap",
+ .long_name = NULL_IF_CONFIG_SMALL("SAP input format"),
+ .priv_data_size = sizeof(struct SAPState),
+ .read_probe = sap_probe,
+ .read_header = sap_read_header,
+ .read_packet = sap_fetch_packet,
+ .read_close = sap_read_close,
.flags = AVFMT_NOFILE,
};