falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

avio: AVIO_ prefixes for URL_ open flags.

tags/n0.8
Anton Khirnov 14 years ago
parent
3d42d4937b
commit
f87b1b373a
26 changed files with 92 additions and 65 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      ffmpeg.c
  2. +2
    -2
      ffserver.c
  3. +2
    -2
      libavformat/applehttp.c
  4. +3
    -3
      libavformat/applehttpproto.c
  5. +6
    -6
      libavformat/avio.c
  6. +28
    -1
      libavformat/avio.h
  7. +7
    -7
      libavformat/aviobuf.c
  8. +3
    -3
      libavformat/file.c
  9. +1
    -1
      libavformat/gopher.c
  10. +3
    -3
      libavformat/http.c
  11. +2
    -2
      libavformat/img2.c
  12. +1
    -1
      libavformat/librtmp.c
  13. +1
    -1
      libavformat/matroskadec.c
  14. +2
    -2
      libavformat/md5proto.c
  15. +2
    -2
      libavformat/mmsh.c
  16. +1
    -1
      libavformat/mmst.c
  17. +1
    -1
      libavformat/mov.c
  18. +1
    -1
      libavformat/output-example.c
  19. +2
    -2
      libavformat/rtmpproto.c
  20. +1
    -1
      libavformat/rtpproto.c
  21. +8
    -8
      libavformat/rtsp.c
  22. +1
    -1
      libavformat/sapdec.c
  23. +2
    -2
      libavformat/sapenc.c
  24. +2
    -2
      libavformat/tcp.c
  25. +8
    -8
      libavformat/udp.c
  26. +1
    -1
      libavformat/utils.c

+ 1
- 1
ffmpeg.c View File

@@ -3750,7 +3750,7 @@ static void opt_output_file(const char *filename)
}

/* open the file */
if ((err = avio_open(&oc->pb, filename, URL_WRONLY)) < 0) {
if ((err = avio_open(&oc->pb, filename, AVIO_WRONLY)) < 0) {
print_error(filename, err);
ffmpeg_exit(1);
}


+ 2
- 2
ffserver.c View File

@@ -3427,7 +3427,7 @@ static int rtp_new_av_stream(HTTPContext *c,
"rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port));
}

if (url_open(&h, ctx->filename, URL_WRONLY) < 0)
if (url_open(&h, ctx->filename, AVIO_WRONLY) < 0)
goto fail;
c->rtp_handles[stream_index] = h;
max_packet_size = url_get_max_packet_size(h);
@@ -3767,7 +3767,7 @@ static void build_feed_streams(void)
}

/* only write the header of the ffm file */
if (avio_open(&s->pb, feed->feed_filename, URL_WRONLY) < 0) {
if (avio_open(&s->pb, feed->feed_filename, AVIO_WRONLY) < 0) {
http_log("Could not open output feed file '%s'\n",
feed->feed_filename);
exit(1);


+ 2
- 2
libavformat/applehttp.c View File

@@ -169,7 +169,7 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,

if (!in) {
close_in = 1;
if ((ret = avio_open(&in, url, URL_RDONLY)) < 0)
if ((ret = avio_open(&in, url, AVIO_RDONLY)) < 0)
return ret;
}

@@ -292,7 +292,7 @@ reload:

ret = url_open(&v->input,
v->segments[v->cur_seq_no - v->start_seq_no]->url,
URL_RDONLY);
AVIO_RDONLY);
if (ret < 0)
return ret;
}


+ 3
- 3
libavformat/applehttpproto.c View File

@@ -115,7 +115,7 @@ static int parse_playlist(URLContext *h, const char *url)
char line[1024];
const char *ptr;

if ((ret = avio_open(&in, url, URL_RDONLY)) < 0)
if ((ret = avio_open(&in, url, AVIO_RDONLY)) < 0)
return ret;

read_chomp_line(in, line, sizeof(line));
@@ -180,7 +180,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags)
int ret, i;
const char *nested_url;

if (flags & (URL_WRONLY | URL_RDWR))
if (flags & (AVIO_WRONLY | AVIO_RDWR))
return AVERROR(ENOSYS);

s = av_mallocz(sizeof(AppleHTTPContext));
@@ -275,7 +275,7 @@ retry:
}
url = s->segments[s->cur_seq_no - s->start_seq_no]->url,
av_log(NULL, AV_LOG_DEBUG, "opening %s\n", url);
ret = ffurl_open(&s->seg_hd, url, URL_RDONLY);
ret = ffurl_open(&s->seg_hd, url, AVIO_RDONLY);
if (ret < 0) {
if (url_interrupt_cb())
return AVERROR_EXIT;


+ 6
- 6
libavformat/avio.c View File

@@ -144,7 +144,7 @@ int ffurl_connect(URLContext* uc)
return err;
uc->is_connected = 1;
//We must be careful here as ffurl_seek() could be slow, for example for http
if( (uc->flags & (URL_WRONLY | URL_RDWR))
if( (uc->flags & (AVIO_WRONLY | AVIO_RDWR))
|| !strcmp(uc->prot->name, "file"))
if(!uc->is_streamed && ffurl_seek(uc, 0, SEEK_SET) < 0)
uc->is_streamed= 1;
@@ -275,7 +275,7 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
ret = transfer_func(h, buf+len, size-len);
if (ret == AVERROR(EINTR))
continue;
if (h->flags & URL_FLAG_NONBLOCK)
if (h->flags & AVIO_FLAG_NONBLOCK)
return ret;
if (ret == AVERROR(EAGAIN)) {
ret = 0;
@@ -296,21 +296,21 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int

int ffurl_read(URLContext *h, unsigned char *buf, int size)
{
if (h->flags & URL_WRONLY)
if (h->flags & AVIO_WRONLY)
return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read);
}

int ffurl_read_complete(URLContext *h, unsigned char *buf, int size)
{
if (h->flags & URL_WRONLY)
if (h->flags & AVIO_WRONLY)
return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read);
}

int ffurl_write(URLContext *h, const unsigned char *buf, int size)
{
if (!(h->flags & (URL_WRONLY | URL_RDWR)))
if (!(h->flags & (AVIO_WRONLY | AVIO_RDWR)))
return AVERROR(EIO);
/* avoid sending too big packets */
if (h->max_packet_size && size > h->max_packet_size)
@@ -348,7 +348,7 @@ int ffurl_close(URLContext *h)
int url_exist(const char *filename)
{
URLContext *h;
if (ffurl_open(&h, filename, URL_RDONLY) < 0)
if (ffurl_open(&h, filename, AVIO_RDONLY) < 0)
return 0;
ffurl_close(h);
return 1;


+ 28
- 1
libavformat/avio.h View File

@@ -63,7 +63,6 @@ typedef struct URLPollEntry {
int events;
int revents;
} URLPollEntry;
#endif

/**
* @defgroup open_modes URL open modes
@@ -91,6 +90,7 @@ typedef struct URLPollEntry {
* silently ignored.
*/
#define URL_FLAG_NONBLOCK 4
#endif

typedef int URLInterruptCB(void);

@@ -511,6 +511,33 @@ attribute_deprecated static inline int url_is_streamed(AVIOContext *s)
int url_resetbuf(AVIOContext *s, int flags);
#endif

/**
* @defgroup open_modes URL open modes
* The flags argument to avio_open must be one of the following
* constants, optionally ORed with other flags.
* @{
*/
#define AVIO_RDONLY 0 /**< read-only */
#define AVIO_WRONLY 1 /**< write-only */
#define AVIO_RDWR 2 /**< read-write */
/**
* @}
*/

/**
* Use non-blocking mode.
* If this flag is set, operations on the context will return
* AVERROR(EAGAIN) if they can not be performed immediately.
* If this flag is not set, operations on the context will never return
* AVERROR(EAGAIN).
* Note that this flag does not affect the opening/connecting of the
* context. Connecting a protocol will always block if necessary (e.g. on
* network protocols) but never hang (e.g. on busy devices).
* Warning: non-blocking protocols is work-in-progress; this flag may be
* silently ignored.
*/
#define AVIO_FLAG_NONBLOCK 4

/**
* Create and initialize a AVIOContext for accessing the
* resource indicated by url.


+ 7
- 7
libavformat/aviobuf.c View File

@@ -55,7 +55,7 @@ int ffio_init_context(AVIOContext *s,
s->buffer_size = buffer_size;
s->buf_ptr = buffer;
s->opaque = opaque;
url_resetbuf(s, write_flag ? URL_WRONLY : URL_RDONLY);
url_resetbuf(s, write_flag ? AVIO_WRONLY : AVIO_RDONLY);
s->write_packet = write_packet;
s->read_packet = read_packet;
s->seek = seek;
@@ -845,7 +845,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
}

if (ffio_init_context(*s, buffer, buffer_size,
(h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
(h->flags & AVIO_WRONLY || h->flags & AVIO_RDWR), h,
ffurl_read, ffurl_write, ffurl_seek) < 0) {
av_free(buffer);
av_freep(s);
@@ -874,7 +874,7 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size)
s->buffer = buffer;
s->buffer_size = buf_size;
s->buf_ptr = buffer;
url_resetbuf(s, s->write_flag ? URL_WRONLY : URL_RDONLY);
url_resetbuf(s, s->write_flag ? AVIO_WRONLY : AVIO_RDONLY);
return 0;
}

@@ -885,13 +885,13 @@ static int url_resetbuf(AVIOContext *s, int flags)
#endif
{
#if FF_API_URL_RESETBUF
if (flags & URL_RDWR)
if (flags & AVIO_RDWR)
return AVERROR(EINVAL);
#else
assert(flags == URL_WRONLY || flags == URL_RDONLY);
assert(flags == AVIO_WRONLY || flags == AVIO_RDONLY);
#endif

if (flags & URL_WRONLY) {
if (flags & AVIO_WRONLY) {
s->buf_end = s->buffer + s->buffer_size;
s->write_flag = 1;
} else {
@@ -1049,7 +1049,7 @@ int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
if(!*s)
return AVERROR(ENOMEM);
ret = ffio_init_context(*s, buf, buf_size,
(flags & URL_WRONLY || flags & URL_RDWR),
(flags & AVIO_WRONLY || flags & AVIO_RDWR),
NULL, NULL, NULL, NULL);
if(ret != 0)
av_freep(s);


+ 3
- 3
libavformat/file.c View File

@@ -59,9 +59,9 @@ static int file_open(URLContext *h, const char *filename, int flags)

av_strstart(filename, "file:", &filename);

if (flags & URL_RDWR) {
if (flags & AVIO_RDWR) {
access = O_CREAT | O_TRUNC | O_RDWR;
} else if (flags & URL_WRONLY) {
} else if (flags & AVIO_WRONLY) {
access = O_CREAT | O_TRUNC | O_WRONLY;
} else {
access = O_RDONLY;
@@ -116,7 +116,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)

fd = strtol(filename, &final, 10);
if((filename == final) || *final ) {/* No digits found, or something like 10ab */
if (flags & URL_WRONLY) {
if (flags & AVIO_WRONLY) {
fd = 1;
} else {
fd = 0;


+ 1
- 1
libavformat/gopher.c View File

@@ -100,7 +100,7 @@ static int gopher_open(URLContext *h, const char *uri, int flags)
ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);

s->hd = NULL;
err = ffurl_open(&s->hd, buf, URL_RDWR);
err = ffurl_open(&s->hd, buf, AVIO_RDWR);
if (err < 0)
goto fail;



+ 3
- 3
libavformat/http.c View File

@@ -124,7 +124,7 @@ static int http_open_cnx(URLContext *h)
port = 80;

ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);
err = ffurl_open(&hd, buf, URL_RDWR);
err = ffurl_open(&hd, buf, AVIO_RDWR);
if (err < 0)
goto fail;

@@ -296,7 +296,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,


/* send http header */
post = h->flags & URL_WRONLY;
post = h->flags & AVIO_WRONLY;
authstr = ff_http_auth_create_response(&s->auth_state, auth, path,
post ? "POST" : "GET");

@@ -451,7 +451,7 @@ static int http_close(URLContext *h)
HTTPContext *s = h->priv_data;

/* signal end of chunked encoding if used */
if ((h->flags & URL_WRONLY) && s->chunksize != -1) {
if ((h->flags & AVIO_WRONLY) && s->chunksize != -1) {
ret = ffurl_write(s->hd, footer, sizeof(footer) - 1);
ret = ret > 0 ? 0 : ret;
}


+ 2
- 2
libavformat/img2.c View File

@@ -270,7 +270,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
s->path, s->img_number)<0 && s->img_number > 1)
return AVERROR(EIO);
for(i=0; i<3; i++){
if (avio_open(&f[i], filename, URL_RDONLY) < 0) {
if (avio_open(&f[i], filename, AVIO_RDONLY) < 0) {
if(i==1)
break;
av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
@@ -354,7 +354,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO);
}
for(i=0; i<3; i++){
if (avio_open(&pb[i], filename, URL_WRONLY) < 0) {
if (avio_open(&pb[i], filename, AVIO_WRONLY) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
return AVERROR(EIO);
}


+ 1
- 1
libavformat/librtmp.c View File

@@ -93,7 +93,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
goto fail;
}

if (flags & URL_WRONLY)
if (flags & AVIO_WRONLY)
RTMP_EnableWrite(r);

if (!RTMP_Connect(r, NULL) || !RTMP_ConnectStream(r, 0)) {


+ 1
- 1
libavformat/matroskadec.c View File

@@ -1330,7 +1330,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
&& track->codec_priv.size >= 14
&& track->codec_priv.data != NULL) {
ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size,
URL_RDONLY, NULL, NULL, NULL, NULL);
AVIO_RDONLY, NULL, NULL, NULL, NULL);
ff_get_wav_header(&b, st->codec, track->codec_priv.size);
codec_id = st->codec->codec_id;
extradata_offset = FFMIN(track->codec_priv.size, 18);


+ 2
- 2
libavformat/md5proto.c View File

@@ -36,7 +36,7 @@ static int md5_open(URLContext *h, const char *filename, int flags)
return -1;
}

if (flags != URL_WRONLY)
if (flags != AVIO_WRONLY)
return AVERROR(EINVAL);

av_md5_init(h->priv_data);
@@ -65,7 +65,7 @@ static int md5_close(URLContext *h)
av_strstart(filename, "md5:", &filename);

if (*filename) {
err = ffurl_open(&out, filename, URL_WRONLY);
err = ffurl_open(&out, filename, AVIO_WRONLY);
if (err)
return err;
err = ffurl_write(out, buf, i*2+1);


+ 2
- 2
libavformat/mmsh.c View File

@@ -233,7 +233,7 @@ static int mmsh_open(URLContext *h, const char *uri, int flags)
port = 80; // default mmsh protocol port
ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, path);

if (ffurl_alloc(&mms->mms_hd, httpname, URL_RDONLY) < 0) {
if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_RDONLY) < 0) {
return AVERROR(EIO);
}

@@ -261,7 +261,7 @@ static int mmsh_open(URLContext *h, const char *uri, int flags)
// close the socket and then reopen it for sending the second play request.
ffurl_close(mms->mms_hd);
memset(headers, 0, sizeof(headers));
if (ffurl_alloc(&mms->mms_hd, httpname, URL_RDONLY) < 0) {
if (ffurl_alloc(&mms->mms_hd, httpname, AVIO_RDONLY) < 0) {
return AVERROR(EIO);
}
stream_selection = av_mallocz(mms->stream_num * 19 + 1);


+ 1
- 1
libavformat/mmst.c View File

@@ -523,7 +523,7 @@ static int mms_open(URLContext *h, const char *uri, int flags)

// establish tcp connection.
ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, mmst->host, port, NULL);
err = ffurl_open(&mms->mms_hd, tcpname, URL_RDWR);
err = ffurl_open(&mms->mms_hd, tcpname, AVIO_RDWR);
if (err)
goto fail;



+ 1
- 1
libavformat/mov.c View File

@@ -1722,7 +1722,7 @@ static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref)

av_strlcat(filename, ref->path + l + 1, 1024);

if (!avio_open(pb, filename, URL_RDONLY))
if (!avio_open(pb, filename, AVIO_RDONLY))
return 0;
}
}


+ 1
- 1
libavformat/output-example.c View File

@@ -492,7 +492,7 @@ int main(int argc, char **argv)

/* open the output file, if needed */
if (!(fmt->flags & AVFMT_NOFILE)) {
if (avio_open(&oc->pb, filename, URL_WRONLY) < 0) {
if (avio_open(&oc->pb, filename, AVIO_WRONLY) < 0) {
fprintf(stderr, "Could not open '%s'\n", filename);
exit(1);
}


+ 2
- 2
libavformat/rtmpproto.c View File

@@ -812,7 +812,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
if (!rt)
return AVERROR(ENOMEM);
s->priv_data = rt;
rt->is_input = !(flags & URL_WRONLY);
rt->is_input = !(flags & AVIO_WRONLY);

av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port,
path, sizeof(path), s->filename);
@@ -821,7 +821,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
port = RTMP_DEFAULT_PORT;
ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);

if (ffurl_open(&rt->stream, buf, URL_RDWR) < 0) {
if (ffurl_open(&rt->stream, buf, AVIO_RDWR) < 0) {
av_log(LOG_CONTEXT, AV_LOG_ERROR, "Cannot open connection %s\n", buf);
goto fail;
}


+ 1
- 1
libavformat/rtpproto.c View File

@@ -145,7 +145,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
char path[1024];
const char *p;

is_output = (flags & URL_WRONLY);
is_output = (flags & AVIO_WRONLY);

s = av_mallocz(sizeof(RTPContext));
if (!s)


+ 8
- 8
libavformat/rtsp.c View File

@@ -1116,14 +1116,14 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
"?localport=%d", j);
/* we will use two ports per rtp stream (rtp and rtcp) */
j += 2;
if (ffurl_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0)
if (ffurl_open(&rtsp_st->rtp_handle, buf, AVIO_RDWR) == 0)
goto rtp_opened;
}
}

#if 0
/* then try on any port */
if (ffurl_open(&rtsp_st->rtp_handle, "rtp://", URL_RDONLY) < 0) {
if (ffurl_open(&rtsp_st->rtp_handle, "rtp://", AVIO_RDONLY) < 0) {
err = AVERROR_INVALIDDATA;
goto fail;
}
@@ -1269,7 +1269,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
port, "?ttl=%d", ttl);
if (ffurl_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
if (ffurl_open(&rtsp_st->rtp_handle, url, AVIO_RDWR) < 0) {
err = AVERROR_INVALIDDATA;
goto fail;
}
@@ -1396,7 +1396,7 @@ redirect:
av_get_random_seed(), av_get_random_seed());

/* GET requests */
if (ffurl_alloc(&rt->rtsp_hd, httpname, URL_RDONLY) < 0) {
if (ffurl_alloc(&rt->rtsp_hd, httpname, AVIO_RDONLY) < 0) {
err = AVERROR(EIO);
goto fail;
}
@@ -1417,7 +1417,7 @@ redirect:
}

/* POST requests */
if (ffurl_alloc(&rt->rtsp_hd_out, httpname, URL_WRONLY) < 0 ) {
if (ffurl_alloc(&rt->rtsp_hd_out, httpname, AVIO_WRONLY) < 0 ) {
err = AVERROR(EIO);
goto fail;
}
@@ -1460,7 +1460,7 @@ redirect:
} else {
/* open the tcp connection */
ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, host, port, NULL);
if (ffurl_open(&rt->rtsp_hd, tcpname, URL_RDWR) < 0) {
if (ffurl_open(&rt->rtsp_hd, tcpname, AVIO_RDWR) < 0) {
err = AVERROR(EIO);
goto fail;
}
@@ -1807,7 +1807,7 @@ static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap)
namebuf, rtsp_st->sdp_port,
"?localport=%d&ttl=%d", rtsp_st->sdp_port,
rtsp_st->sdp_ttl);
if (ffurl_open(&rtsp_st->rtp_handle, url, URL_RDWR) < 0) {
if (ffurl_open(&rtsp_st->rtp_handle, url, AVIO_RDWR) < 0) {
err = AVERROR_INVALIDDATA;
goto fail;
}
@@ -1863,7 +1863,7 @@ static int rtp_read_header(AVFormatContext *s,
if (!ff_network_init())
return AVERROR(EIO);

ret = ffurl_open(&in, s->filename, URL_RDONLY);
ret = ffurl_open(&in, s->filename, AVIO_RDONLY);
if (ret)
goto fail;



+ 1
- 1
libavformat/sapdec.c View File

@@ -85,7 +85,7 @@ static int sap_read_header(AVFormatContext *s,

ff_url_join(url, sizeof(url), "udp", NULL, host, port, "?localport=%d",
port);
ret = ffurl_open(&sap->ann_fd, url, URL_RDONLY);
ret = ffurl_open(&sap->ann_fd, url, AVIO_RDONLY);
if (ret)
goto fail;



+ 2
- 2
libavformat/sapenc.c View File

@@ -146,7 +146,7 @@ static int sap_write_header(AVFormatContext *s)
"?ttl=%d", ttl);
if (!same_port)
base_port += 2;
ret = ffurl_open(&fd, url, URL_WRONLY);
ret = ffurl_open(&fd, url, AVIO_WRONLY);
if (ret) {
ret = AVERROR(EIO);
goto fail;
@@ -158,7 +158,7 @@ static int sap_write_header(AVFormatContext *s)

ff_url_join(url, sizeof(url), "udp", NULL, announce_addr, port,
"?ttl=%d&connect=1", ttl);
ret = ffurl_open(&sap->ann_fd, url, URL_WRONLY);
ret = ffurl_open(&sap->ann_fd, url, AVIO_WRONLY);
if (ret) {
ret = AVERROR(EIO);
goto fail;


+ 2
- 2
libavformat/tcp.c View File

@@ -156,7 +156,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
TCPContext *s = h->priv_data;
int ret;

if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
ret = ff_network_wait_fd(s->fd, 0);
if (ret < 0)
return ret;
@@ -170,7 +170,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size)
TCPContext *s = h->priv_data;
int ret;

if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
ret = ff_network_wait_fd(s->fd, 1);
if (ret < 0)
return ret;


+ 8
- 8
libavformat/udp.c View File

@@ -317,7 +317,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
h->is_streamed = 1;
h->max_packet_size = 1472;

is_output = (flags & URL_WRONLY);
is_output = (flags & AVIO_WRONLY);

s = av_mallocz(sizeof(UDPContext));
if (!s)
@@ -360,14 +360,14 @@ static int udp_open(URLContext *h, const char *uri, int flags)
/* XXX: fix av_url_split */
if (hostname[0] == '\0' || hostname[0] == '?') {
/* only accepts null hostname if input */
if (flags & URL_WRONLY)
if (flags & AVIO_WRONLY)
goto fail;
} else {
if (ff_udp_set_remote_url(h, uri) < 0)
goto fail;
}

if (s->is_multicast && !(h->flags & URL_WRONLY))
if (s->is_multicast && !(h->flags & AVIO_WRONLY))
s->local_port = port;
udp_fd = udp_socket_create(s, &my_addr, &len);
if (udp_fd < 0)
@@ -384,7 +384,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)

/* the bind is needed to give a port to the socket now */
/* if multicast, try the multicast address bind first */
if (s->is_multicast && !(h->flags & URL_WRONLY)) {
if (s->is_multicast && !(h->flags & AVIO_WRONLY)) {
bind_ret = bind(udp_fd,(struct sockaddr *)&s->dest_addr, len);
}
/* bind to the local address if not multicast or if the multicast
@@ -397,7 +397,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
s->local_port = udp_port(&my_addr, len);

if (s->is_multicast) {
if (h->flags & URL_WRONLY) {
if (h->flags & AVIO_WRONLY) {
/* output */
if (udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr) < 0)
goto fail;
@@ -446,7 +446,7 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
UDPContext *s = h->priv_data;
int ret;

if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
ret = ff_network_wait_fd(s->udp_fd, 0);
if (ret < 0)
return ret;
@@ -460,7 +460,7 @@ static int udp_write(URLContext *h, const uint8_t *buf, int size)
UDPContext *s = h->priv_data;
int ret;

if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
ret = ff_network_wait_fd(s->udp_fd, 1);
if (ret < 0)
return ret;
@@ -480,7 +480,7 @@ static int udp_close(URLContext *h)
{
UDPContext *s = h->priv_data;

if (s->is_multicast && !(h->flags & URL_WRONLY))
if (s->is_multicast && !(h->flags & AVIO_WRONLY))
udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
closesocket(s->udp_fd);
av_free(s);


+ 1
- 1
libavformat/utils.c View File

@@ -631,7 +631,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
hack needed to handle RTSP/TCP */
if (!fmt || !(fmt->flags & AVFMT_NOFILE)) {
/* if no file needed do not try to open one */
if ((err=avio_open(&pb, filename, URL_RDONLY)) < 0) {
if ((err=avio_open(&pb, filename, AVIO_RDONLY)) < 0) {
goto fail;
}
if (buf_size > 0) {


Write Preview
Loading…
Cancel
Save