Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avio: rename url_fopen/fclose -> avio_open/close.

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
oldabi
Anton Khirnov 14 years ago committed by Michael Niedermayer
parent c24a403496
commit ebb92e0768
14 changed files with 55 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ffmpeg.c
  2. 4
      ffserver.c
  3. 16
      libavformat/applehttp.c
  4. 2
      libavformat/avformat.h
  5. 16
      libavformat/avio.h
  6. 13
      libavformat/aviobuf.c
  7. 12
      libavformat/img2.c
  8. 4
      libavformat/mov.c
  9. 4
      libavformat/output-example.c
  10. 2
      libavformat/rtpenc_chain.c
  11. 2
      libavformat/rtsp.c
  12. 2
      libavformat/rtspdec.c
  13. 2
      libavformat/sapenc.c
  14. 6
      libavformat/utils.c

4
ffmpeg.c
Unescape View File

@ -521,7 +521,7 @@ static int ffmpeg_exit(int ret)
AVFormatContext *s = output_files[i]; AVFormatContext *s = output_files[i];
int j; int j;
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
url_fclose(s->pb); avio_close(s->pb);
avformat_free_context(s); avformat_free_context(s);
av_free(output_streams_for_file[i]); av_free(output_streams_for_file[i]);
} }
@ -3816,7 +3816,7 @@ static void opt_output_file(const char *filename)
} }
/* open the file */ /* open the file */
if ((err = url_fopen(&oc->pb, filename, URL_WRONLY)) < 0) { if ((err = avio_open(&oc->pb, filename, URL_WRONLY)) < 0) {
print_error(filename, err); print_error(filename, err);
ffmpeg_exit(1); ffmpeg_exit(1);
} }

4
ffserver.c
Unescape View File

@ -3764,7 +3764,7 @@ static void build_feed_streams(void)
} }
/* only write the header of the ffm file */ /* only write the header of the ffm file */
if (url_fopen(&s->pb, feed->feed_filename, URL_WRONLY) < 0) { if (avio_open(&s->pb, feed->feed_filename, URL_WRONLY) < 0) {
http_log("Could not open output feed file '%s'\n", http_log("Could not open output feed file '%s'\n",
feed->feed_filename); feed->feed_filename);
exit(1); exit(1);
@ -3783,7 +3783,7 @@ static void build_feed_streams(void)
} }
/* XXX: need better api */ /* XXX: need better api */
av_freep(&s->priv_data); av_freep(&s->priv_data);
url_fclose(s->pb); avio_close(s->pb);
} }
/* get feed size and write index */ /* get feed size and write index */
fd = open(feed->feed_filename, O_RDONLY); fd = open(feed->feed_filename, O_RDONLY);

16
libavformat/applehttp.c
Unescape View File

@ -154,7 +154,7 @@ static void free_variant_list(AppleHTTPContext *c)
free_segment_list(var); free_segment_list(var);
av_free_packet(&var->pkt); av_free_packet(&var->pkt);
if (var->pb) if (var->pb)
url_fclose(var->pb); avio_close(var->pb);
if (var->ctx) { if (var->ctx) {
var->ctx->pb = NULL; var->ctx->pb = NULL;
av_close_input_file(var->ctx); av_close_input_file(var->ctx);
@ -211,7 +211,7 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,
if (!in) { if (!in) {
close_in = 1; close_in = 1;
if ((ret = url_fopen(&in, url, URL_RDONLY)) < 0) if ((ret = avio_open(&in, url, URL_RDONLY)) < 0)
return ret; return ret;
} }
@ -284,7 +284,7 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,
fail: fail:
if (close_in) if (close_in)
url_fclose(in); avio_close(in);
return ret; return ret;
} }
@ -338,7 +338,7 @@ static int applehttp_read_header(AVFormatContext *s, AVFormatParameters *ap)
ret = av_open_input_file(&v->ctx, v->segments[0]->url, NULL, 0, NULL); ret = av_open_input_file(&v->ctx, v->segments[0]->url, NULL, 0, NULL);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
url_fclose(v->ctx->pb); avio_close(v->ctx->pb);
v->ctx->pb = NULL; v->ctx->pb = NULL;
v->stream_offset = stream_offset; v->stream_offset = stream_offset;
/* Create new AVStreams for each stream in this variant */ /* Create new AVStreams for each stream in this variant */
@ -378,7 +378,7 @@ static int open_variant(AppleHTTPContext *c, struct variant *var, int skip)
} }
if (c->cur_seq_no - var->start_seq_no >= var->n_segments) if (c->cur_seq_no - var->start_seq_no >= var->n_segments)
return c->finished ? AVERROR_EOF : 0; return c->finished ? AVERROR_EOF : 0;
ret = url_fopen(&var->pb, ret = avio_open(&var->pb,
var->segments[c->cur_seq_no - var->start_seq_no]->url, var->segments[c->cur_seq_no - var->start_seq_no]->url,
URL_RDONLY); URL_RDONLY);
if (ret < 0) if (ret < 0)
@ -435,7 +435,7 @@ start:
"Closing variant stream %d, no longer needed\n", i); "Closing variant stream %d, no longer needed\n", i);
av_free_packet(&var->pkt); av_free_packet(&var->pkt);
reset_packet(&var->pkt); reset_packet(&var->pkt);
url_fclose(var->pb); avio_close(var->pb);
var->pb = NULL; var->pb = NULL;
changed = 1; changed = 1;
} else if (!var->pb && var->needed) { } else if (!var->pb && var->needed) {
@ -484,7 +484,7 @@ start:
for (i = 0; i < c->n_variants; i++) { for (i = 0; i < c->n_variants; i++) {
struct variant *var = c->variants[i]; struct variant *var = c->variants[i];
if (var->pb) { if (var->pb) {
url_fclose(var->pb); avio_close(var->pb);
var->pb = NULL; var->pb = NULL;
} }
} }
@ -558,7 +558,7 @@ static int applehttp_read_seek(AVFormatContext *s, int stream_index,
for (i = 0; i < c->n_variants; i++) { for (i = 0; i < c->n_variants; i++) {
struct variant *var = c->variants[i]; struct variant *var = c->variants[i];
if (var->pb) { if (var->pb) {
url_fclose(var->pb); avio_close(var->pb);
var->pb = NULL; var->pb = NULL;
} }
av_free_packet(&var->pkt); av_free_packet(&var->pkt);

2
libavformat/avformat.h
Unescape View File

@ -261,7 +261,7 @@ typedef struct AVFormatParameters {
#endif #endif
} AVFormatParameters; } AVFormatParameters;
//! Demuxer will use url_fopen, no opened file should be provided by the caller. //! Demuxer will use avio_open, no opened file should be provided by the caller.
#define AVFMT_NOFILE 0x0001 #define AVFMT_NOFILE 0x0001
#define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */ #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
#define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */ #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */

16
libavformat/avio.h
Unescape View File

@ -410,6 +410,18 @@ attribute_deprecated void put_be16(AVIOContext *s, unsigned int val);
/** /**
* @} * @}
*/ */
/**
* @defgroup old_url_f_funcs Old url_f* functions
* @deprecated use the avio_ -prefixed functions instead.
* @{
*/
attribute_deprecated int url_fopen( AVIOContext **s, const char *url, int flags);
attribute_deprecated int url_fclose(AVIOContext *s);
/**
* @}
*/
#endif #endif
AVIOContext *avio_alloc_context( AVIOContext *avio_alloc_context(
@ -591,9 +603,9 @@ int ff_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size);
* @return 0 in case of success, a negative value corresponding to an * @return 0 in case of success, a negative value corresponding to an
* AVERROR code in case of failure * AVERROR code in case of failure
*/ */
int url_fopen(AVIOContext **s, const char *url, int flags); int avio_open(AVIOContext **s, const char *url, int flags);
int url_fclose(AVIOContext *s); int avio_close(AVIOContext *s);
URLContext *url_fileno(AVIOContext *s); URLContext *url_fileno(AVIOContext *s);
/** /**

13
libavformat/aviobuf.c
Unescape View File

@ -356,6 +356,15 @@ void put_nbyte(AVIOContext *s, int b, int count)
{ {
ffio_fill(s, b, count); ffio_fill(s, b, count);
} }
int url_fopen(AVIOContext **s, const char *filename, int flags)
{
return avio_open(s, filename, flags);
}
int url_fclose(AVIOContext *s)
{
return avio_close(s);
}
#endif #endif
int avio_put_str(AVIOContext *s, const char *str) int avio_put_str(AVIOContext *s, const char *str)
@ -843,7 +852,7 @@ int ff_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size)
return 0; return 0;
} }
int url_fopen(AVIOContext **s, const char *filename, int flags) int avio_open(AVIOContext **s, const char *filename, int flags)
{ {
URLContext *h; URLContext *h;
int err; int err;
@ -859,7 +868,7 @@ int url_fopen(AVIOContext **s, const char *filename, int flags)
return 0; return 0;
} }
int url_fclose(AVIOContext *s) int avio_close(AVIOContext *s)
{ {
URLContext *h = s->opaque; URLContext *h = s->opaque;

12
libavformat/img2.c
Unescape View File

@ -269,7 +269,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
s->path, s->img_number)<0 && s->img_number > 1) s->path, s->img_number)<0 && s->img_number > 1)
return AVERROR(EIO); return AVERROR(EIO);
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if (url_fopen(&f[i], filename, URL_RDONLY) < 0) { if (avio_open(&f[i], filename, URL_RDONLY) < 0) {
if(i==1) if(i==1)
break; break;
av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename); av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
@ -300,7 +300,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
if(size[i]){ if(size[i]){
ret[i]= avio_read(f[i], pkt->data + pkt->size, size[i]); ret[i]= avio_read(f[i], pkt->data + pkt->size, size[i]);
if (!s->is_pipe) if (!s->is_pipe)
url_fclose(f[i]); avio_close(f[i]);
if(ret[i]>0) if(ret[i]>0)
pkt->size += ret[i]; pkt->size += ret[i];
} }
@ -353,7 +353,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO); return AVERROR(EIO);
} }
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if (url_fopen(&pb[i], filename, URL_WRONLY) < 0) { if (avio_open(&pb[i], filename, URL_WRONLY) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename); av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -373,8 +373,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
avio_write(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2); avio_write(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2);
put_flush_packet(pb[1]); put_flush_packet(pb[1]);
put_flush_packet(pb[2]); put_flush_packet(pb[2]);
url_fclose(pb[1]); avio_close(pb[1]);
url_fclose(pb[2]); avio_close(pb[2]);
}else{ }else{
if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){ if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
@ -403,7 +403,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} }
put_flush_packet(pb[0]); put_flush_packet(pb[0]);
if (!img->is_pipe) { if (!img->is_pipe) {
url_fclose(pb[0]); avio_close(pb[0]);
} }
img->img_number++; img->img_number++;

4
libavformat/mov.c
Unescape View File

@ -1718,7 +1718,7 @@ static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref)
av_strlcat(filename, ref->path + l + 1, 1024); av_strlcat(filename, ref->path + l + 1, 1024);
if (!url_fopen(pb, filename, URL_RDONLY)) if (!avio_open(pb, filename, URL_RDONLY))
return 0; return 0;
} }
} }
@ -2546,7 +2546,7 @@ static int mov_read_close(AVFormatContext *s)
} }
av_freep(&sc->drefs); av_freep(&sc->drefs);
if (sc->pb && sc->pb != s->pb) if (sc->pb && sc->pb != s->pb)
url_fclose(sc->pb); avio_close(sc->pb);
av_freep(&st->codec->palctrl); av_freep(&st->codec->palctrl);
} }

4
libavformat/output-example.c
Unescape View File

@ -492,7 +492,7 @@ int main(int argc, char **argv)
/* open the output file, if needed */ /* open the output file, if needed */
if (!(fmt->flags & AVFMT_NOFILE)) { if (!(fmt->flags & AVFMT_NOFILE)) {
if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) { if (avio_open(&oc->pb, filename, URL_WRONLY) < 0) {
fprintf(stderr, "Could not open '%s'\n", filename); fprintf(stderr, "Could not open '%s'\n", filename);
exit(1); exit(1);
} }
@ -545,7 +545,7 @@ int main(int argc, char **argv)
if (!(fmt->flags & AVFMT_NOFILE)) { if (!(fmt->flags & AVFMT_NOFILE)) {
/* close the output file */ /* close the output file */
url_fclose(oc->pb); avio_close(oc->pb);
} }
/* free the stream */ /* free the stream */

2
libavformat/rtpenc_chain.c
Unescape View File

@ -60,7 +60,7 @@ AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
if (ret) { if (ret) {
if (handle) { if (handle) {
url_fclose(rtpctx->pb); avio_close(rtpctx->pb);
} else { } else {
uint8_t *ptr; uint8_t *ptr;
url_close_dyn_buf(rtpctx->pb, &ptr); url_close_dyn_buf(rtpctx->pb, &ptr);

2
libavformat/rtsp.c
Unescape View File

@ -498,7 +498,7 @@ void ff_rtsp_undo_setup(AVFormatContext *s)
url_close_dyn_buf(rtpctx->pb, &ptr); url_close_dyn_buf(rtpctx->pb, &ptr);
av_free(ptr); av_free(ptr);
} else { } else {
url_fclose(rtpctx->pb); avio_close(rtpctx->pb);
} }
avformat_free_context(rtpctx); avformat_free_context(rtpctx);
} else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC) } else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC)

2
libavformat/rtspdec.c
Unescape View File

@ -382,7 +382,7 @@ static int rtsp_read_close(AVFormatContext *s)
#if 0 #if 0
/* NOTE: it is valid to flush the buffer here */ /* NOTE: it is valid to flush the buffer here */
if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) { if (rt->lower_transport == RTSP_LOWER_TRANSPORT_TCP) {
url_fclose(&rt->rtsp_gb); avio_close(&rt->rtsp_gb);
} }
#endif #endif
ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL); ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);

2
libavformat/sapenc.c
Unescape View File

@ -46,7 +46,7 @@ static int sap_write_close(AVFormatContext *s)
if (!rtpctx) if (!rtpctx)
continue; continue;
av_write_trailer(rtpctx); av_write_trailer(rtpctx);
url_fclose(rtpctx->pb); avio_close(rtpctx->pb);
avformat_free_context(rtpctx); avformat_free_context(rtpctx);
s->streams[i]->priv_data = NULL; s->streams[i]->priv_data = NULL;
} }

6
libavformat/utils.c
Unescape View File

@ -616,7 +616,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
hack needed to handle RTSP/TCP */ hack needed to handle RTSP/TCP */
if (!fmt || !(fmt->flags & AVFMT_NOFILE)) { if (!fmt || !(fmt->flags & AVFMT_NOFILE)) {
/* if no file needed do not try to open one */ /* if no file needed do not try to open one */
if ((err=url_fopen(&pb, filename, URL_RDONLY)) < 0) { if ((err=avio_open(&pb, filename, URL_RDONLY)) < 0) {
goto fail; goto fail;
} }
if (buf_size > 0) { if (buf_size > 0) {
@ -647,7 +647,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
fail: fail:
av_freep(&pd->buf); av_freep(&pd->buf);
if (pb) if (pb)
url_fclose(pb); avio_close(pb);
if (ap && ap->prealloced_context) if (ap && ap->prealloced_context)
av_free(*ic_ptr); av_free(*ic_ptr);
*ic_ptr = NULL; *ic_ptr = NULL;
@ -2623,7 +2623,7 @@ void av_close_input_file(AVFormatContext *s)
AVIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb; AVIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb;
av_close_input_stream(s); av_close_input_stream(s);
if (pb) if (pb)
url_fclose(pb); avio_close(pb);
} }
AVStream *av_new_stream(AVFormatContext *s, int id) AVStream *av_new_stream(AVFormatContext *s, int id)

Write Preview
Loading…
Cancel
Save