From 2439f2ca82e28aa38b8aa2512bdb5a328e946cb9 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: lavf: remove disabled FF_API_OLD_AVIO cruft --- libavformat/aviobuf.c | 290 +------------------------------------------------- 1 file changed, 1 insertion(+), 289 deletions(-) (limited to 'libavformat/aviobuf.c') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 6cd2cefa7c..01a36475b2 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -40,7 +40,6 @@ */ #define SHORT_SEEK_THRESHOLD 4096 -#if !FF_API_OLD_AVIO static void *ffio_url_child_next(void *obj, void *prev) { AVIOContext *s = obj; @@ -64,7 +63,7 @@ const AVClass ffio_url_class = { .child_next = ffio_url_child_next, .child_class_next = ffio_url_child_class_next, }; -#endif + static void fill_buffer(AVIOContext *s); static int url_resetbuf(AVIOContext *s, int flags); @@ -89,9 +88,6 @@ int ffio_init_context(AVIOContext *s, s->must_flush = 0; s->eof_reached = 0; s->error = 0; -#if FF_API_OLD_AVIO - s->is_streamed = 0; -#endif s->seekable = AVIO_SEEKABLE_NORMAL; s->max_packet_size = 0; s->update_checksum= NULL; @@ -104,33 +100,6 @@ int ffio_init_context(AVIOContext *s, return 0; } -#if FF_API_OLD_AVIO -int init_put_byte(AVIOContext *s, - unsigned char *buffer, - int buffer_size, - int write_flag, - void *opaque, - int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), - int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), - int64_t (*seek)(void *opaque, int64_t offset, int whence)) -{ - return ffio_init_context(s, buffer, buffer_size, write_flag, opaque, - read_packet, write_packet, seek); -} -AVIOContext *av_alloc_put_byte( - unsigned char *buffer, - int buffer_size, - int write_flag, - void *opaque, - int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), - int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), - int64_t (*seek)(void *opaque, int64_t offset, int whence)) -{ - return avio_alloc_context(buffer, buffer_size, write_flag, opaque, - read_packet, write_packet, seek); -} -#endif - AVIOContext *avio_alloc_context( unsigned char *buffer, int buffer_size, @@ -265,19 +234,6 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) return offset; } -#if FF_API_OLD_AVIO -int url_fskip(AVIOContext *s, int64_t offset) -{ - int64_t ret = avio_seek(s, offset, SEEK_CUR); - return ret < 0 ? ret : 0; -} - -int64_t url_ftell(AVIOContext *s) -{ - return avio_seek(s, 0, SEEK_CUR); -} -#endif - int64_t avio_size(AVIOContext *s) { int64_t size; @@ -297,22 +253,6 @@ int64_t avio_size(AVIOContext *s) return size; } -#if FF_API_OLD_AVIO -int url_feof(AVIOContext *s) -{ - if(!s) - return 0; - return s->eof_reached; -} - -int url_ferror(AVIOContext *s) -{ - if(!s) - return 0; - return s->error; -} -#endif - void avio_wl32(AVIOContext *s, unsigned int val) { avio_w8(s, val); @@ -329,143 +269,6 @@ void avio_wb32(AVIOContext *s, unsigned int val) avio_w8(s, val); } -#if FF_API_OLD_AVIO -void put_strz(AVIOContext *s, const char *str) -{ - avio_put_str(s, str); -} - -#define GET(name, type) \ - type get_be ##name(AVIOContext *s) \ -{\ - return avio_rb ##name(s);\ -}\ - type get_le ##name(AVIOContext *s) \ -{\ - return avio_rl ##name(s);\ -} - -GET(16, unsigned int) -GET(24, unsigned int) -GET(32, unsigned int) -GET(64, uint64_t) - -#undef GET - -#define PUT(name, type ) \ - void put_le ##name(AVIOContext *s, type val)\ -{\ - avio_wl ##name(s, val);\ -}\ - void put_be ##name(AVIOContext *s, type val)\ -{\ - avio_wb ##name(s, val);\ -} - -PUT(16, unsigned int) -PUT(24, unsigned int) -PUT(32, unsigned int) -PUT(64, uint64_t) -#undef PUT - -int get_byte(AVIOContext *s) -{ - return avio_r8(s); -} -int get_buffer(AVIOContext *s, unsigned char *buf, int size) -{ - return avio_read(s, buf, size); -} -int get_partial_buffer(AVIOContext *s, unsigned char *buf, int size) -{ - return ffio_read_partial(s, buf, size); -} -void put_byte(AVIOContext *s, int val) -{ - avio_w8(s, val); -} -void put_buffer(AVIOContext *s, const unsigned char *buf, int size) -{ - avio_write(s, buf, size); -} -void put_nbyte(AVIOContext *s, int b, int 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); -} -int64_t url_fseek(AVIOContext *s, int64_t offset, int whence) -{ - return avio_seek(s, offset, whence); -} -int64_t url_fsize(AVIOContext *s) -{ - return avio_size(s); -} -int url_setbufsize(AVIOContext *s, int buf_size) -{ - return ffio_set_buf_size(s, buf_size); -} -int url_fprintf(AVIOContext *s, const char *fmt, ...) -{ - va_list ap; - char buf[4096]; - int ret; - - va_start(ap, fmt); - ret = vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - avio_write(s, buf, strlen(buf)); - return ret; -} -void put_flush_packet(AVIOContext *s) -{ - avio_flush(s); -} -int av_url_read_fpause(AVIOContext *s, int pause) -{ - return avio_pause(s, pause); -} -int64_t av_url_read_fseek(AVIOContext *s, int stream_index, - int64_t timestamp, int flags) -{ - return avio_seek_time(s, stream_index, timestamp, flags); -} -void init_checksum(AVIOContext *s, - unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), - unsigned long checksum) -{ - ffio_init_checksum(s, update_checksum, checksum); -} -unsigned long get_checksum(AVIOContext *s) -{ - return ffio_get_checksum(s); -} -int url_open_dyn_buf(AVIOContext **s) -{ - return avio_open_dyn_buf(s); -} -int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size) -{ - return ffio_open_dyn_packet_buf(s, max_packet_size); -} -int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) -{ - return avio_close_dyn_buf(s, pbuffer); -} -int url_fdopen(AVIOContext **s, URLContext *h) -{ - return ffio_fdopen(s, h); -} -#endif - int avio_put_str(AVIOContext *s, const char *str) { int len = 1; @@ -548,15 +351,6 @@ void avio_wb24(AVIOContext *s, unsigned int val) avio_w8(s, val); } -#if FF_API_OLD_AVIO -void put_tag(AVIOContext *s, const char *tag) -{ - while (*tag) { - avio_w8(s, *tag++); - } -} -#endif - /* Input stream */ static void fill_buffer(AVIOContext *s) @@ -638,17 +432,6 @@ int avio_r8(AVIOContext *s) return 0; } -#if FF_API_OLD_AVIO -int url_fgetc(AVIOContext *s) -{ - if (s->buf_ptr >= s->buf_end) - fill_buffer(s); - if (s->buf_ptr < s->buf_end) - return *s->buf_ptr++; - return URL_EOF; -} -#endif - int avio_read(AVIOContext *s, unsigned char *buf, int size) { int len, size1; @@ -774,14 +557,6 @@ unsigned int avio_rb32(AVIOContext *s) return val; } -#if FF_API_OLD_AVIO -char *get_strz(AVIOContext *s, char *buf, int maxlen) -{ - avio_get_str(s, INT_MAX, buf, maxlen); - return buf; -} -#endif - int ff_get_line(AVIOContext *s, char *buf, int maxlen) { int i = 0; @@ -879,18 +654,13 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) av_free(buffer); return AVERROR(ENOMEM); } -#if FF_API_OLD_AVIO - (*s)->is_streamed = h->is_streamed; -#endif (*s)->seekable = h->is_streamed ? 0 : AVIO_SEEKABLE_NORMAL; (*s)->max_packet_size = max_packet_size; if(h->prot) { (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; (*s)->read_seek = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; } -#if !FF_API_OLD_AVIO (*s)->av_class = &ffio_url_class; -#endif return 0; } @@ -993,13 +763,6 @@ int avio_close(AVIOContext *s) return ffurl_close(h); } -#if FF_API_OLD_AVIO -URLContext *url_fileno(AVIOContext *s) -{ - return s->opaque; -} -#endif - int avio_printf(AVIOContext *s, const char *fmt, ...) { va_list ap; @@ -1013,34 +776,6 @@ int avio_printf(AVIOContext *s, const char *fmt, ...) return ret; } -#if FF_API_OLD_AVIO -char *url_fgets(AVIOContext *s, char *buf, int buf_size) -{ - int c; - char *q; - - c = avio_r8(s); - if (s->eof_reached) - return NULL; - q = buf; - for(;;) { - if (s->eof_reached || c == '\n') - break; - if ((q - buf) < buf_size - 1) - *q++ = c; - c = avio_r8(s); - } - if (buf_size > 0) - *q = '\0'; - return buf; -} - -int url_fget_max_packet_size(AVIOContext *s) -{ - return s->max_packet_size; -} -#endif - int avio_pause(AVIOContext *s, int pause) { if (!s->read_pause) @@ -1068,29 +803,6 @@ int64_t avio_seek_time(AVIOContext *s, int stream_index, return ret; } -/* buffer handling */ -#if FF_API_OLD_AVIO -int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags) -{ - int ret; - *s = av_mallocz(sizeof(AVIOContext)); - if(!*s) - return AVERROR(ENOMEM); - ret = ffio_init_context(*s, buf, buf_size, - flags & AVIO_FLAG_WRITE, - NULL, NULL, NULL, NULL); - if(ret != 0) - av_freep(s); - return ret; -} - -int url_close_buf(AVIOContext *s) -{ - avio_flush(s); - return s->buf_ptr - s->buffer; -} -#endif - /* output in a dynamic buffer */ typedef struct DynBuffer { -- cgit v1.2.3