* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
+#include "avstring.h"
static int default_interrupt_cb(void);
URLProtocol *first_protocol = NULL;
URLInterruptCB *url_interrupt_cb = default_interrupt_cb;
+URLProtocol *av_protocol_next(URLProtocol *p)
+{
+ if(p) return p->next;
+ else return first_protocol;
+}
+
int register_protocol(URLProtocol *protocol)
{
URLProtocol **p;
goto found;
up = up->next;
}
- err = -ENOENT;
+ err = AVERROR(ENOENT);
goto fail;
found:
- uc = av_malloc(sizeof(URLContext) + strlen(filename));
+ uc = av_malloc(sizeof(URLContext) + strlen(filename) + 1);
if (!uc) {
- err = -ENOMEM;
+ err = AVERROR(ENOMEM);
goto fail;
}
+ uc->filename = (char *) &uc[1];
strcpy(uc->filename, filename);
uc->prot = up;
uc->flags = flags;
{
int ret;
if (h->flags & URL_WRONLY)
- return AVERROR_IO;
+ return AVERROR(EIO);
ret = h->prot->url_read(h, buf, size);
return ret;
}
-#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
int url_write(URLContext *h, unsigned char *buf, int size)
{
int ret;
if (!(h->flags & (URL_WRONLY | URL_RDWR)))
- return AVERROR_IO;
+ return AVERROR(EIO);
/* avoid sending too big packets */
if (h->max_packet_size && size > h->max_packet_size)
- return AVERROR_IO;
+ return AVERROR(EIO);
ret = h->prot->url_write(h, buf, size);
return ret;
}
-#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
offset_t url_seek(URLContext *h, offset_t pos, int whence)
{
offset_t ret;
if (!h->prot->url_seek)
- return -EPIPE;
+ return AVERROR(EPIPE);
ret = h->prot->url_seek(h, pos, whence);
return ret;
}
int url_close(URLContext *h)
{
- int ret;
+ int ret = 0;
+ if (!h) return 0; /* can happen when url_open fails */
- ret = h->prot->url_close(h);
+ if (h->prot->url_close)
+ ret = h->prot->url_close(h);
av_free(h);
return ret;
}
{
offset_t pos, size;
- pos = url_seek(h, 0, SEEK_CUR);
- size = url_seek(h, -1, SEEK_END)+1;
- url_seek(h, pos, SEEK_SET);
+ size= url_seek(h, 0, AVSEEK_SIZE);
+ if(size<0){
+ pos = url_seek(h, 0, SEEK_CUR);
+ if ((size = url_seek(h, -1, SEEK_END)) < 0)
+ return size;
+ size++;
+ url_seek(h, pos, SEEK_SET);
+ }
return size;
}
-/*
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like http or file on
- * disk), then 0 is returned.
- *
- * @param h file handle
- * @return maximum packet size in bytes
- */
int url_get_max_packet_size(URLContext *h)
{
return h->max_packet_size;
void url_get_filename(URLContext *h, char *buf, int buf_size)
{
- pstrcpy(buf, buf_size, h->filename);
+ av_strlcpy(buf, h->filename, buf_size);
}
return 0;
}
-/**
- * The callback is called in blocking functions to test regulary if
- * asynchronous interruption is needed. -EINTR is returned in this
- * case by the interrupted function. 'NULL' means no interrupt
- * callback is given.
- */
void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
{
if (!interrupt_cb)
interrupt_cb = default_interrupt_cb;
url_interrupt_cb = interrupt_cb;
}
+
+int av_url_read_pause(URLContext *h, int pause)
+{
+ if (!h->prot->url_read_pause)
+ return AVERROR(ENOSYS);
+ return h->prot->url_read_pause(h, pause);
+}
+
+offset_t av_url_read_seek(URLContext *h,
+ int stream_index, int64_t timestamp, int flags)
+{
+ if (!h->prot->url_read_seek)
+ return AVERROR(ENOSYS);
+ return h->prot->url_read_seek(h, stream_index, timestamp, flags);
+}