[06/13] avio: make av_url_read_fseek/fpause internal.

Message ID 1300131546-2880-6-git-send-email-anton@khirnov.net
State Committed
Headers show

Commit Message

Anton Khirnov March 14, 2011, 7:38 p.m.
---
 libavformat/asfdec.c        |    3 ++-
 libavformat/avio.h          |    7 +++----
 libavformat/avio_internal.h |    5 +++++
 libavformat/aviobuf.c       |   15 ++++++++++++---
 libavformat/flvdec.c        |    5 +++--
 libavformat/utils.c         |    4 ++--
 6 files changed, 27 insertions(+), 12 deletions(-)

Comments

Luca Barbato March 17, 2011, 3:16 a.m. | #1
On 3/14/11 8:38 PM, Anton Khirnov wrote:
> ---
>   libavformat/asfdec.c        |    3 ++-
>   libavformat/avio.h          |    7 +++----
>   libavformat/avio_internal.h |    5 +++++
>   libavformat/aviobuf.c       |   15 ++++++++++++---
>   libavformat/flvdec.c        |    5 +++--
>   libavformat/utils.c         |    4 ++--
>   6 files changed, 27 insertions(+), 12 deletions(-)

Ok
Ronald Bultje March 21, 2011, 6:55 p.m. | #2
Hi,

2011/3/16 Luca Barbato <lu_zero@gentoo.org>:
> On 3/14/11 8:38 PM, Anton Khirnov wrote:
>>
>> ---
>>  libavformat/asfdec.c        |    3 ++-
>>  libavformat/avio.h          |    7 +++----
>>  libavformat/avio_internal.h |    5 +++++
>>  libavformat/aviobuf.c       |   15 ++++++++++++---
>>  libavformat/flvdec.c        |    5 +++--
>>  libavformat/utils.c         |    4 ++--
>>  6 files changed, 27 insertions(+), 12 deletions(-)
>
> Ok

Queued.

Ronald

Patch

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index cbcd576..326e81e 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"
@@ -1242,7 +1243,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 b9d181f..22370d1 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -424,6 +424,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
@@ -510,10 +513,6 @@  int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
  */
 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 url_fprintf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 12578fa..88da0f6 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 93dd83a..4b8a059 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -384,6 +384,15 @@  int url_setbufsize(AVIOContext *s, int buf_size)
 {
     return ffio_set_buf_size(s, buf_size);
 }
+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)
@@ -961,15 +970,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 b62c550..0567529 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 3ec7a67..4635426 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2550,7 +2550,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);
 }
 
@@ -2559,7 +2559,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);
 }