github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

Merge mp_talloc.h into ta/ta_talloc.h

This commit is contained in:
wm4 2013-12-17 02:18:16 +01:00
parent eb15151705
commit 73a5417950
10 changed files with 45 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/audio.c
View File

@ -19,8 +19,8 @@
#include <libavutil/mem.h>
#include "talloc.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/mp_talloc.h"
#include "audio.h"
static void update_redundant_info(struct mp_audio *mpa)

1
demux/demux_mf.c
View File

@ -28,7 +28,6 @@
#include "talloc.h"
#include "config.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mp_talloc.h"
#include "stream/stream.h"
#include "demux.h"

1
demux/mf.c
View File

@ -40,7 +40,6 @@
#include "mpvcore/mp_msg.h"
#include "stream/stream.h"
#include "options/path.h"
#include "mpvcore/mp_talloc.h"
#include "mf.h"

2
mpvcore/codecs.c
View File

@ -16,7 +16,7 @@
*/
#include <assert.h>
#include "mpvcore/mp_talloc.h"
#include "talloc.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_msg.h"
#include "codecs.h"

2
mpvcore/mp_common.h
View File

@ -24,7 +24,7 @@
#include <stdint.h>
#include "compat/compiler.h"
#include "mpvcore/mp_talloc.h"
#include "talloc.h"
// both int64_t and double should be able to represent this exactly
#define MP_NOPTS_VALUE (-1LL<<63)

59
mpvcore/mp_talloc.h
View File

@ -1,59 +0,0 @@
/*
* This file is part of mpv.
*
* mpv is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with mpv; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPV_TALLOC_H
#define MPV_TALLOC_H
#include "talloc.h"
#include "compat/compiler.h"
#define MP_TALLOC_ELEMS(p) (talloc_get_size(p) / sizeof((p)[0]))
#define MP_RESIZE_ARRAY(ctx, p, count) do { \
(p) = talloc_realloc_size((ctx), p, (count) * sizeof((p)[0])); } while (0)
#define MP_TARRAY_GROW(ctx, p, nextidx) \
do { \
size_t nextidx_ = (nextidx); \
if (nextidx_ >= MP_TALLOC_ELEMS(p)) \
MP_RESIZE_ARRAY(ctx, p, (nextidx_ + 1) * 2);\
} while (0)
#define MP_GROW_ARRAY(p, nextidx) MP_TARRAY_GROW(NULL, p, nextidx)
#define MP_TARRAY_APPEND(ctx, p, idxvar, ...) \
do { \
MP_TARRAY_GROW(ctx, p, idxvar); \
(p)[(idxvar)] = (MP_EXPAND_ARGS(__VA_ARGS__));\
(idxvar)++; \
} while (0)
// Doesn't actually free any memory, or do any other talloc calls.
#define MP_TARRAY_REMOVE_AT(p, idxvar, at) \
do { \
size_t at_ = (at); \
assert(at_ <= (idxvar)); \
memmove((p) + at_, (p) + at_ + 1, \
((idxvar) - at_ - 1) * sizeof((p)[0])); \
(idxvar)--; \
} while (0)
#define talloc_struct(ctx, type, ...) \
talloc_memdup(ctx, &(type) MP_EXPAND_ARGS(__VA_ARGS__), sizeof(type))
#endif

6
osdep/io.c
View File

@ -20,6 +20,8 @@
#include <unistd.h>
#include "talloc.h"
#include "config.h"
#include "osdep/io.h"
@ -46,8 +48,6 @@ bool mp_set_cloexec(int fd)
#include <stdio.h>
#include <stddef.h>
#include "talloc.h"
//copied and modified from libav
//http://git.libav.org/?p=libav.git;a=blob;f=libavformat/os_support.c;h=a0fcd6c9ba2be4b0dbcc476f6c53587345cc1152;hb=HEADl30
@ -79,8 +79,6 @@ char *mp_to_utf8(void *talloc_ctx, const wchar_t *s)
#include <fcntl.h>
#include <pthread.h>
#include "mpvcore/mp_talloc.h"
//http://git.libav.org/?p=libav.git;a=blob;f=cmdutils.c;h=ade3f10ce2fc030e32e375a85fbd06c26d43a433#l161
static char** win32_argv_utf8;

2
stream/rar.c
View File

@ -31,8 +31,8 @@
#include <libavutil/intreadwrite.h>
#include "talloc.h"
#include "mpvcore/mp_common.h"
#include "mpvcore/mp_talloc.h"
#include "stream.h"
#include "rar.h"

2
stream/stream_lavf.c
View File

@ -29,7 +29,7 @@
#include "cookies.h"
#include "mpvcore/bstr.h"
#include "mpvcore/mp_talloc.h"
#include "talloc.h"
static int open_f(stream_t *stream, int mode);
static char **read_icy(stream_t *stream);

38
ta/ta_talloc.h
View File

@ -71,4 +71,42 @@ char *ta_talloc_vasprintf_append_buffer(char *s, const char *fmt, va_list ap) TA
char *ta_talloc_asprintf_append(char *s, const char *fmt, ...) TA_PRF(2, 3);
char *ta_talloc_asprintf_append_buffer(char *s, const char *fmt, ...) TA_PRF(2, 3);
// mpv specific stuff - should be made part of proper TA API
#define TA_EXPAND_ARGS(...) __VA_ARGS__
#define MP_TALLOC_ELEMS(p) (talloc_get_size(p) / sizeof((p)[0]))
#define MP_RESIZE_ARRAY(ctx, p, count) do { \
(p) = talloc_realloc_size((ctx), p, (count) * sizeof((p)[0])); } while (0)
#define MP_TARRAY_GROW(ctx, p, nextidx) \
do { \
size_t nextidx_ = (nextidx); \
if (nextidx_ >= MP_TALLOC_ELEMS(p)) \
MP_RESIZE_ARRAY(ctx, p, (nextidx_ + 1) * 2);\
} while (0)
#define MP_GROW_ARRAY(p, nextidx) MP_TARRAY_GROW(NULL, p, nextidx)
#define MP_TARRAY_APPEND(ctx, p, idxvar, ...) \
do { \
MP_TARRAY_GROW(ctx, p, idxvar); \
(p)[(idxvar)] = (TA_EXPAND_ARGS(__VA_ARGS__));\
(idxvar)++; \
} while (0)
// Doesn't actually free any memory, or do any other talloc calls.
#define MP_TARRAY_REMOVE_AT(p, idxvar, at) \
do { \
size_t at_ = (at); \
assert(at_ <= (idxvar)); \
memmove((p) + at_, (p) + at_ + 1, \
((idxvar) - at_ - 1) * sizeof((p)[0])); \
(idxvar)--; \
} while (0)
#define talloc_struct(ctx, type, ...) \
talloc_memdup(ctx, &(type) TA_EXPAND_ARGS(__VA_ARGS__), sizeof(type))
#endif