har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat: remove deprecated FF_API_AVIO_WRITE_NONCONST

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-01-25 11:37:30 -03:00
parent d6799ee0e4
commit 02aea61d69
8 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avio.c
View File

@ -560,11 +560,7 @@ int ffurl_read_complete(URLContext *h, unsigned char *buf, int size)
return retry_transfer_wrapper(h, buf, NULL, size, size, 1); return retry_transfer_wrapper(h, buf, NULL, size, size, 1);
} }
#if FF_API_AVIO_WRITE_NONCONST
int ffurl_write2(void *urlcontext, uint8_t *buf, int size)
#else
int ffurl_write2(void *urlcontext, const uint8_t *buf, int size) int ffurl_write2(void *urlcontext, const uint8_t *buf, int size)
#endif
{ {
URLContext *h = urlcontext; URLContext *h = urlcontext;

13
libavformat/avio.h
View File

@ -232,11 +232,7 @@ typedef struct AVIOContext {
void *opaque; /**< A private pointer, passed to the read/write/seek/... void *opaque; /**< A private pointer, passed to the read/write/seek/...
functions. */ functions. */
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size); int (*read_packet)(void *opaque, uint8_t *buf, int buf_size);
#if FF_API_AVIO_WRITE_NONCONST
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size);
#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size); int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size);
#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence); int64_t (*seek)(void *opaque, int64_t offset, int whence);
int64_t pos; /**< position in the file of the current buffer */ int64_t pos; /**< position in the file of the current buffer */
int eof_reached; /**< true if was unable to read due to error or eof */ int eof_reached; /**< true if was unable to read due to error or eof */
@ -284,13 +280,8 @@ typedef struct AVIOContext {
/** /**
* A callback that is used instead of write_packet. * A callback that is used instead of write_packet.
*/ */
#if FF_API_AVIO_WRITE_NONCONST
int (*write_data_type)(void *opaque, uint8_t *buf, int buf_size,
enum AVIODataMarkerType type, int64_t time);
#else
int (*write_data_type)(void *opaque, const uint8_t *buf, int buf_size, int (*write_data_type)(void *opaque, const uint8_t *buf, int buf_size,
enum AVIODataMarkerType type, int64_t time); enum AVIODataMarkerType type, int64_t time);
#endif
/** /**
* If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT, * If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT,
* but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly * but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly
@ -410,11 +401,7 @@ AVIOContext *avio_alloc_context(
int write_flag, int write_flag,
void *opaque, void *opaque,
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
#if FF_API_AVIO_WRITE_NONCONST
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size),
#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence)); int64_t (*seek)(void *opaque, int64_t offset, int whence));
/** /**

4
libavformat/avio_internal.h
View File

@ -89,11 +89,7 @@ void ffio_init_context(FFIOContext *s,
int write_flag, int write_flag,
void *opaque, void *opaque,
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
#if FF_API_AVIO_WRITE_NONCONST
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size),
#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence)); int64_t (*seek)(void *opaque, int64_t offset, int whence));
/** /**

28
libavformat/aviobuf.c
View File

@ -52,11 +52,7 @@ void ffio_init_context(FFIOContext *ctx,
int write_flag, int write_flag,
void *opaque, void *opaque,
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
#if FF_API_AVIO_WRITE_NONCONST
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size),
#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence)) int64_t (*seek)(void *opaque, int64_t offset, int whence))
{ {
AVIOContext *const s = &ctx->pub; AVIOContext *const s = &ctx->pub;
@ -115,11 +111,7 @@ AVIOContext *avio_alloc_context(
int write_flag, int write_flag,
void *opaque, void *opaque,
int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
#if FF_API_AVIO_WRITE_NONCONST
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
#else
int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size), int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size),
#endif
int64_t (*seek)(void *opaque, int64_t offset, int whence)) int64_t (*seek)(void *opaque, int64_t offset, int whence))
{ {
FFIOContext *s = av_malloc(sizeof(*s)); FFIOContext *s = av_malloc(sizeof(*s));
@ -141,20 +133,12 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len)
if (!s->error) { if (!s->error) {
int ret = 0; int ret = 0;
if (s->write_data_type) if (s->write_data_type)
#if FF_API_AVIO_WRITE_NONCONST
ret = s->write_data_type(s->opaque, (uint8_t *)data,
#else
ret = s->write_data_type(s->opaque, data, ret = s->write_data_type(s->opaque, data,
#endif
len, len,
ctx->current_type, ctx->current_type,
ctx->last_time); ctx->last_time);
else if (s->write_packet) else if (s->write_packet)
#if FF_API_AVIO_WRITE_NONCONST
ret = s->write_packet(s->opaque, (uint8_t *)data, len);
#else
ret = s->write_packet(s->opaque, data, len); ret = s->write_packet(s->opaque, data, len);
#endif
if (ret < 0) { if (ret < 0) {
s->error = ret; s->error = ret;
} else { } else {
@ -1290,11 +1274,7 @@ typedef struct DynBuffer {
uint8_t io_buffer[1]; uint8_t io_buffer[1];
} DynBuffer; } DynBuffer;
#if FF_API_AVIO_WRITE_NONCONST
static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
#else
static int dyn_buf_write(void *opaque, const uint8_t *buf, int buf_size) static int dyn_buf_write(void *opaque, const uint8_t *buf, int buf_size)
#endif
{ {
DynBuffer *d = opaque; DynBuffer *d = opaque;
unsigned new_size; unsigned new_size;
@ -1326,11 +1306,7 @@ static int dyn_buf_write(void *opaque, const uint8_t *buf, int buf_size)
return buf_size; return buf_size;
} }
#if FF_API_AVIO_WRITE_NONCONST
static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
#else
static int dyn_packet_buf_write(void *opaque, const uint8_t *buf, int buf_size) static int dyn_packet_buf_write(void *opaque, const uint8_t *buf, int buf_size)
#endif
{ {
unsigned char buf1[4]; unsigned char buf1[4];
int ret; int ret;
@ -1467,11 +1443,7 @@ void ffio_free_dyn_buf(AVIOContext **s)
avio_context_free(s); avio_context_free(s);
} }
#if FF_API_AVIO_WRITE_NONCONST
static int null_buf_write(void *opaque, uint8_t *buf, int buf_size)
#else
static int null_buf_write(void *opaque, const uint8_t *buf, int buf_size) static int null_buf_write(void *opaque, const uint8_t *buf, int buf_size)
#endif
{ {
DynBuffer *d = opaque; DynBuffer *d = opaque;

4
libavformat/hdsenc.c
View File

@ -112,11 +112,7 @@ static int parse_header(OutputStream *os, const uint8_t *buf, int buf_size)
return 0; return 0;
} }
#if FF_API_AVIO_WRITE_NONCONST
static int hds_write(void *opaque, uint8_t *buf, int buf_size)
#else
static int hds_write(void *opaque, const uint8_t *buf, int buf_size) static int hds_write(void *opaque, const uint8_t *buf, int buf_size)
#endif
{ {
OutputStream *os = opaque; OutputStream *os = opaque;
if (os->out) { if (os->out) {

4
libavformat/smoothstreamingenc.c
View File

@ -75,11 +75,7 @@ typedef struct SmoothStreamingContext {
int nb_fragments; int nb_fragments;
} SmoothStreamingContext; } SmoothStreamingContext;
#if FF_API_AVIO_WRITE_NONCONST
static int ism_write(void *opaque, uint8_t *buf, int buf_size)
#else
static int ism_write(void *opaque, const uint8_t *buf, int buf_size) static int ism_write(void *opaque, const uint8_t *buf, int buf_size)
#endif
{ {
OutputStream *os = opaque; OutputStream *os = opaque;
if (os->out) if (os->out)

8
libavformat/url.h
View File

@ -192,11 +192,7 @@ static inline int ffurl_read(URLContext *h, uint8_t *buf, int size)
*/ */
int ffurl_read_complete(URLContext *h, unsigned char *buf, int size); int ffurl_read_complete(URLContext *h, unsigned char *buf, int size);
#if FF_API_AVIO_WRITE_NONCONST
int ffurl_write2(void *urlcontext, uint8_t *buf, int size);
#else
int ffurl_write2(void *urlcontext, const uint8_t *buf, int size); int ffurl_write2(void *urlcontext, const uint8_t *buf, int size);
#endif
/** /**
* Write size bytes from buf to the resource accessed by h. * Write size bytes from buf to the resource accessed by h.
* *
@ -205,11 +201,7 @@ int ffurl_write2(void *urlcontext, const uint8_t *buf, int size);
*/ */
static inline int ffurl_write(URLContext *h, const uint8_t *buf, int size) static inline int ffurl_write(URLContext *h, const uint8_t *buf, int size)
{ {
#if FF_API_AVIO_WRITE_NONCONST
return ffurl_write2(h, (uint8_t*)buf, size);
#else
return ffurl_write2(h, buf, size); return ffurl_write2(h, buf, size);
#endif
} }
int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence); int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence);

1
libavformat/version_major.h
View File

@ -42,7 +42,6 @@
* *
*/ */
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_AVSTREAM_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVSTREAM_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 61)