diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index b5fc92071e43b102f67ac5441a2c458eea5847c4..15dc55b8231e2e2a05e24e044b29d76b776a1026 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -25,6 +25,7 @@ #include "libavutil/avstring.h" #include "libavcodec/mpegaudio.h" #include "avformat.h" +#include "avio_internal.h" #include "riff.h" #include "asf.h" #include "asfcrypt.h" @@ -1243,7 +1244,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int /* Try using the protocol's read_seek if available */ if(s->pb) { - int ret = av_url_read_fseek(s->pb, stream_index, pts, flags); + int ret = ffio_read_seek(s->pb, stream_index, pts, flags); if(ret >= 0) asf_reset_header(s); if (ret != AVERROR(ENOSYS)) diff --git a/libavformat/avio.h b/libavformat/avio.h index 1b483b3a4d68bfdf4a47b3e682998f40f515c6b5..753fa0cc89ac2bfedd82c5a0795f123fecc6bcee 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -415,6 +415,9 @@ attribute_deprecated void put_tag(AVIOContext *s, const char *tag); * @} */ +attribute_deprecated int av_url_read_fpause(AVIOContext *h, int pause); +attribute_deprecated int64_t av_url_read_fseek( AVIOContext *h, int stream_index, + int64_t timestamp, int flags); /** * @defgroup old_url_f_funcs Old url_f* functions @@ -513,10 +516,6 @@ static av_always_inline int64_t avio_tell(AVIOContext *s) */ int64_t avio_size(AVIOContext *s); -int av_url_read_fpause(AVIOContext *h, int pause); -int64_t av_url_read_fseek(AVIOContext *h, int stream_index, - int64_t timestamp, int flags); - /** @warning currently size is limited */ #ifdef __GNUC__ int avio_printf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))); diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 9653a658206fed9e9c556fb38f659f2deabfede8..7dd9bdf6a0158018fb40fa14c5d2fa7d96ecec2c 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -66,4 +66,9 @@ uint64_t ffio_read_varlen(AVIOContext *bc); /** @warning must be called before any I/O */ int ffio_set_buf_size(AVIOContext *s, int buf_size); +int ffio_read_pause(AVIOContext *h, int pause); +int64_t ffio_read_seek( AVIOContext *h, int stream_index, + int64_t timestamp, int flags); + + #endif // AVFORMAT_AVIO_INTERNAL_H diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 9f0f292aff6a276b5094786fe722690360600e5c..bb417e0506c0a0381cc499a0315994d1ec068a17 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -397,6 +397,15 @@ void put_flush_packet(AVIOContext *s) { avio_flush(s); } +int av_url_read_fpause(AVIOContext *s, int pause) +{ + return ffio_read_pause(s, pause); +} +int64_t av_url_read_fseek(AVIOContext *s, int stream_index, + int64_t timestamp, int flags) +{ + return ffio_read_seek(s, stream_index, timestamp, flags); +} #endif int avio_put_str(AVIOContext *s, const char *str) @@ -971,15 +980,15 @@ int url_fget_max_packet_size(AVIOContext *s) } #endif -int av_url_read_fpause(AVIOContext *s, int pause) +int ffio_read_pause(AVIOContext *s, int pause) { if (!s->read_pause) return AVERROR(ENOSYS); return s->read_pause(s->opaque, pause); } -int64_t av_url_read_fseek(AVIOContext *s, int stream_index, - int64_t timestamp, int flags) +int64_t ffio_read_seek(AVIOContext *s, int stream_index, + int64_t timestamp, int flags) { URLContext *h = s->opaque; int64_t ret; diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 1143adf40e2fb21949520f3c8dd01f499c3d7c9f..2152f7d55ab018e714d06b4c8cd8a11358a66fca 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -28,6 +28,7 @@ #include "libavcodec/bytestream.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" +#include "avio_internal.h" #include "flv.h" typedef struct { @@ -461,7 +462,7 @@ leave: static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t ts, int flags) { - return av_url_read_fseek(s->pb, stream_index, ts, flags); + return ffio_read_seek(s->pb, stream_index, ts, flags); } #if 0 /* don't know enough to implement this */ @@ -482,7 +483,7 @@ static int flv_read_seek2(AVFormatContext *s, int stream_index, ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE, flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP); } - ret = av_url_read_fseek(s->pb, stream_index, ts, flags); + ret = ffio_read_seek(s->pb, stream_index, ts, flags); } if (ret == AVERROR(ENOSYS)) diff --git a/libavformat/utils.c b/libavformat/utils.c index 89ce39593be1164d3958b0d9b762973f14353a7b..8c0bf77f353ed0e3818345d62ef9719613bd6bb1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2553,7 +2553,7 @@ int av_read_play(AVFormatContext *s) if (s->iformat->read_play) return s->iformat->read_play(s); if (s->pb) - return av_url_read_fpause(s->pb, 0); + return ffio_read_pause(s->pb, 0); return AVERROR(ENOSYS); } @@ -2562,7 +2562,7 @@ int av_read_pause(AVFormatContext *s) if (s->iformat->read_pause) return s->iformat->read_pause(s); if (s->pb) - return av_url_read_fpause(s->pb, 1); + return ffio_read_pause(s->pb, 1); return AVERROR(ENOSYS); }