* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavutil/avstring.h"
+#include "libavcodec/opt.h"
+#include "os_support.h"
#include "avformat.h"
-#include "avstring.h"
+
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+/** @name Logging context. */
+/*@{*/
+static const char *urlcontext_to_name(void *ptr)
+{
+ URLContext *h = (URLContext *)ptr;
+ if(h->prot) return h->prot->name;
+ else return "NULL";
+}
+static const AVOption options[] = {{NULL}};
+static const AVClass urlcontext_class =
+ { "URLContext", urlcontext_to_name, options };
+/*@}*/
+#endif
static int default_interrupt_cb(void);
return 0;
}
-int url_open(URLContext **puc, const char *filename, int flags)
+int url_open_protocol (URLContext **puc, struct URLProtocol *up,
+ const char *filename, int flags)
{
URLContext *uc;
+ int err;
+
+ uc = av_malloc(sizeof(URLContext) + strlen(filename) + 1);
+ if (!uc) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ uc->av_class = &urlcontext_class;
+#endif
+ uc->filename = (char *) &uc[1];
+ strcpy(uc->filename, filename);
+ uc->prot = up;
+ uc->flags = flags;
+ uc->is_streamed = 0; /* default = not streamed */
+ uc->max_packet_size = 0; /* default: stream file */
+ err = up->url_open(uc, filename, flags);
+ if (err < 0) {
+ av_free(uc);
+ *puc = NULL;
+ return err;
+ }
+
+ //We must be carefull here as url_seek() could be slow, for example for http
+ if( (flags & (URL_WRONLY | URL_RDWR))
+ || !strcmp(up->name, "file"))
+ if(!uc->is_streamed && url_seek(uc, 0, SEEK_SET) < 0)
+ uc->is_streamed= 1;
+ *puc = uc;
+ return 0;
+ fail:
+ *puc = NULL;
+ return err;
+}
+
+int url_open(URLContext **puc, const char *filename, int flags)
+{
URLProtocol *up;
const char *p;
char proto_str[128], *q;
- int err;
p = filename;
q = proto_str;
p++;
}
/* if the protocol has length 1, we consider it is a dos drive */
- if (*p == '\0' || (q - proto_str) <= 1) {
+ if (*p == '\0' || is_dos_path(filename)) {
file_proto:
strcpy(proto_str, "file");
} else {
up = first_protocol;
while (up != NULL) {
if (!strcmp(proto_str, up->name))
- goto found;
+ return url_open_protocol (puc, up, filename, flags);
up = up->next;
}
- err = AVERROR(ENOENT);
- goto fail;
- found:
- uc = av_malloc(sizeof(URLContext) + strlen(filename) + 1);
- if (!uc) {
- err = AVERROR(ENOMEM);
- goto fail;
- }
-#if LIBAVFORMAT_VERSION_INT >= (52<<16)
- uc->filename = (char *) &uc[1];
-#endif
- strcpy(uc->filename, filename);
- uc->prot = up;
- uc->flags = flags;
- uc->is_streamed = 0; /* default = not streamed */
- uc->max_packet_size = 0; /* default: stream file */
- err = up->url_open(uc, filename, flags);
- if (err < 0) {
- av_free(uc);
- *puc = NULL;
- return err;
- }
- *puc = uc;
- return 0;
- fail:
*puc = NULL;
- return err;
+ return AVERROR(ENOENT);
}
int url_read(URLContext *h, unsigned char *buf, int size)
return ret;
}
-#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
int url_write(URLContext *h, unsigned char *buf, int size)
{
int ret;
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)
+int64_t url_seek(URLContext *h, int64_t pos, int whence)
{
- offset_t ret;
+ int64_t ret;
if (!h->prot->url_seek)
return AVERROR(EPIPE);
return 1;
}
-offset_t url_filesize(URLContext *h)
+int64_t url_filesize(URLContext *h)
{
- offset_t pos, size;
+ int64_t pos, size;
size= url_seek(h, 0, AVSEEK_SIZE);
if(size<0){
url_interrupt_cb = interrupt_cb;
}
-int av_url_read_play(URLContext *h)
-{
- if (!h->prot->url_read_play)
- return AVERROR(ENOSYS);
- return h->prot->url_read_play(h);
-}
-
-int av_url_read_pause(URLContext *h)
+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);
+ return h->prot->url_read_pause(h, pause);
}
-int av_url_read_seek(URLContext *h,
+int64_t av_url_read_seek(URLContext *h,
int stream_index, int64_t timestamp, int flags)
{
if (!h->prot->url_read_seek)